Author: keith Date: Thu Jul 17 07:35:22 2008 New Revision: 19417 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19417
Log: Not showing certificate upload sections untill a user uploads his private key Modified: trunk/mashup/java/modules/www/cert_manager.jsp Modified: trunk/mashup/java/modules/www/cert_manager.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/cert_manager.jsp?rev=19417&r1=19416&r2=19417&view=diff ============================================================================== --- trunk/mashup/java/modules/www/cert_manager.jsp (original) +++ trunk/mashup/java/modules/www/cert_manager.jsp Thu Jul 17 07:35:22 2008 @@ -134,10 +134,18 @@ } function clearText() { - document.getElementById("cert").value = ""; - document.getElementById("alias").value = ""; - document.getElementById("url").value = ""; - document.getElementById("alias_url").value = ""; + var cert = document.getElementById("cert"); + if (cert != null) { + cert.value = ""; + document.getElementById("alias").value = ""; + document.getElementById("url").value = ""; + document.getElementById("alias_url").value = ""; + } else { + document.getElementById("dataHandler").value = ""; + document.getElementById("keyStorePass").value = ""; + document.getElementById("privateKeyAlias").value = ""; + document.getElementById("privateKeyPass").value = ""; + } } function deleteCertCallback() { @@ -192,59 +200,16 @@ <% } else { %> -<div class="page_title">Trusted Site Certificates of <%=RegistryUtils.getFullName(request, currentUser)%></div> -<fieldset> - <legend><font color="#000000"><strong>Add a new certificate from a file</strong></font></legend> - <br/> - - <form id="form" method="post" enctype="multipart/form-data" - action="<%=axis2ConfigContext.getServicePath()%>/MashupAdminService/importCert" - target="uploadFrame"> - <input type="hidden" id="userName" name="userName" value="<%=currentUser%>"/> - <label>Certificate<font color="red">*</font></label><input - type="file" size="50" id="cert" name="cert" - style="margin-left: 5px;" onkeydown="noEnter(event);"/> - <br/> - <br/> - <label>Alias<font color="red">*</font></label> <input type="text" id="alias" - name="alias" - style="margin-left: 32px;" - onkeydown="noEnter(event);"/> - <br/> - <br/> - <input type="button" value="Upload" align="right" - onclick="return submitFormAsync('form',true);"/> - </form> -</fieldset> -<br/> -<fieldset> - <legend><font color="#000000"><strong>Add a new certificate using a trusted HTTPS site URL</strong></font></legend> - <br/> - <div> - <label>Site URL<font color="red">*</font></label><input - type="text" size="50" id="url" name="cert" - style="margin-left: 10px;" onkeydown="noEnter(event);" value=""/> - <br/> - <br/> - <label>Alias<font color="red">*</font></label><input type="text" id="alias_url" - name="alias" - style="margin-left: 32px;" - onkeydown="noEnter(event);" value=""/> - <br/> - <br/> - <input type="button" value="Add" align="right" - onclick="addCertFromUrl();"/> - </div> -</fieldset> -<br/> <% String keyStoreName = currentUser + MashupConstants.KEY_STORE_SUFFIX; PersistenceManager pm = new PersistenceManager(); KeyStoreDO keyStoreDO = pm.getKeyStore(keyStoreName); - // If the private key alias is "DefaultPrivateKeyEntry" that means the user has not added any private key as yet + // If the private key alias is "DefaultPrivateKeyEntry" that means the user has not added any private key as yet if (MashupConstants.DEFAULT_PRIVATE_KEY_ENTRY.equals(keyStoreDO.getPrivateKeyAlias())) { %> +<div class="page_title">Upload private key using a KeyStore</div> +<div>After uploading your private key, you can secure your mashups and upload certificates into your keystore to enable secure communication with secured endpoints.</div><br/> <fieldset> <legend><font color="#000000"><strong>Upload private key using a KeyStore</strong></font></legend> <br/> @@ -292,11 +257,59 @@ onclick="return submitImportPrivateKeyFromKeyStoreFormAsync('importPrivateKeyFromKeyStoreForm');"/></td> <td> </td> </tr> - </table> + </table> </form> </fieldset> <br/> <% + } else { +%> +<div class="page_title">Trusted Site Certificates of <%=RegistryUtils.getFullName(request, currentUser)%></div> +<fieldset> + <legend><font color="#000000"><strong>Add a new certificate from a file</strong></font></legend> + <br/> + + <form id="form" method="post" enctype="multipart/form-data" + action="<%=axis2ConfigContext.getServicePath()%>/MashupAdminService/importCert" + target="uploadFrame"> + <input type="hidden" id="userName" name="userName" value="<%=currentUser%>"/> + <label>Certificate<font color="red">*</font></label><input + type="file" size="50" id="cert" name="cert" + style="margin-left: 5px;" onkeydown="noEnter(event);"/> + <br/> + <br/> + <label>Alias<font color="red">*</font></label> <input type="text" id="alias" + name="alias" + style="margin-left: 32px;" + onkeydown="noEnter(event);"/> + <br/> + <br/> + <input type="button" value="Upload" align="right" + onclick="return submitFormAsync('form',true);"/> + </form> +</fieldset> +<br/> +<fieldset> + <legend><font color="#000000"><strong>Add a new certificate using a trusted HTTPS site URL</strong></font></legend> + <br/> + <div> + <label>Site URL<font color="red">*</font></label><input + type="text" size="50" id="url" name="cert" + style="margin-left: 10px;" onkeydown="noEnter(event);" value=""/> + <br/> + <br/> + <label>Alias<font color="red">*</font></label><input type="text" id="alias_url" + name="alias" + style="margin-left: 32px;" + onkeydown="noEnter(event);" value=""/> + <br/> + <br/> + <input type="button" value="Add" align="right" + onclick="addCertFromUrl();"/> + </div> +</fieldset> +<br/> +<% } %> <fieldset> _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
