From b602c041429e88c46362bc6e7cabe25c00a796ae Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Thu, 20 Mar 2014 11:33:13 -0400 Subject: New CLI commands for Key and KeyRequest resources. This patch adds three new CLI commands - KeyShowCLI, KeyRequestShowCLI, KeyModifyCLI --- .../src/com/netscape/cmstools/key/KeyCLI.java | 3 + .../com/netscape/cmstools/key/KeyModifyCLI.java | 82 ++++++++++++++++++++++ .../netscape/cmstools/key/KeyRequestShowCLI.java | 51 ++++++++++++++ .../src/com/netscape/cmstools/key/KeyShowCLI.java | 52 ++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java (limited to 'base/java-tools/src/com/netscape/cmstools/key') diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java index 59624b64f..86b6f2407 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java @@ -36,6 +36,9 @@ public class KeyCLI extends CLI { addModule(new KeyFindCLI(this)); addModule(new KeyRequestFindCLI(this)); + addModule(new KeyShowCLI(this)); + addModule(new KeyRequestShowCLI(this)); + addModule(new KeyModifyCLI(this)); } public String getFullName() { diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java new file mode 100644 index 000000000..729649e5c --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java @@ -0,0 +1,82 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.key; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.ParseException; + +import com.netscape.certsrv.dbs.keydb.KeyId; +import com.netscape.certsrv.key.KeyInfo; +import com.netscape.cmstools.cli.CLI; + +public class KeyModifyCLI extends CLI { + public KeyCLI keyCLI; + + public KeyModifyCLI(KeyCLI keyCLI) { + super("mod", "Get key request", keyCLI); + this.keyCLI = keyCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [OPTIONS]", options); + } + + public void execute(String[] args) { + + Option option = new Option(null, "status", true, "Status of the key.\n Valid values:[active,inactive]"); + option.setRequired(true); + option.setArgName("status"); + options.addOption(option); + + CommandLine cmd = null; + try { + cmd = parser.parse(options, args); + + } catch (ParseException e) { + System.err.println("Error: " + e.getMessage()); + printHelp(); + System.exit(1); + } + + String status = cmd.getOptionValue("status"); + if (status == null) { + System.out.println("No status:: " + status); + printHelp(); + System.exit(-1); + } + + String[] cmdArgs = cmd.getArgs(); + if (cmdArgs.length != 1) { + printHelp(); + System.exit(-1); + } + KeyId keyId = new KeyId(cmdArgs[0]); + + keyCLI.keyClient.modifyKeyStatus(keyId, status); + + KeyInfo keyInfo = keyCLI.keyClient.getKeyInfo(keyId); + if (keyInfo.getStatus().equalsIgnoreCase(status)) { + System.out.println("Success!"); + KeyCLI.printKeyInfo(keyInfo); + } else { + System.out.println("Failure! Key status not modified."); + } + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java new file mode 100644 index 000000000..3da5de279 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestShowCLI.java @@ -0,0 +1,51 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.key; + +import com.netscape.certsrv.key.KeyRequestInfo; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cmstools.cli.CLI; + +public class KeyRequestShowCLI extends CLI { + + public KeyCLI keyCLI; + + public KeyRequestShowCLI(KeyCLI keyCLI) { + super("request-show", "Get key request", keyCLI); + this.keyCLI = keyCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) { + + if (args.length != 1) { + printHelp(); + System.exit(-1); + } + + RequestId requestId = new RequestId(args[0].trim()); + + KeyRequestInfo keyRequestInfo = keyCLI.keyClient.getRequestInfo(requestId); + + KeyCLI.printKeyRequestInfo(keyRequestInfo); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java new file mode 100644 index 000000000..5f9a76187 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java @@ -0,0 +1,52 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.key; + +import com.netscape.certsrv.dbs.keydb.KeyId; +import com.netscape.certsrv.key.KeyInfo; +import com.netscape.cmstools.cli.CLI; + +public class KeyShowCLI extends CLI{ + + public KeyCLI keyCLI; + + public KeyShowCLI(KeyCLI keyCLI){ + super("show", "Get key", keyCLI); + this.keyCLI = keyCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args){ + + if (args.length != 1){ + printHelp(); + System.exit(-1); + } + + KeyId keyId = new KeyId(args[0].trim()); + + KeyInfo keyInfo = keyCLI.keyClient.getKeyInfo(keyId); + + KeyCLI.printKeyInfo(keyInfo); + } + +} -- cgit