Added enable/disable functionality for TPS audit.

A new method has been added to TPS audit REST service to enable or
disable audit logging. The CLI and UI have been modified to provide
a way to acces this functionality. Also, new ACL entries have been
added for audit.

Ticket #955

2 files changed, 29 insertions, 19 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
index 311a83327..11e530066 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
@@ -51,7 +51,7 @@ public class AuditCLI extends CLI {
 
     public static void printAuditConfig(AuditConfig auditConfig) throws IOException {
 
-        if (auditConfig.getEnabled() != null) System.out.println("  Enabled: " + auditConfig.getEnabled());
+        if (auditConfig.getStatus() != null) System.out.println("  Status: " + auditConfig.getStatus());
         if (auditConfig.getSigned() != null) System.out.println("  Signed: " + auditConfig.getSigned());
         if (auditConfig.getInterval() != null) System.out.println("  Interval (seconds): " + auditConfig.getInterval());
         if (auditConfig.getBufferSize() != null) System.out.println("  Buffer size (bytes): " + auditConfig.getBufferSize());
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
index 9906c20ee..d37b9768d 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
@@ -49,9 +49,12 @@ public class AuditModifyCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
-        Option option = new Option(null, "input", true, "Input file containing audit configuration.");
+        Option option = new Option(null, "action", true, "Action: update (default), enable, disable.");
+        option.setArgName("action");
+        options.addOption(option);
+
+        option = new Option(null, "input", true, "Input file containing audit configuration.");
         option.setArgName("file");
-        option.setRequired(true);
         options.addOption(option);
 
         option = new Option(null, "output", true, "Output file to store audit configuration.");
@@ -76,32 +79,39 @@ public class AuditModifyCLI extends CLI {
             System.exit(1);
         }
 
+        String action = cmd.getOptionValue("action", "update");
         String input = cmd.getOptionValue("input");
         String output = cmd.getOptionValue("output");
 
-        if (input == null) {
-            System.err.println("Error: Input file is required.");
-            printHelp();
-            System.exit(1);
-        }
-
         AuditConfig auditConfig;
 
-        try (BufferedReader in = new BufferedReader(new FileReader(input));
-            StringWriter sw = new StringWriter();
-            PrintWriter out = new PrintWriter(sw, true)) {
+        if (action.equals("update")) {
 
-            String line;
-            while ((line = in.readLine()) != null) {
-                out.println(line);
+            if (input == null) {
+                System.err.println("Error: Input file is required.");
+                printHelp();
+                System.exit(1);
             }
 
-            auditConfig = AuditConfig.valueOf(sw.toString());
-        }
+            try (BufferedReader in = new BufferedReader(new FileReader(input));
+                StringWriter sw = new StringWriter();
+                PrintWriter out = new PrintWriter(sw, true)) {
+
+                String line;
+                while ((line = in.readLine()) != null) {
+                    out.println(line);
+                }
+
+                auditConfig = AuditConfig.valueOf(sw.toString());
+            }
+
+            auditConfig = auditCLI.auditClient.updateAuditConfig(auditConfig);
 
-        auditConfig = auditCLI.auditClient.updateAuditConfig(auditConfig);
+        } else { // other actions
+            auditConfig = auditCLI.auditClient.changeAuditStatus(action);
+        }
 
-        MainCLI.printMessage("Updated audit configuration");
+        MainCLI.printMessage("Modified audit configuration");
 
         if (output == null) {
             AuditCLI.printAuditConfig(auditConfig);