RANGER-5376:Add DataSetIds in the Ranger audit events for enabling searching with DataSet Ids

agents-audit/core/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java

@@ -116,6 +116,9 @@ public class AuthzAuditEvent extends AuditEventBase {
     @JsonProperty("projects")
     protected Set<String> projects;
 
+    @JsonProperty("datasetIds")
+    protected Set<Long> datasetIds;
+
     @JsonProperty("additional_info")
     protected String additionalInfo;
 
@@ -469,6 +472,14 @@ public void setProjects(Set<String> projects) {
         this.projects = projects;
     }
 
+    public Set<Long> getDatasetIds() {
+        return datasetIds;
+    }
+
+    public void setDatasetIds(Set<Long> datasetIds) {
+        this.datasetIds = datasetIds;
+    }
+
     public String getClusterName() {
         return clusterName;
     }

agents-audit/dest-solr/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java

@@ -316,6 +316,7 @@ SolrInputDocument toSolrDoc(AuthzAuditEvent auditEvent) {
         doc.setField("tags", auditEvent.getTags());
         doc.addField("datasets", auditEvent.getDatasets());
         doc.addField("projects", auditEvent.getProjects());
+        doc.addField("datasetIds", auditEvent.getDatasetIds());
         doc.setField("cluster", auditEvent.getClusterName());
         doc.setField("zoneName", auditEvent.getZoneName());
         doc.setField("agentHost", auditEvent.getAgentHostname());

agents-audit/dest-solr/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java

@@ -295,6 +295,7 @@ SolrInputDocument toSolrDoc(AuthzAuditEvent auditEvent) {
         doc.addField("tags", auditEvent.getTags());
         doc.addField("datasets", auditEvent.getDatasets());
         doc.addField("projects", auditEvent.getProjects());
+        doc.addField("datasetIds", auditEvent.getDatasetIds());
         doc.addField("cluster", auditEvent.getClusterName());
         doc.addField("zone", auditEvent.getZoneName());
         doc.addField("agentHost", auditEvent.getAgentHostname());

agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java

@@ -137,6 +137,7 @@ public AuthzAuditEvent getAuthzEvents(RangerAccessResult result) {
 
             ret.setDatasets(getDatasets(request));
             ret.setProjects(getProjects(request));
+            ret.setDatasetIds(getDatasetIds(request));
             ret.setAdditionalInfo(getAdditionalInfo(request));
             ret.setClusterName(request.getClusterName());
             ret.setZoneName(result.getZoneName());
@@ -223,6 +224,12 @@ public final Set<String> getProjects(RangerAccessRequest request) {
         return gdsResult != null ? gdsResult.getProjects() : null;
     }
 
+    public final Set<Long> getDatasetIds(RangerAccessRequest request) {
+        GdsAccessResult gdsResult = RangerAccessRequestUtil.getGdsResultFromContext(request.getContext());
+
+        return gdsResult != null ? gdsResult.getDatasetIds() : null;
+    }
+
     public String getAdditionalInfo(RangerAccessRequest request) {
         if (StringUtils.isBlank(request.getRemoteIPAddress()) && CollectionUtils.isEmpty(request.getForwardedAddresses())) {
             return null;

agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsAccessResult.java

@@ -35,6 +35,7 @@ public class GdsAccessResult {
     private List<String> rowFilters;
     private Set<String>  datasets;
     private Set<String>  projects;
+    private Set<Long>    datasetIds;
     private Set<String>  allowedByDatasets;
     private Set<String>  allowedByProjects;
 
@@ -113,6 +114,10 @@ public Set<String> getProjects() {
         return projects;
     }
 
+    public Set<Long> getDatasetIds() {
+        return datasetIds;
+    }
+
     public Set<String> getAllowedByDatasets() {
         return allowedByDatasets;
     }
@@ -137,6 +142,14 @@ public void addProject(String name) {
         projects.add(name);
     }
 
+    public void addDatasetId(Long id) {
+        if (datasetIds == null) {
+            datasetIds = new HashSet<>();
+        }
+
+        datasetIds.add(id);
+    }
+
     public void addAllowedByDataset(String name) {
         if (allowedByDatasets == null) {
             allowedByDatasets = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
@@ -155,7 +168,7 @@ public void addAllowedByProject(String name) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(isAllowed, isAudited, policyId, policyVersion, maskType, maskedValue, maskCondition, rowFilters, datasets, projects, allowedByDatasets, allowedByProjects);
+        return Objects.hash(isAllowed, isAudited, policyId, policyVersion, maskType, maskedValue, maskCondition, rowFilters, datasets, projects, datasetIds, allowedByDatasets, allowedByProjects);
     }
 
     @Override
@@ -177,6 +190,7 @@ public boolean equals(Object obj) {
                     Objects.equals(rowFilters, other.rowFilters) &&
                     Objects.equals(datasets, other.datasets) &&
                     Objects.equals(projects, other.projects) &&
+                    Objects.equals(datasetIds, other.datasetIds) &&
                     Objects.equals(allowedByDatasets, other.allowedByDatasets) &&
                     Objects.equals(allowedByProjects, other.allowedByProjects);
         }
@@ -203,6 +217,7 @@ public StringBuilder toString(StringBuilder sb) {
         sb.append(", rowFilters={").append(rowFilters).append("}");
         sb.append(", datasets={").append(datasets).append("}");
         sb.append(", projects={").append(projects).append("}");
+        sb.append(", datasetIds={").append(datasetIds).append("}");
         sb.append(", allowedByDatasets={").append(allowedByDatasets).append("}");
         sb.append(", allowedByProjects={").append(allowedByProjects).append("}");
         sb.append("}");

agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsDatasetEvaluator.java

@@ -111,6 +111,7 @@ public void evaluate(RangerAccessRequest request, GdsAccessResult result, Collec
 
         if (isActive()) {
             result.addDataset(getName());
+            result.addDatasetId(getId());
 
             if (!policyEvaluators.isEmpty()) {
                 GdsDatasetAccessRequest datasetRequest = new GdsDatasetAccessRequest(getId(), gdsServiceDef, request);