From bd4e15567e6aefa64f91e1968694e5c8b51de89a Mon Sep 17 00:00:00 2001 From: "m.dalakov" Date: Fri, 6 Apr 2018 19:22:52 +0300 Subject: [PATCH] SECARSP-306 *Implement AuditTrail APIs for Dashboard: *Get device audit reports: upd file name, zip arch --- .../web/rest/service/ui/GetDeviceReportsRestService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/ui/GetDeviceReportsRestService.java b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/ui/GetDeviceReportsRestService.java index 9581683..0543a75 100644 --- a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/ui/GetDeviceReportsRestService.java +++ b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/ui/GetDeviceReportsRestService.java @@ -18,6 +18,7 @@ import org.slf4j.*; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.text.SimpleDateFormat; import java.util.*; import java.util.zip.*; @@ -56,6 +57,8 @@ public class GetDeviceReportsRestService { zos.closeEntry(); } } + zos.flush(); + zos.finish(); return bos.toByteArray(); } } @@ -76,8 +79,13 @@ public class GetDeviceReportsRestService { byte [] out = getZipCompressed(new String[]{"syscall","user"}, new byte[][]{reportSyscall,reportUser}); dr = Optional.of(deviceReportsDataService.save(new DeviceReportsData().data(out), id, from, to)); } + SimpleDateFormat formatter = new SimpleDateFormat("MMM-dd-yyyy"); String uri = "/audit/reports/" - + Base64.getEncoder().encodeToString(("Reports["+from+"-"+to+"].zip").getBytes()) + + Base64.getEncoder().encodeToString(("Reports[" + + formatter.format(new Date((long)from*1000)) + +" - " + + formatter.format(new Date((long)to*1000)) + +"].zip").getBytes()) + "?ruid="+dr.get().getRuid(); String out = "{\n" + "\"uri\": \""+uri+"\"\n" + -- 2.7.4