[AMBARI-25124] ambari-audit.log entries span multiple lines (apappu)

apappu · Mar 28, 2019 · 3994897 · 3994897
1 parent 2bc4779
commit 3994897
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java
@@ -62,15 +62,14 @@ private LoginAuditEventBuilder() {
     protected void buildAuditMessage(StringBuilder builder) {
       super.buildAuditMessage(builder);
 
-      builder.append(", Operation(User login), Roles(").append(System.lineSeparator());
+      builder.append(", Operation(User login), Roles(");
 
       if (roles != null && !roles.isEmpty()) {
         List<String> lines = new LinkedList<>();
         for (Map.Entry<String, List<String>> entry : roles.entrySet()) {
           lines.add("    " + entry.getKey() + ": " + StringUtils.join(entry.getValue(), ", "));
         }
-        builder.append(StringUtils.join(lines, System.lineSeparator()));
-        builder.append(System.lineSeparator());
+        builder.append(StringUtils.join(lines, " , "));
       }
       builder.append("), Status(")
         .append(reasonOfFailure == null ? "Success" : "Failed");

diff --git a/...a/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java b/...a/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java
@@ -88,18 +88,15 @@ protected void buildAuditMessage(StringBuilder builder) {
         .append(repoVersion)
         .append("), Repositories(");
 
-      if (!repos.isEmpty()) {
-        builder.append(System.lineSeparator());
-      }
 
       for (Map.Entry<String, List<Map<String, String>>> repo : repos.entrySet()) {
         builder.append("Operating system: ").append(repo.getKey());
-        builder.append(System.lineSeparator());
+        builder.append(" ( ");
         for (Map<String, String> properties : repo.getValue()) {
           builder.append("    Repository ID(").append(properties.get("repo_id"));
           builder.append("), Repository name(").append(properties.get("repo_name"));
           builder.append("), Base url(").append(properties.get("base_url")).append(")");
-          builder.append(System.lineSeparator());
+          builder.append(" ) ");
         }
       }
 

diff --git a/...rg/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java b/...rg/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
@@ -89,18 +89,15 @@ protected void buildAuditMessage(StringBuilder builder) {
         .append(repoVersion)
         .append("), Repositories(");
 
-      if (!repos.isEmpty()) {
-        builder.append(System.lineSeparator());
-      }
 
       for (Map.Entry<String, List<Map<String, String>>> repo : repos.entrySet()) {
         builder.append("Operating system: ").append(repo.getKey());
-        builder.append(System.lineSeparator());
+        builder.append(" ( ");
         for (Map<String, String> properties : repo.getValue()) {
           builder.append("    Repository ID(").append(properties.get("repo_id"));
           builder.append("), Repository name(").append(properties.get("repo_name"));
           builder.append("), Base url(").append(properties.get("base_url")).append(")");
-          builder.append(System.lineSeparator());
+          builder.append(" ) ");
         }
       }
 

diff --git a/...org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java b/...org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
@@ -80,9 +80,6 @@ protected void buildAuditMessage(StringBuilder builder) {
       roleSet.addAll(roles.keySet());
 
       builder.append(", Roles(");
-      if (!users.isEmpty() || !groups.isEmpty()|| !roles.isEmpty()) {
-        builder.append(System.lineSeparator());
-      }
 
       List<String> lines = new LinkedList<>();
 
@@ -99,7 +96,7 @@ protected void buildAuditMessage(StringBuilder builder) {
         }
       }
 
-      builder.append(StringUtils.join(lines, System.lineSeparator()));
+      builder.append(StringUtils.join(lines, " , "));
 
       builder.append(")");
     }

diff --git a/...va/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java b/...va/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
@@ -101,9 +101,6 @@ protected void buildAuditMessage(StringBuilder builder) {
       roleSet.addAll(roles.keySet());
 
       builder.append(", Permissions(");
-      if (!users.isEmpty() || !groups.isEmpty() || !roles.isEmpty()) {
-        builder.append(System.lineSeparator());
-      }
 
       List<String> lines = new LinkedList<>();
 
@@ -120,7 +117,7 @@ protected void buildAuditMessage(StringBuilder builder) {
         }
       }
 
-      builder.append(StringUtils.join(lines, System.lineSeparator()));
+      builder.append(StringUtils.join(lines, " , "));
 
       builder.append(")");
     }