Skip to content
Snippets Groups Projects

fix: :bug: Entitlements sources - do not ignore res. capabilities

Merged Ghost User requested to merge dBucik/fix_filtering_out_res_caps into main
2 files
+ 11
6
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -47,10 +47,14 @@ public class EntitlementExtendedClaimSource extends EntitlementSource {
private Set<String> produceEntitlementsExtended(Facility facility, Long userId, PerunAdapter perunAdapter) {
Set<Group> userGroups = ClaimUtils.getUserGroupsOnFacility(
facility, userId, perunAdapter, getClaimName(), getGroupEntitlementDisabledAttr());
Map<Long, String> groupIdToNameMap = super.getGroupIdToNameMap(userGroups, false);
Set<String> entitlements = new TreeSet<>();
this.fillUuidEntitlements(userGroups, entitlements);
fillForwardedEntitlements(perunAdapter, userId, entitlements);
userGroups = ClaimUtils.getUserGroupsOnFacility(
facility, userId, perunAdapter, getClaimName(), null);
Map<Long, String> groupIdToNameMap = super.getGroupIdToNameMap(userGroups, false);
fillCapabilities(facility, perunAdapter, groupIdToNameMap,entitlements);
log.trace("{} - UUID entitlements added", getClaimName());
return entitlements;
Loading