From 97191543adc96d676e6dfcc7c9b2ce95d22c6210 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Fri, 13 May 2016 14:22:08 +1000 Subject: Lightweight CAs: add issuer DN and serial to AuthorityData Add issuer DN and serial number to the AuthorityData object, as read-only attributes. Values are displayed in the CLI, when present in the response data. Fixes: https://fedorahosted.org/pki/ticket/1618 --- .../src/com/netscape/cmstools/authority/AuthorityCLI.java | 14 +++++++++++++- .../netscape/cmstools/authority/AuthorityCreateCLI.java | 2 +- .../netscape/cmstools/authority/AuthorityDisableCLI.java | 2 +- .../netscape/cmstools/authority/AuthorityEnableCLI.java | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) (limited to 'base/java-tools/src/com') diff --git a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCLI.java b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCLI.java index f42660d67..a3fccbb02 100644 --- a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCLI.java @@ -1,5 +1,7 @@ package com.netscape.cmstools.authority; +import java.math.BigInteger; + import com.netscape.certsrv.authority.AuthorityClient; import com.netscape.certsrv.authority.AuthorityData; import com.netscape.cmstools.cli.CLI; @@ -42,9 +44,19 @@ public class AuthorityCLI extends CLI { System.out.println(" Host authority: true"); System.out.println(" Authority DN: " + data.getDN()); System.out.println(" ID: " + data.getID()); + String parentAID = data.getParentID(); if (parentAID != null) - System.out.println(" Parent ID: " + data.getParentID()); + System.out.println(" Parent ID: " + parentAID); + + String issuerDN = data.getIssuerDN(); + if (issuerDN != null) + System.out.println(" Issuer DN: " + issuerDN); + + BigInteger serial = data.getSerial(); + if (serial != null) + System.out.println(" Serial no: " + serial); + System.out.println(" Enabled: " + data.getEnabled()); System.out.println(" Ready to sign: " + data.getReady()); String desc = data.getDescription(); diff --git a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCreateCLI.java b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCreateCLI.java index 3c36ac756..7f40662b6 100644 --- a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCreateCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityCreateCLI.java @@ -81,7 +81,7 @@ public class AuthorityCreateCLI extends CLI { String dn = cmdArgs[0]; AuthorityData data = new AuthorityData( - null, dn, null, parentAIDString, true /* enabled */, desc, null); + null, dn, null, parentAIDString, null, null, true /* enabled */, desc, null); AuthorityData newData = authorityCLI.authorityClient.createCA(data); AuthorityCLI.printAuthorityData(newData); } diff --git a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityDisableCLI.java b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityDisableCLI.java index 85b38f081..b1265b503 100644 --- a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityDisableCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityDisableCLI.java @@ -48,7 +48,7 @@ public class AuthorityDisableCLI extends CLI { } AuthorityData data = new AuthorityData( - null, null, cmdArgs[0], null, false, null, null); + null, null, cmdArgs[0], null, null, null, false, null, null); data = authorityCLI.authorityClient.modifyCA(data); AuthorityCLI.printAuthorityData(data); } diff --git a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityEnableCLI.java b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityEnableCLI.java index 936edca59..5afef455b 100644 --- a/base/java-tools/src/com/netscape/cmstools/authority/AuthorityEnableCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/authority/AuthorityEnableCLI.java @@ -48,7 +48,7 @@ public class AuthorityEnableCLI extends CLI { } AuthorityData data = new AuthorityData( - null, null, cmdArgs[0], null, true, null, null); + null, null, cmdArgs[0], null, null, null, true, null, null); data = authorityCLI.authorityClient.modifyCA(data); AuthorityCLI.printAuthorityData(data); } -- cgit