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

[Fix] Fixed DefaultPrivilegeHandler.detectPrivilegeConflicts for same roles

This commit is contained in:
Robert von Burg 2018-10-16 18:40:45 +02:00
parent ed1df7bc16
commit b956c6edcd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
View File

@ -1778,7 +1778,7 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
}
if (!conflicts.isEmpty()) {
String msg = conflicts.stream().collect(Collectors.joining("\n"));
String msg = String.join("\n", conflicts);
throw new PrivilegeException(msg);
}
}
@ -1790,10 +1790,10 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
for (String roleName : userRoles) {
Role role = this.persistenceHandler.getRole(roleName);
for (String privilegeName : role.getPrivilegeNames()) {
if (!privilegeNames.containsKey(privilegeName)) {
String roleOrigin = privilegeNames.get(privilegeName);
if (roleOrigin == null) {
privilegeNames.put(privilegeName, roleName);
} else {
String roleOrigin = privilegeNames.get(privilegeName);
} else if (!roleOrigin.equals(roleName)) {
String msg = "User {0} has conflicts for privilege {1} on roles {2} and {3}";
msg = MessageFormat.format(msg, user.getUsername(), privilegeName, roleOrigin, roleName);
conflicts.add(msg);