Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-05 22:29:11 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/user_converter

Browse Source
This commit is contained in:
Konstantin Schaper
2020-10-21 14:34:57 +02:00
committed by GitHub
parent 69950f63b3 bee82001ee
commit f9dab3dc42
15 changed files with 1435 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java
View File

@@ -251,6 +251,7 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
builder.add(getGroupAutocompletePermission());
builder.add(getChangeOwnPasswordPermission(user));
builder.add(getApiKeyPermission(user));
builder.add(getPublicKeyPermission(user));
}
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(ImmutableSet.of(Role.USER));
@@ -267,6 +268,10 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
return UserPermissions.changePassword(user).asShiroString();
}
private String getPublicKeyPermission(User user) {
return UserPermissions.changePublicKeys(user).asShiroString();
}
private String getApiKeyPermission(User user) {
return UserPermissions.changeApiKeys(user).asShiroString();
}