Bugzilla Bug #492735 - Configuration wizard stores certain incorrect port

values within TPS "CS.cfg" . . .
Bugzilla Bug #495597 -  Unable to access Agent page using a configured CA/KRA 
containing an HSM


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

8 files changed, 39 insertions, 12 deletions

diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/pki/dogtag/ra-ui/shared/docroot/index.vm
index 40224d660..cfc7c7207 100644
--- a/pki/dogtag/ra-ui/shared/docroot/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/index.vm
@@ -64,7 +64,7 @@ Certificate System RA Services Page
 <tr valign="TOP">
 <td>
 <font size=4 face="PrimaSans BT, Verdana, sans-serif">
-<li><a href="https://$machineName:$securePort/ee/index.cgi">SSL End Users Services</a></li>
+<li><a href="https://$machineName:$non_clientauth_securePort/ee/index.cgi">SSL End Users Services</a></li>
 </font>
 </td>
 </tr>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
index ff4a4a153..6bea8a184 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
@@ -27,7 +27,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-A Certificate Authority (CA) is responsible for issuing different kinds of certificates.
+A Certificate Authority (CA) is responsible for issuing different kinds of certificates. Select an HTTPS EE URL of a CA from the list below.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
index 9473acd99..18af9c523 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
@@ -42,9 +42,17 @@ This instance can be configured as a new $systemname subsystem.
         <td><input type=text size="40" name="subsystemName" value="$subsystemName"> (e.g. - $fullsystemname)</td>
       </tr>
       <tr>
-        <th>Subsystem URL: </th>
+        <th>Subsystem HTTP URL (unsecure): </th>
+        <td>http://$machineName:$http_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (clientauth): </th>
         <td>https://$machineName:$https_port</td>
       </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (non-clientauth): </th>
+        <td>https://$machineName:$non_clientauth_https_port</td>
+      </tr>
     </table>
 <p>
 #if ($disableClone)
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
index eda7d256f..af23ff226 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
@@ -35,7 +35,7 @@ function performPanel() {
 As 'root', restart the server on the command line by typing "$initCommand
  restart". After performing this restart, the server should become operational.
 <br/>
-Please go to the <A href="https://$host:$port">service</A> page to access all of the available agent interfaces.
+Please go to the <A href="https://$host:$non_clientauth_port"><b>services page</b></A> to access all of the available interfaces.
 <br/>
 <br/>
 To create additional instances, type "/usr/bin/pkicreate" on the command line.
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
index 35f61fa3a..e4e6842ba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
@@ -30,7 +30,7 @@ A Data Recovery Manager (DRM) is responsible for server-side key generation, arc
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 <p>
 #end
-<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to a DRM to support server-side key generation.</b>
+<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to an HTTPS Agent URL of a DRM to support server-side key generation.</b>
 <p>
 <p>
     <table class="details">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
index a6f54cb37..9eb35b194 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
@@ -38,12 +38,12 @@ An administrator's certificate has been created and imported into this browser.
     <table class="details">
       <tr>
 #if ($ca == 'true' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
 #if ($caType == 'ca' && $import == 'true')
 <iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #end 
 #end
 <input type="hidden" name="serialNumber" value=$serialNumber />
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
index 205e18bb5..c85ee4006 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
@@ -65,8 +65,20 @@ If no security domain exists, a new one must be created for this CA.
         <td><input type=text size="40" name="sdomainName" value="$sdomainName"> (e.g. - Dogtag Security Domain)</td>
       </tr>
       <tr>
-        <th>Security Domain URL: </th>
-        <td>https://$machineName:$https_port</td>
+        <th>Security Domain HTTP EE URL (unsecure): </th>
+        <td>http://$machineName:$http_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Agent URL (clientauth): </th>
+        <td>https://$machineName:$https_agent_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS EE URL (non-clientauth): </th>
+        <td>https://$machineName:$https_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td>https://$machineName:$https_admin_port</td>
       </tr>
     </table>
 <br/>
@@ -89,8 +101,15 @@ Enter the URL to an existing security domain.
 <br/>
     <table class="details">
       <tr>
-        <th>Security Domain URL: </th>
-        <td><input type=text size="40" name="sdomainURL" value="$sdomainURL"> (e.g. - https://hostname:port)</td>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td><input type=text size="40" name="sdomainURL" value=""> (e.g. - $sdomainAdminURL)</td>
       </tr>
     </table>
 <br/>
+<table>
+<tr>
+<td valign="top"><b>NOTE:&nbsp;&nbsp; </b></td>
+<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status" from the command-line.  If no Security Domain URL is shown, the CA subsystem is not a Security Domain.</td>
+</tr>
+</table>
+<br/>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
index d30144074..f4cb5eb6b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
@@ -24,7 +24,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select a TKS from the list below.
+The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select an HTTPS Agent URL of a TKS from the list below.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>