[atlas] branch master updated: ATLAS-3935 : Use Audit framework to capture audit entries for Import/Export operations

[nixon]

This is an automated email from the ASF dual-hosted git repository.

nixon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new 01e9cce  ATLAS-3935 : Use Audit framework to capture audit entries for 
Import/Export operations
01e9cce is described below

commit 01e9ccef466643a01f97900b97e69772dd8c4ea9
Author: Mandar Ambawane <mandar.ambaw...@freestoneinfotech.com>
AuthorDate: Wed Sep 9 15:27:01 2020 +0530

    ATLAS-3935 : Use Audit framework to capture audit entries for Import/Export 
operations
---
 .../apache/atlas/web/resources/AdminResource.java  | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git 
a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java 
b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
index 3a5ae5c..3a6139f 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
@@ -44,6 +44,7 @@ import org.apache.atlas.model.impexp.MigrationStatus;
 import org.apache.atlas.model.instance.AtlasCheckStateRequest;
 import org.apache.atlas.model.instance.AtlasCheckStateResult;
 import org.apache.atlas.model.instance.AtlasEntityHeader;
+import org.apache.atlas.model.instance.AtlasObjectId;
 import org.apache.atlas.model.instance.EntityMutationResponse;
 import org.apache.atlas.model.metrics.AtlasMetrics;
 import org.apache.atlas.model.patches.AtlasPatch.AtlasPatches;
@@ -109,6 +110,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 
 /**
@@ -381,9 +383,11 @@ public class AdminResource {
         acquireExportImportLock("export");
 
         ZipSink exportSink = null;
+        boolean isSuccessful = false;
+        AtlasExportResult result = null;
         try {
             exportSink = new ZipSink(httpServletResponse.getOutputStream());
-            AtlasExportResult result = exportService.run(exportSink, request, 
AtlasAuthorizationUtils.getCurrentUserName(),
+            result = exportService.run(exportSink, request, 
AtlasAuthorizationUtils.getCurrentUserName(),
                                                          
Servlets.getHostName(httpServletRequest),
                                                          
AtlasAuthorizationUtils.getRequestIpAddress(httpServletRequest));
 
@@ -396,6 +400,7 @@ public class AdminResource {
             httpServletResponse.setHeader("Transfer-Encoding", "chunked");
 
             httpServletResponse.getOutputStream().flush();
+            isSuccessful = true;
             return Response.ok().build();
         } catch (IOException excp) {
             LOG.error("export() failed", excp);
@@ -408,6 +413,12 @@ public class AdminResource {
                 exportSink.close();
             }
 
+            if (isSuccessful) {
+                String params = 
AtlasJson.toJson(result.getRequest().getOptions());
+                List<AtlasObjectId> objectIds = 
result.getRequest().getItemsToExport();
+                auditImportExportOperations(objectIds, AuditOperation.EXPORT, 
params);
+            }
+
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AdminResource.export()");
             }
@@ -456,6 +467,10 @@ public class AdminResource {
             }
         }
 
+        List<AtlasObjectId> objectIds = 
result.getExportResult().getRequest().getItemsToExport();
+        String params = String.join(",", result.getProcessedEntities());
+        auditImportExportOperations(objectIds, AuditOperation.IMPORT, params);
+
         return result;
     }
 
@@ -736,4 +751,17 @@ public class AdminResource {
 
         importExportOperationLock.lock();
     }
+
+    private void auditImportExportOperations(List<AtlasObjectId> objectIds, 
AuditOperation auditOperation, String params) throws AtlasBaseException {
+        final String clientIp = RequestContext.get().getClientIPAddress();
+        final Date startTime = new Date(RequestContext.get().getRequestTime());
+        final Date endTime = new Date();
+
+        Map<String, Long> entityCountByType = 
objectIds.stream().collect(Collectors.groupingBy(AtlasObjectId::getTypeName, 
Collectors.counting()));
+        int resultCount = objectIds.size();
+
+        auditService.add(RequestContext.get().getUser() == null ? "" : 
RequestContext.get().getUser(), auditOperation,
+                clientIp != null ? clientIp : "", startTime, endTime, params,
+                AtlasJson.toJson(entityCountByType), resultCount);
+    }
 }