Skip to content

Commit 2153fba

Browse files
authored
Merge pull request #5475 from atlanhq/ns/fix/itau
ADMIN-374 Fix policy refresh when persona is disabled
2 parents 987c626 + cd4d354 commit 2153fba

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

auth-agents-common/src/main/java/org/apache/atlas/policytransformer/CachePolicyTransformerImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,10 @@ public Map<String, EntityAuditActionV2> createPolicyChangeMap(String serviceName
418418
Map<String, EntityAuditActionV2> policyChanges = new HashMap<>();
419419
for (EntityAuditEventV2 event : events) {
420420
if (POLICY_ENTITY_TYPE.equals(event.getTypeName()) && !policyChanges.containsKey(event.getEntityId())) {
421+
if (auditEventToDeltaChangeType.get(event.getAction()) == null) {
422+
LOG.warn("PolicyDelta: {}: No delta type found for audit_event={} guid={}", serviceName, event.getAction(), event.getEntityId());
423+
continue;
424+
}
421425
policyChanges.put(event.getEntityId(), event.getAction());
422426
}
423427
}

auth-audits/src/main/java/org/apache/atlas/audit/destination/Log4JAuditDestination.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class Log4JAuditDestination extends AuditDestination {
4646
private static final String AUTH_AUDIT_RESOURCE= "resource";
4747
private static final String AUTH_AUDIT_CLIENT_IP = "cliIP";
4848
private static final String AUTH_AUDIT_AGENT = "agent";
49+
private static final String AUTH_AUDIT_ENFORCER = "enforcer";
4950

5051

5152
public Log4JAuditDestination() {
@@ -105,6 +106,7 @@ private void recordLogAttributes(AuditEventBase eventBase) {
105106
MDC.put(AUTH_AUDIT_RESULT, String.valueOf(event.getAccessResult()));
106107
MDC.put(AUTH_AUDIT_CLIENT_IP, event.getClientIP());
107108
MDC.put(AUTH_AUDIT_AGENT, event.getAgentId());
109+
MDC.put(AUTH_AUDIT_ENFORCER, event.getAclEnforcer());
108110
}
109111
}
110112

@@ -118,6 +120,7 @@ private void clearLogAttributes(AuditEventBase event) {
118120
MDC.remove(AUTH_AUDIT_RESULT);
119121
MDC.remove(AUTH_AUDIT_CLIENT_IP);
120122
MDC.remove(AUTH_AUDIT_AGENT);
123+
MDC.remove(AUTH_AUDIT_ENFORCER);
121124
}
122125
}
123126

0 commit comments

Comments
 (0)