Skip to content

RANGER-5794: Atlas permissions reappear in tag policies when enableTagBasedPolicies is disabled #1225

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

Closed
RakeshGuptaDev wants to merge 1 commit into from
+55 −3
Closed

RANGER-5794: Atlas permissions reappear in tag policies when enableTagBasedPolicies is disabled #1225

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ public void updateTagServiceDefForAccessTypes() throws Exception {

List<RangerServiceDef> allServiceDefs = getServiceDefs(new SearchFilter());
for (RangerServiceDef serviceDef : allServiceDefs) {
if (ServiceDefUtil.getOption_enableTagBasedPolicies(serviceDef, config)) {
updateTagServiceDefForUpdatingAccessTypes(serviceDef);
}
updateTagServiceDefForUpdatingAccessTypes(serviceDef);
}

LOG.debug("<== ServiceDefDBStore.updateTagServiceDefForAccessTypes()");
Expand Down Expand Up @@ -280,6 +278,12 @@ private void updateTagServiceDefForUpdatingAccessTypes(RangerServiceDef serviceD
return;
}

if (!ServiceDefUtil.getOption_enableTagBasedPolicies(serviceDef, config)) {
LOG.debug("AbstractServiceStore.updateTagServiceDefForUpdatingAccessTypes({}): tag-based policies disabled", serviceDef.getName());

return;
}

if (EmbeddedServiceDefsUtil.instance().getTagServiceDefId() == -1) {
LOG.info("AbstractServiceStore.updateTagServiceDefForUpdatingAccessTypes({}): tag service-def does not exist", serviceDef.getName());
}
Expand Down
48 changes: 48 additions & 0 deletions ...c/main/java/org/apache/ranger/patch/PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public void execLoad() {
try {
if (updateAtlasServiceDef()) {
disableAtlasAccessForTagPolicies();
updateTagServiceDef();
}
} catch (Exception e) {
logger.error("Error while updateTagServiceDef()data.", e);
Expand Down Expand Up @@ -263,4 +264,51 @@ private Map<String, String> jsonStringToMap(String jsonStr) {
}
return ret;
}

private void updateTagServiceDef() throws Exception {
logger.info("==> PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.updateTagServiceDef()");
RangerServiceDef embeddedTagServiceDef;
RangerServiceDef dbTagServiceDef;
XXServiceDef xXServiceDefObj;

embeddedTagServiceDef = EmbeddedServiceDefsUtil.instance().getEmbeddedServiceDef(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME);

if (embeddedTagServiceDef != null) {
xXServiceDefObj = daoMgr.getXXServiceDef().findByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME);

if (xXServiceDefObj != null) {
dbTagServiceDef = svcStore.getServiceDefByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME);

if (dbTagServiceDef != null && CollectionUtils.isNotEmpty(dbTagServiceDef.getAccessTypes())) {
List<RangerServiceDef.RangerAccessTypeDef> accessTypesToRemove = new ArrayList<>();

for (RangerServiceDef.RangerAccessTypeDef accessTypeDef : dbTagServiceDef.getAccessTypes()) {
if (accessTypeDef != null) {
final String accessTypeName = accessTypeDef.getName();

String[] svcDefAccType = accessTypeName.split(":");
String serviceDefName = svcDefAccType.length > 0 ? svcDefAccType[0] : null;

if (serviceDefName != null && serviceDefName.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_ATLAS_NAME)) {
logger.info("==> PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.updateTagServiceDef() found atlas access type to remove: {}", accessTypeName);
accessTypesToRemove.add(accessTypeDef);
}
}
}

if (!accessTypesToRemove.isEmpty()) {
dbTagServiceDef.getAccessTypes().removeAll(accessTypesToRemove);

svcStore.updateServiceDef(dbTagServiceDef);
}
}
} else {
logger.error("Tag service-definition does not exist in the Ranger DAO.");
}
} else {
logger.error("The embedded Tag service-definition does not exist.");
}

logger.info("<== PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.updateTagServiceDef()");
}
}