[Minor] removed requirement for PrivilegeAdmin role in priv. handler
This commit is contained in:
parent
5675027f6c
commit
fa3fe89237
|
@ -1 +1 @@
|
||||||
Subproject commit a3d76d4cd88ffd1fbeb6e9c646db0e55211f6d09
|
Subproject commit fa40671b8cc8c1b4f0cefc877d2786edbb77cc88
|
|
@ -1 +1 @@
|
||||||
Subproject commit 07f009b7ff7cba427e4f0508da65f8d9b04db2f4
|
Subproject commit 638cebe01e8275c188b9e444576569e6e29ae73e
|
|
@ -148,7 +148,6 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
public ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
public ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
||||||
throws PrivilegeException {
|
throws PrivilegeException {
|
||||||
assertContainerStarted();
|
assertContainerStarted();
|
||||||
this.privilegeHandler.assertIsPrivilegeAdmin(certificate);
|
|
||||||
return this.privilegeHandler;
|
return this.privilegeHandler;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,11 @@ public class AuthenticationService {
|
||||||
loginResult.setParameters(certificate.getPropertyMap());
|
loginResult.setParameters(certificate.getPropertyMap());
|
||||||
loginResult.setRoles(new ArrayList<>(certificate.getUserRoles()));
|
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())
|
if (allowList.isEmpty())
|
||||||
loginResult.setPrivileges(Arrays.asList("*")); //$NON-NLS-1$
|
loginResult.setPrivileges(Arrays.asList("*")); //$NON-NLS-1$
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue