diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/client/user')
4 files changed, 24 insertions, 14 deletions
diff --git a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java index 2370865ad..61ca60137 100644 --- a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java @@ -92,6 +92,6 @@ public class UserAddCertCLI extends CLI { MainCLI.printMessage("Added certificate \"" + userCertData.getID() + "\""); - UserCLI.printCert(userCertData); + UserCLI.printCert(userCertData, false, false); } } diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/common/src/com/netscape/cms/client/user/UserCLI.java index a7bc752e1..e9c9acd67 100644 --- a/base/common/src/com/netscape/cms/client/user/UserCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserCLI.java @@ -125,28 +125,32 @@ public class UserCLI extends CLI { } } - public static void printCert(UserCertData userCertData) throws Exception { + public static void printCert( + UserCertData userCertData, + boolean showPrettyPrint, + boolean showEncoded) { + System.out.println(" Cert ID: " + userCertData.getID()); - System.out.println(" Serial Number: " + userCertData.getSerialNumber()); System.out.println(" Version: " + userCertData.getVersion()); - System.out.println(" Issuer DN: " + userCertData.getIssuerDN()); - System.out.println(" Subject DN: " + userCertData.getSubjectDN()); + System.out.println(" Serial Number: " + userCertData.getSerialNumber().toHexString()); + System.out.println(" Issuer: " + userCertData.getIssuerDN()); + System.out.println(" Subject: " + userCertData.getSubjectDN()); + + Link link = userCertData.getLink(); + if (verbose && link != null) { + System.out.println(" Link: " + link.getHref()); + } String prettyPrint = userCertData.getPrettyPrint(); - if (prettyPrint != null) { + if (showPrettyPrint && prettyPrint != null) { System.out.println(); System.out.println(prettyPrint); } String encoded = userCertData.getEncoded(); - if (encoded != null) { + if (showEncoded && encoded != null) { System.out.println(); System.out.println(encoded); } - - Link link = userCertData.getLink(); - if (verbose && link != null) { - System.out.println(" Link: " + link.getHref()); - } } } diff --git a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java index 41fe3984a..c06d21faf 100644 --- a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java @@ -96,7 +96,7 @@ public class UserFindCertCLI extends CLI { System.out.println(); } - UserCLI.printCert(userCertData); + UserCLI.printCert(userCertData, false, false); } MainCLI.printMessage("Number of entries returned " + entries.size()); diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java index 7e58fb1b0..71e14b4fc 100644 --- a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java @@ -50,6 +50,9 @@ public class UserShowCertCLI extends CLI { option.setArgName("file"); options.addOption(option); + options.addOption(null, "pretty", false, "Pretty print"); + options.addOption(null, "encoded", false, "Base-64 encoded"); + CommandLine cmd = null; try { @@ -61,6 +64,9 @@ public class UserShowCertCLI extends CLI { System.exit(1); } + boolean showPrettyPrint = cmd.hasOption("pretty"); + boolean showEncoded = cmd.hasOption("encoded"); + String[] cmdArgs = cmd.getArgs(); if (cmdArgs.length != 2) { @@ -82,6 +88,6 @@ public class UserShowCertCLI extends CLI { out.close(); } - UserCLI.printCert(userCertData); + UserCLI.printCert(userCertData, showPrettyPrint, showEncoded); } } |