Issue #1046

ceskaexpedice · Sep 16, 2024 · c5462d9 · c5462d9
1 parent f857e53
commit c5462d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...src/main/java/cz/incad/kramerius/rest/apiNew/admin/v70/statistics/StatisticsResource.java b/...src/main/java/cz/incad/kramerius/rest/apiNew/admin/v70/statistics/StatisticsResource.java
@@ -1082,8 +1082,17 @@ public Response exportLogs(@QueryParam("dateFrom") String dateFrom, @QueryParam(
                         String userSessionAttributes = doc.getString("user_session_attributes");
                         JSONObject changedObj = AnonymizationSupport.annonymizeObject(keys, userSessionAttributes);
                         doc.put("user_session_attributes", changedObj.toString());
+
+                        for (String key : keys) {
+                            if (doc.has(key)) {
+                                Object object = doc.get(key);
+                                String hashVal = AnonymizationSupport.hashVal(object.toString());
+                                doc.put(key, hashVal);
+                            }
+                        }
+
                     }
-                    return Response.ok().entity(string).build();
+                    return Response.ok().entity(allResp.toString()).build();
                 } else {
                     throw new BadRequestException("Expecting 'dateFrom' and 'dateTo'");
                 }

diff --git a/shared/common/src/main/java/cz/incad/kramerius/gdpr/AnonymizationSupport.java b/shared/common/src/main/java/cz/incad/kramerius/gdpr/AnonymizationSupport.java
@@ -42,7 +42,8 @@ public class AnonymizationSupport {
     "remoteAddr",
     "eduPersonPrincipalName",
     "email",
-    "preffered_user_name");
+    "preffered_user_name",
+    "ip_address");
 
     public static JSONObject annonymizeObject(List<String> annonymizationKeys, String line) {
         JSONObject lineJSONObject = new JSONObject(line);