Author: keith Date: Thu Jul 17 08:19:47 2008 New Revision: 19418 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19418
Log: Fixing Mashup-943 Modified: trunk/mashup/java/modules/www/cert_manager.jsp trunk/mashup/java/modules/www/service_security_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=19418&r1=19417&r2=19418&view=diff ============================================================================== --- trunk/mashup/java/modules/www/cert_manager.jsp (original) +++ trunk/mashup/java/modules/www/cert_manager.jsp Thu Jul 17 08:19:47 2008 @@ -21,6 +21,7 @@ <%@ page import="java.util.Comparator" %> <%@ page import="org.wso2.wsas.persistence.dataobject.KeyStoreDO" %> <%@ page import="org.wso2.wsas.persistence.PersistenceManager" %> +<%@ page import="java.net.URLDecoder" %> <!--Required to keep a user logged in if 'Remember Me' option is selected--> <%@ include file="validate_login.jsp" %> @@ -30,7 +31,23 @@ String currentUser = RegistryUtils.getCurrentUser(userRegistry); String thisPage = "cert_manager.jsp"; %> +<% + String bounceback = request.getParameter("bounceback"); + if (bounceback != null) { + bounceback = URLDecoder.decode(bounceback, "UTF-8"); + } + String keyStoreName = currentUser + MashupConstants.KEY_STORE_SUFFIX; + PersistenceManager pm = new PersistenceManager(); + KeyStoreDO keyStoreDO = pm.getKeyStore(keyStoreName); + boolean cameFromSecScenarioPage = false; + // 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())) { + if (bounceback != null && bounceback.startsWith("service_security_manager.jsp")) { + cameFromSecScenarioPage = true; + } + } +%> <html> <head> <title><%= bundle.getString("main.title")%> - Certificate Manager</title> @@ -52,6 +69,8 @@ <script type="text/javascript" language="JavaScript"> var currentUser = '<%=currentUser.trim()%>'; + var cameFromSecScenarioPage = '<%=cameFromSecScenarioPage%>'; + var bounceback = '<%=bounceback%>'; var callback = { @@ -74,7 +93,11 @@ function handleSuccess(){ WSO2.MashupUtils.dialog.close(); clearText(); - location.reload(); + if (cameFromSecScenarioPage) { + window.location=bounceback; + } else { + location.reload(); + } } function submitFormAsync(formId, isFileUpload) { @@ -201,14 +224,18 @@ } else { %> <% - 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 (MashupConstants.DEFAULT_PRIVATE_KEY_ENTRY.equals(keyStoreDO.getPrivateKeyAlias())) { + if (cameFromSecScenarioPage) { +%> +<div class="page_title">Please Upload your private key using a KeyStore before engaging security scenarios</div> +<% +} else { +%> +<div class="page_title">Upload your private key using a KeyStore (JKS or PKCS12)</div> +<% +} %> -<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> Modified: trunk/mashup/java/modules/www/service_security_manager.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/service_security_manager.jsp?rev=19418&r1=19417&r2=19418&view=diff ============================================================================== --- trunk/mashup/java/modules/www/service_security_manager.jsp (original) +++ trunk/mashup/java/modules/www/service_security_manager.jsp Thu Jul 17 08:19:47 2008 @@ -23,6 +23,8 @@ <%@ page import="org.wso2.wsas.persistence.dataobject.SecurityScenarioDO" %> <%@ page import="org.wso2.registry.exceptions.RegistryException" %> <%@ page import="java.net.URLDecoder" %> +<%@ page import="org.wso2.wsas.persistence.dataobject.KeyStoreDO" %> +<%@ page import="org.wso2.wsas.persistence.PersistenceManager" %> <!--Required to keep a user logged in if 'Remember Me' option is selected--> <%@ include file="validate_login.jsp" %> @@ -47,6 +49,16 @@ String thisPage = "service_security_manager.jsp?author=" + mashupOwner + "&mashup=" + mashup; MashupUtils.isValidMashup(mashupOwner, mashup); String serviceName = mashupOwner + MashupConstants.SEPARATOR_CHAR + mashup; + String currentUser = RegistryUtils.getCurrentUser(userRegistry); + 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 (MashupConstants.DEFAULT_PRIVATE_KEY_ENTRY.equals(keyStoreDO.getPrivateKeyAlias())) { + + response.sendRedirect("cert_manager.jsp?bounceback=" + URLEncoder.encode(thisPage, "UTF-8")); + } %> <html> _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
