Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update permissions based on changes made in matrix auth plugin 3.0 #1249

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -21,50 +21,54 @@ class AuthorizationContext extends AbstractContext {
/**
* Adds all available permissions for the user.
*/
void permissionAll(String user) {
void permissionAll(String type, String user) {
availablePermissions.each {
addPermission(it, user)
addPermission(type, it, user)
}
}

/**
* Adds a specific permission.
*
* @param permission a permission string in {@code '<permission>:<user>'} format, e.g.
* @param permission a permission string in {@code '<type>:<permission>:<user>'} format, e.g.
* {@code 'hudson.model.Item.Create:authenticated'}
*/
void permission(String permission) {
checkNotNullOrEmpty(permission, 'permission must not be null or empty')
checkArgument(permission.contains(':'), 'permission must be <permission>:<user>')
checkArgument(permission.contains(':'), 'permission must be <type>:<permission>:<user>')

String[] permissionAndUser = permission.split(':', 2)
this.permission(permissionAndUser[0], permissionAndUser[1])
String[] permissionAndUser = permission.split(':', 3)
this.permission(permissionAndUser[0], permissionAndUser[1], permissionAndUser[2])
}

/**
* Adds a specific permission, but breaks apart the permission from the user name.
*/
void permission(String permission, String user) {
void permission(String type, String permission, String user) {
checkArgument(
availablePermissions.contains(permission),
"permission must be one of ${availablePermissions.join(',')}"
)
addPermission(permission, user)
checkArgument(
["USER", "GROUP"].contains(type),
"type must be USER or GROUP"
)
addPermission(type, permission, user)
}

/**
* Adds a set of permissions for a user.
*
* @since 1.66
*/
void permissions(String user, Iterable<String> permissionsList) {
void permissions(String type, String user, Iterable<String> permissionsList) {
permissionsList.each {
this.permission(it, user)
this.permission(type, it, user)
}
}

protected void addPermission(String permission, String user) {
permissions << "${permission}:${user}".toString()
protected void addPermission(String type, String permission, String user) {
permissions << "${type}:${permission}:${user}".toString()
}

protected Set<String> getAvailablePermissions() {
Expand Down