This patch adds the token prefix to connector nickName's when installed with HSM.
Patch tested on RHEL7.2 VM with lunasa. thanks, Christina
>From 3c6816c38723daaa3b2e21b2a1b67d4ff21db64d Mon Sep 17 00:00:00 2001 From: Christina Fu <[email protected]> Date: Tue, 10 May 2016 11:18:38 -0700 Subject: [PATCH] Ticket#1508 Missing token prefix for connectors in TPS Installation with HSM This patch adds the token prefix to connector nickName's when installed with HSM --- .../org/dogtagpki/server/tps/rest/TPSInstallerService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java index fe4e124461ff1fc0c02e86121275248dccb258d1..d1910fd43ff9d53e5dd09ddb01905382064ea022 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java @@ -48,6 +48,12 @@ public class TPSInstallerService extends SystemConfigService { super.configureSubsystem(request, certList, token, domainXML); + // get token prefix, if applicable + String tokPrefix = ""; + if (!request.getToken().equals(request.TOKEN_DEFAULT)) { + tokPrefix = request.getToken() + ":"; + } + // get subsystem certificate nickname String nickname = null; for (SystemCertData cert : request.getSystemCerts()) { @@ -62,13 +68,13 @@ public class TPSInstallerService extends SystemConfigService { } // CA Info Panel - configureCAConnector(request, nickname); + configureCAConnector(request, tokPrefix + nickname); // TKS Info Panel - configureTKSConnector(request, nickname); + configureTKSConnector(request, tokPrefix + nickname); //DRM Info Panel - configureKRAConnector(request, nickname); + configureKRAConnector(request, tokPrefix + nickname); //AuthDBPanel ConfigurationUtils.updateAuthdbInfo(request.getAuthdbBaseDN(), @@ -77,7 +83,6 @@ public class TPSInstallerService extends SystemConfigService { } public void configureCAConnector(ConfigurationRequest request, String nickname) { - // TODO: get installer from session TPSInstaller installer = new TPSInstaller(); installer.configureCAConnector(request.getCaUri(), nickname); -- 2.4.3
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
