Bugzilla Bug #491517 - pkisilent Configure RA and TPS fail

(port separation changes only)
Bugzilla Bug #495676 -  pkisilent ConfigureCA failure on AdminCertImportPanel
Bugzilla Bug #500748 -  pki-silent : issues due to port separation changes
(only addressed CA, KRA, OCSP, and TKS)


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@460 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 28 insertions, 19 deletions

diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/pki/base/silent/src/drm/ConfigureDRM.java
index ae0130a62..a0bd3f67b 100644
--- a/pki/base/silent/src/drm/ConfigureDRM.java
+++ b/pki/base/silent/src/drm/ConfigureDRM.java
@@ -55,8 +55,7 @@ public class ConfigureDRM
 	
 	public static String login_uri = "/kra/admin/console/config/login";
 	public static String wizard_uri = "/kra/admin/console/config/wizard";
-	public static String domain_uri = "/kra/ee/ca/domain";
-	public static String ee_uri = "/ca/ee/ca/getBySerial";
+	public static String admin_uri = "/ca/admin/ca/getBySerial";
 
 	public static String sd_login_uri = "/ca/admin/ca/securityDomainLogin";
 	public static String sd_get_cookie_uri = "/ca/admin/ca/getCookie";
@@ -67,14 +66,14 @@ public class ConfigureDRM
 
 	public static String sd_hostname = null;
 	public static String sd_ssl_port = null;
+	public static String sd_agent_port = null;
+	public static String sd_admin_port = null;
 	public static String sd_admin_name = null;
 	public static String sd_admin_password = null;
 
 	public static String ca_hostname = null;
 	public static String ca_port = null;
 	public static String ca_ssl_port = null;
-	public static String ca_agent_name = null;
-	public static String ca_agent_password = null;
 
 	public static String client_certdb_dir = null;
 	public static String client_certdb_pwd = null;
@@ -209,7 +208,7 @@ public class ConfigureDRM
 		ParseXML px = new ParseXML();
 
 
-		String domain_url = "https://" + sd_hostname + ":" + sd_ssl_port ;
+		String domain_url = "https://" + sd_hostname + ":" + sd_admin_port ;
 
 		String query_string = "sdomainURL=" +
 							URLEncoder.encode(domain_url) +
@@ -240,9 +239,9 @@ public class ConfigureDRM
 		query_string = "p=2" + "&op=next" + "&xml=true"; 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
 		// parse xml
-		bais = new ByteArrayInputStream(hr.getHTML().getBytes());
-		px.parse(bais);
-		px.prettyprintxml();
+		// bais = new ByteArrayInputStream(hr.getHTML().getBytes());
+		// px.parse(bais);
+		// px.prettyprintxml();
 
 		return true;
 
@@ -262,13 +261,13 @@ public class ConfigureDRM
 
 		String query_string = "url=" + URLEncoder.encode(kra_url); 
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_login_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_login_uri,query_string);
 
 		String query_string_1 = "uid=" + sd_admin_name +
 								"&pwd=" + sd_admin_password +
 								"&url=" + URLEncoder.encode(kra_url) ;
 
-		hr = hc.sslConnect(sd_hostname,sd_ssl_port,sd_get_cookie_uri,
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,sd_get_cookie_uri,
 						query_string_1);
 
 		// get session id from security domain
@@ -713,10 +712,12 @@ public class ConfigureDRM
 							URLEncoder.encode(admin_email) +
 							"&cert_request=" + 
 							URLEncoder.encode(admin_cert_request) +
-							"&subject=" + URLEncoder.encode(agent_cert_subject) +
+							"&subject=" +
+							URLEncoder.encode(agent_cert_subject) +
 							"&clone=new" +
 							"&import=true" +
-							"&securitydomain=" + domain_name +
+							"&securitydomain=" +
+							URLEncoder.encode(domain_name) +
 							""; 
 
 		hr = hc.sslConnect(cs_hostname,cs_port,wizard_uri,query_string);
@@ -742,7 +743,7 @@ public class ConfigureDRM
 							"&importCert=" + "true" +
 							""; 
 
-		hr = hc.sslConnect(ca_hostname,ca_ssl_port,ee_uri,query_string);
+		hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string);
 		
 		// get response data
 		String cert_to_import = 
@@ -780,8 +781,8 @@ public class ConfigureDRM
 		ParseXML px = new ParseXML();
 
 		String query_string = "p=14" + "&op=next" + 
-							"&caHost=" + URLEncoder.encode(ca_hostname) +
-							"&caPort=" + URLEncoder.encode(ca_ssl_port) +
+							"&caHost=" + URLEncoder.encode(sd_hostname) +
+							"&caPort=" + URLEncoder.encode(sd_agent_port) +
 							"&pkcs7=" + URLEncoder.encode("/") +
 							"&serialNumber=" + URLEncoder.encode(admin_serial_number) +
 							""; 
@@ -961,6 +962,8 @@ public class ConfigureDRM
 
 		StringHolder x_sd_hostname = new StringHolder();
 		StringHolder x_sd_ssl_port = new StringHolder();
+		StringHolder x_sd_agent_port = new StringHolder();
+		StringHolder x_sd_admin_port = new StringHolder();
 		StringHolder x_sd_admin_name = new StringHolder();
 		StringHolder x_sd_admin_password = new StringHolder();
 
@@ -1015,13 +1018,17 @@ public class ConfigureDRM
 
 		parser.addOption ("-cs_hostname %s #CS Hostname",
 							x_cs_hostname); 
-		parser.addOption ("-cs_port %s #CS SSL port",
+		parser.addOption ("-cs_port %s #CS SSL Admin port",
 							x_cs_port); 
 
 		parser.addOption ("-sd_hostname %s #Security Domain Hostname",
 							x_sd_hostname); 
-		parser.addOption ("-sd_ssl_port %s #Security Domain SSL port",
+		parser.addOption ("-sd_ssl_port %s #Security Domain SSL EE port",
 							x_sd_ssl_port); 
+		parser.addOption ("-sd_agent_port %s #Security Domain SSL Agent port",
+							x_sd_agent_port); 
+		parser.addOption ("-sd_admin_port %s #Security Domain SSL Admin port",
+							x_sd_admin_port); 
 		parser.addOption ("-sd_admin_name %s #Security Domain username",
 							x_sd_admin_name); 
 		parser.addOption ("-sd_admin_password %s #Security Domain password",
@@ -1029,9 +1036,9 @@ public class ConfigureDRM
 
 		parser.addOption ("-ca_hostname %s #CA Hostname",
 							x_ca_hostname); 
-		parser.addOption ("-ca_port %s #CA non SSL port",
+		parser.addOption ("-ca_port %s #CA non-SSL EE port",
 							x_ca_port); 
-		parser.addOption ("-ca_ssl_port %s #CA SSL port",
+		parser.addOption ("-ca_ssl_port %s #CA SSL EE port",
 							x_ca_ssl_port); 
 
 		parser.addOption ("-client_certdb_dir %s #Client CertDB dir",
@@ -1120,6 +1127,8 @@ public class ConfigureDRM
 
 		sd_hostname = x_sd_hostname.value;
 		sd_ssl_port = x_sd_ssl_port.value;
+		sd_agent_port = x_sd_agent_port.value;
+		sd_admin_port = x_sd_admin_port.value;
 		sd_admin_name = x_sd_admin_name.value;
 		sd_admin_password = x_sd_admin_password.value;