Skip to content

RANGER-5602: Local build failure due to unit test failure in TestPolicyACLs #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vyommani wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −24
Open

RANGER-5602: Local build failure due to unit test failure in TestPolicyACLs #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions ...ommon/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,14 +507,23 @@ public Delegate(RangerServiceDef serviceDef, boolean checkForCycles) {

this.hierarchies.put(policyType, Collections.unmodifiableSet(hierarchies));
hierarchyKeys.put(policyType, Collections.unmodifiableSet(hierachyKeys));
Map<String, RangerResourceDef> wildcardMap = new HashMap<>(resources.size());
for (RangerResourceDef res : resources) {
if (res != null) {
wildcardMap.put(res.getName(), createWildcardEnabledResourceDef(res));
}
}
wildcardEnabledResourceDefs.put(policyType, Collections.unmodifiableMap(wildcardMap));
} else {
isValid = false;
hierarchies.put(policyType, EMPTY_RESOURCE_HIERARCHY);
hierarchyKeys.put(policyType, Collections.emptySet());
wildcardEnabledResourceDefs.put(policyType, Collections.emptyMap());
}
} else {
hierarchies.put(policyType, EMPTY_RESOURCE_HIERARCHY);
hierarchyKeys.put(policyType, Collections.emptySet());
wildcardEnabledResourceDefs.put(policyType, Collections.emptyMap());
}
}

Expand Down Expand Up @@ -548,6 +557,15 @@ public Delegate(RangerServiceDef serviceDef, boolean checkForCycles) {
LOG.debug("Found [{}] resource hierarchies for service [{}] update-date[{}]: {}", hierarchies.size(), serviceName, serviceDefFreshnessDate, hierarchies);
}

private RangerResourceDef createWildcardEnabledResourceDef(RangerResourceDef resourceDef) {
if (resourceDef == null) {
return null;
}
RangerResourceDef ret = new RangerResourceDef(resourceDef);
ret.getMatcherOptions().put(RangerAbstractResourceMatcher.OPTION_WILD_CARD, Boolean.TRUE.toString());
return ret;
}

public void patchServiceDefWithDefaultValues() {
for (int policyType : RangerPolicy.POLICY_TYPES) {
Set<List<RangerResourceDef>> resourceHierarchies = getResourceHierarchies(policyType);
Expand Down Expand Up @@ -686,31 +704,11 @@ RangerResourceDef getWildcardEnabledResourceDef(String resourceName, Integer pol
if (policyType == null) {
policyType = RangerPolicy.POLICY_TYPE_ACCESS;
}

Map<String, RangerResourceDef> wResourceDefs = wildcardEnabledResourceDefs.computeIfAbsent(policyType, k -> new HashMap<>());
RangerResourceDef ret = null;

if (!wResourceDefs.containsKey(resourceName)) {
List<RangerResourceDef> resourceDefs = getResourceDefs(servicedef, policyType);

if (resourceDefs != null) {
for (RangerResourceDef resourceDef : resourceDefs) {
if (StringUtils.equals(resourceName, resourceDef.getName())) {
ret = new RangerResourceDef(resourceDef);

ret.getMatcherOptions().put(RangerAbstractResourceMatcher.OPTION_WILD_CARD, Boolean.TRUE.toString());

break;
}
}
}

wResourceDefs.put(resourceName, ret);
} else {
ret = wResourceDefs.get(resourceName);
Map<String, RangerResourceDef> wResourceDefs = wildcardEnabledResourceDefs.get(policyType);
if (wResourceDefs == null) {
return null;
}

return ret;
return wResourceDefs.get(resourceName);
}

List<RangerResourceDef> getResourceDefs(RangerServiceDef serviceDef, Integer policyType) {
Expand Down