Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] removed requirement for PrivilegeAdmin role in priv. handler

This commit is contained in:
Robert von Burg 2015-03-12 17:44:35 +01:00
parent 5675027f6c
commit fa3fe89237
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ch.eitchnet.privilege

@ -1 +1 @@
Subproject commit a3d76d4cd88ffd1fbeb6e9c646db0e55211f6d09
Subproject commit fa40671b8cc8c1b4f0cefc877d2786edbb77cc88

2
ch.eitchnet.utils

@ -1 +1 @@
Subproject commit 07f009b7ff7cba427e4f0508da65f8d9b04db2f4
Subproject commit 638cebe01e8275c188b9e444576569e6e29ae73e

1
li.strolch.agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
View File

@ -148,7 +148,6 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
public ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
throws PrivilegeException {
assertContainerStarted();
this.privilegeHandler.assertIsPrivilegeAdmin(certificate);
return this.privilegeHandler;
}
}

6
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
View File

@ -92,7 +92,11 @@ public class AuthenticationService {
loginResult.setParameters(certificate.getPropertyMap());
loginResult.setRoles(new ArrayList<>(certificate.getUserRoles()));
List<String> allowList = privilegeContext.getFlatAllowList();
// TODO rethink this stupid aggregating of the allow list
List<String> allowList = new ArrayList<>();
for (String name : privilegeContext.getPrivilegeNames()) {
allowList.addAll(privilegeContext.getPrivilege(name).getAllowList());
}
if (allowList.isEmpty())
loginResult.setPrivileges(Arrays.asList("*")); //$NON-NLS-1$
else