diff options
author | Endi S. Dewata <edewata@redhat.com> | 2015-07-17 18:18:28 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2015-07-17 21:47:28 -0400 |
commit | ed5b182d0d409665fc3cab3cac349f54da623181 (patch) | |
tree | 5a8fef4630edd23d5b4e528a498dcacb117fe761 /base | |
parent | 971037295fce3214a17a3d4c3501d23474a43662 (diff) | |
download | pki-ed5b182d0d409665fc3cab3cac349f54da623181.tar.gz pki-ed5b182d0d409665fc3cab3cac349f54da623181.tar.xz pki-ed5b182d0d409665fc3cab3cac349f54da623181.zip |
Removed audit CLI from non-TPS subsystems.
Due to database upgrade issue the pki <subsystem>-audit CLI has
been removed from all subsystems except TPS.
The AuditModifyCLI has been modified to clarify that the --action
and the --input parameters are mutually exclusive.
https://fedorahosted.org/pki/ticket/1437
Diffstat (limited to 'base')
13 files changed, 13 insertions, 39 deletions
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java index 8c6c8cbe5..16eae7877 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java @@ -7,7 +7,6 @@ import javax.ws.rs.core.Application; import org.dogtagpki.server.rest.ACLInterceptor; import org.dogtagpki.server.rest.AccountService; -import org.dogtagpki.server.rest.AuditService; import org.dogtagpki.server.rest.AuthMethodInterceptor; import org.dogtagpki.server.rest.GroupService; import org.dogtagpki.server.rest.MessageFormatInterceptor; @@ -32,9 +31,6 @@ public class CAApplication extends Application { // account classes.add(AccountService.class); - // audit - classes.add(AuditService.class); - // installer classes.add(CAInstallerService.class); diff --git a/base/common/src/com/netscape/certsrv/ca/CAClient.java b/base/common/src/com/netscape/certsrv/ca/CAClient.java index ff5a0e214..e1a0a8c02 100644 --- a/base/common/src/com/netscape/certsrv/ca/CAClient.java +++ b/base/common/src/com/netscape/certsrv/ca/CAClient.java @@ -23,7 +23,6 @@ import com.netscape.certsrv.cert.CertClient; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.group.GroupClient; -import com.netscape.certsrv.logging.AuditClient; import com.netscape.certsrv.profile.ProfileClient; import com.netscape.certsrv.selftests.SelfTestClient; import com.netscape.certsrv.user.UserClient; @@ -37,7 +36,6 @@ public class CAClient extends SubsystemClient { public void init() throws URISyntaxException { - addClient(new AuditClient(client, name)); addClient(new CertClient(client, name)); addClient(new GroupClient(client, name)); addClient(new ProfileClient(client, name)); diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java index a21850153..1eb102fae 100644 --- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java +++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java @@ -4,7 +4,6 @@ import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.key.KeyClient; -import com.netscape.certsrv.logging.AuditClient; import com.netscape.certsrv.selftests.SelfTestClient; import com.netscape.certsrv.system.SystemCertClient; import com.netscape.certsrv.user.UserClient; @@ -18,7 +17,6 @@ public class KRAClient extends SubsystemClient { public void init() throws Exception { - addClient(new AuditClient(client, name)); addClient(new GroupClient(client, name)); addClient(new KeyClient(client, name)); addClient(new SelfTestClient(client, name)); diff --git a/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java index 6163d4818..ab85bd200 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java +++ b/base/common/src/com/netscape/certsrv/ocsp/OCSPClient.java @@ -22,7 +22,6 @@ import java.net.URISyntaxException; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.group.GroupClient; -import com.netscape.certsrv.logging.AuditClient; import com.netscape.certsrv.selftests.SelfTestClient; import com.netscape.certsrv.user.UserClient; @@ -34,7 +33,6 @@ public class OCSPClient extends SubsystemClient { } public void init() throws URISyntaxException { - addClient(new AuditClient(client, name)); addClient(new GroupClient(client, name)); addClient(new SelfTestClient(client, name)); addClient(new UserClient(client, name)); diff --git a/base/common/src/com/netscape/certsrv/tks/TKSClient.java b/base/common/src/com/netscape/certsrv/tks/TKSClient.java index 5adde7461..a972241ce 100644 --- a/base/common/src/com/netscape/certsrv/tks/TKSClient.java +++ b/base/common/src/com/netscape/certsrv/tks/TKSClient.java @@ -22,7 +22,6 @@ import java.net.URISyntaxException; import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.client.SubsystemClient; import com.netscape.certsrv.group.GroupClient; -import com.netscape.certsrv.logging.AuditClient; import com.netscape.certsrv.selftests.SelfTestClient; import com.netscape.certsrv.system.TPSConnectorClient; import com.netscape.certsrv.user.UserClient; @@ -35,7 +34,6 @@ public class TKSClient extends SubsystemClient { } public void init() throws URISyntaxException { - addClient(new AuditClient(client, name)); addClient(new GroupClient(client, name)); addClient(new SelfTestClient(client, name)); addClient(new TPSConnectorClient(client, name)); diff --git a/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java index 3cb456e5f..17fb4866f 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/CACLI.java @@ -22,7 +22,6 @@ import com.netscape.certsrv.ca.CAClient; import com.netscape.certsrv.client.Client; import com.netscape.cmstools.cert.CertCLI; import com.netscape.cmstools.group.GroupCLI; -import com.netscape.cmstools.logging.AuditCLI; import com.netscape.cmstools.profile.ProfileCLI; import com.netscape.cmstools.selftests.SelfTestCLI; import com.netscape.cmstools.system.KRAConnectorCLI; @@ -38,7 +37,6 @@ public class CACLI extends SubsystemCLI { public CACLI(CLI parent) { super("ca", "CA management commands", parent); - addModule(new AuditCLI(this)); addModule(new CertCLI(this)); addModule(new GroupCLI(this)); addModule(new KRAConnectorCLI(this)); diff --git a/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java b/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java index 3c61cafe3..8a9f789cd 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/KRACLI.java @@ -22,7 +22,6 @@ import com.netscape.certsrv.client.Client; import com.netscape.certsrv.kra.KRAClient; import com.netscape.cmstools.group.GroupCLI; import com.netscape.cmstools.key.KeyCLI; -import com.netscape.cmstools.logging.AuditCLI; import com.netscape.cmstools.selftests.SelfTestCLI; import com.netscape.cmstools.user.UserCLI; @@ -36,7 +35,6 @@ public class KRACLI extends SubsystemCLI { public KRACLI(CLI parent) { super("kra", "KRA management commands", parent); - addModule(new AuditCLI(this)); addModule(new GroupCLI(this)); addModule(new KeyCLI(this)); addModule(new SelfTestCLI(this)); diff --git a/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java index 1eea5aad5..3768a48e7 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/OCSPCLI.java @@ -21,7 +21,6 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.ocsp.OCSPClient; import com.netscape.cmstools.group.GroupCLI; -import com.netscape.cmstools.logging.AuditCLI; import com.netscape.cmstools.selftests.SelfTestCLI; import com.netscape.cmstools.user.UserCLI; @@ -35,7 +34,6 @@ public class OCSPCLI extends SubsystemCLI { public OCSPCLI(CLI parent) { super("ocsp", "OCSP management commands", parent); - addModule(new AuditCLI(this)); addModule(new GroupCLI(this)); addModule(new SelfTestCLI(this)); addModule(new UserCLI(this)); diff --git a/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java index cfc5d6ab5..dd4f179c2 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/TKSCLI.java @@ -21,7 +21,6 @@ package com.netscape.cmstools.cli; import com.netscape.certsrv.client.Client; import com.netscape.certsrv.tks.TKSClient; import com.netscape.cmstools.group.GroupCLI; -import com.netscape.cmstools.logging.AuditCLI; import com.netscape.cmstools.selftests.SelfTestCLI; import com.netscape.cmstools.system.TPSConnectorCLI; import com.netscape.cmstools.user.UserCLI; @@ -36,7 +35,6 @@ public class TKSCLI extends SubsystemCLI { public TKSCLI(CLI parent) { super("tks", "TKS management commands", parent); - addModule(new AuditCLI(this)); addModule(new GroupCLI(this)); addModule(new SelfTestCLI(this)); addModule(new TPSConnectorCLI(this)); 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 a69eeb52a..ab9f821b3 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java @@ -18,13 +18,12 @@ package com.netscape.cmstools.logging; -import java.util.Arrays; - import java.io.BufferedReader; import java.io.FileReader; import java.io.FileWriter; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; @@ -52,7 +51,7 @@ public class AuditModifyCLI extends CLI { } public void createOptions() { - Option option = new Option(null, "action", true, "Action: update (default), enable, disable."); + Option option = new Option(null, "action", true, "Action: enable, disable."); option.setArgName("action"); options.addOption(option); @@ -92,16 +91,16 @@ public class AuditModifyCLI extends CLI { System.exit(-1); } - String action = cmd.getOptionValue("action", "update"); + String action = cmd.getOptionValue("action"); String input = cmd.getOptionValue("input"); String output = cmd.getOptionValue("output"); AuditConfig auditConfig; - if (action.equals("update")) { + if (action == null) { // modify audit configuration if (input == null) { - System.err.println("Error: Input file is required."); + System.err.println("Error: Missing action or input file."); printHelp(); System.exit(-1); } @@ -120,7 +119,14 @@ public class AuditModifyCLI extends CLI { auditConfig = auditCLI.auditClient.updateAuditConfig(auditConfig); - } else { // other actions + } else { // change audit status + + if (input != null) { + System.err.println("Error: Action and input file are mutually exclusive."); + printHelp(); + System.exit(-1); + } + auditConfig = auditCLI.auditClient.changeAuditStatus(action); } diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java index 6244270c0..773d8dd19 100644 --- a/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java @@ -7,7 +7,6 @@ import javax.ws.rs.core.Application; import org.dogtagpki.server.rest.ACLInterceptor; import org.dogtagpki.server.rest.AccountService; -import org.dogtagpki.server.rest.AuditService; import org.dogtagpki.server.rest.AuthMethodInterceptor; import org.dogtagpki.server.rest.GroupService; import org.dogtagpki.server.rest.MessageFormatInterceptor; @@ -32,9 +31,6 @@ public class KRAApplication extends Application { // account classes.add(AccountService.class); - // audit - classes.add(AuditService.class); - // installer classes.add(KRAInstallerService.class); diff --git a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java index 8d6e4a983..99fefaeda 100644 --- a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java +++ b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java @@ -7,7 +7,6 @@ import javax.ws.rs.core.Application; import org.dogtagpki.server.rest.ACLInterceptor; import org.dogtagpki.server.rest.AccountService; -import org.dogtagpki.server.rest.AuditService; import org.dogtagpki.server.rest.AuthMethodInterceptor; import org.dogtagpki.server.rest.GroupService; import org.dogtagpki.server.rest.MessageFormatInterceptor; @@ -32,9 +31,6 @@ public class OCSPApplication extends Application { // account classes.add(AccountService.class); - // audit - classes.add(AuditService.class); - // installer classes.add(OCSPInstallerService.class); diff --git a/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java index ca19e38d8..278076d13 100644 --- a/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java +++ b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java @@ -7,7 +7,6 @@ import javax.ws.rs.core.Application; import org.dogtagpki.server.rest.ACLInterceptor; import org.dogtagpki.server.rest.AccountService; -import org.dogtagpki.server.rest.AuditService; import org.dogtagpki.server.rest.AuthMethodInterceptor; import org.dogtagpki.server.rest.GroupService; import org.dogtagpki.server.rest.MessageFormatInterceptor; @@ -27,9 +26,6 @@ public class TKSApplication extends Application { // account classes.add(AccountService.class); - // audit - classes.add(AuditService.class); - // installer classes.add(TKSInstallerService.class); |