From 168d95446c3a7ae8643128a51fa86dd326e3a6a8 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 6 Sep 2012 16:33:48 -0500 Subject: Enabled authentication for security domain REST interface. The REST interface for security domain has been refactored and configured such that it requires authentication. A CLI has been added to get an installation token. Ticket #309 --- .../netscape/cms/servlet/csadmin/ConfigurationUtils.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java') diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index 89233bdc2..531fc212f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -146,8 +146,7 @@ import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.ocsp.IDefStore; import com.netscape.certsrv.ocsp.IOCSPAuthority; import com.netscape.certsrv.system.InstallToken; -import com.netscape.certsrv.system.InstallTokenRequest; -import com.netscape.certsrv.system.SystemConfigClient; +import com.netscape.certsrv.system.SecurityDomainClient; import com.netscape.certsrv.usrgrp.EUsrGrpException; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; @@ -322,17 +321,17 @@ public class ConfigurationUtils { } String csType = cs.getString("cs.type"); - InstallTokenRequest data = new InstallTokenRequest(user, passwd, csType, CMS.getEEHost(), CMS.getAdminPort()); - ClientConfig config = new ClientConfig(); config.setServerURI("https://" + sdhost + ":" + sdport + "/ca"); + config.setUsername(user); + config.setPassword(passwd); - SystemConfigClient client = new SystemConfigClient(config); + SecurityDomainClient client = new SecurityDomainClient(config); - InstallToken token = null; try { - token = client.getInstallToken(data); + InstallToken token = client.getInstallToken(sdhost, csType); return token.getToken(); + } catch (ClientResponseFailure e) { if (e.getResponse().getResponseStatus() == Response.Status.NOT_FOUND) { // try the old servlet -- cgit