Revision 928ee151
Added by Niels Hoffmann almost 13 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/permission/CdmPermissionEvaluator.java | ||
|---|---|---|
| 58 | 58 |
String permissionString = (String)permission; |
| 59 | 59 |
|
| 60 | 60 |
Collection<GrantedAuthority> authorities = authentication.getAuthorities(); |
| 61 |
// FIXME this should not be necessary. See User.initAuthorities() and User.getAuthorities(); a User object should always |
|
| 62 |
// return all GrantedAuthorities including its groups authorities. If that is not working correctly please fix it. |
|
| 61 | 63 |
Set<Group> groups =((User)authentication.getPrincipal()).getGroups(); |
| 62 | 64 |
Set<GrantedAuthority> groupAuthorities = new HashSet<GrantedAuthority>(); |
| 63 | 65 |
for (Group group: groups){
|
| 64 | 66 |
groupAuthorities.addAll(group.getGrantedAuthorities()); |
| 65 | 67 |
} |
| 66 | 68 |
groupAuthorities.addAll(authorities); |
| 67 |
|
|
| 69 |
// FIXME END |
|
| 68 | 70 |
|
| 69 | 71 |
AuthorityPermission evalPermission = new AuthorityPermission(targetDomainObject.getClass().getSimpleName().toUpperCase(), CdmPermission.valueOf(permissionString), ((CdmBase)targetDomainObject).getUuid()); |
| 70 | 72 |
|
Also available in: Unified diff
Changed CdmPermission to use "update" instead of "edit" for consistency reasons; Added a comment about getting authorities from a user's groups;