Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 84106 invoked from network); 7 Nov 2006 03:09:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2006 03:09:13 -0000 Received: (qmail 62961 invoked by uid 500); 7 Nov 2006 03:09:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 62901 invoked by uid 500); 7 Nov 2006 03:09:06 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Delivered-To: moderator for scm@geronimo.apache.org Received: (qmail 20961 invoked by uid 99); 6 Nov 2006 21:45:03 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r471888 - in /geronimo/server/branches/1.1/applications/console-standard/src: java/org/apache/geronimo/console/securitymanager/realm/ webapp/WEB-INF/view/realmwizard/ Date: Mon, 06 Nov 2006 21:44:23 -0000 To: scm@geronimo.apache.org From: vamsic007@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061106214424.0720B1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vamsic007 Date: Mon Nov 6 13:44:22 2006 New Revision: 471888 URL: http://svn.apache.org/viewvc?view=rev&rev=471888 Log: GERONIMO-1592 Add NamedUPCredentialLoginModule to Console Realm Wizard Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Mon Nov 6 13:44:22 2006 @@ -44,6 +44,7 @@ import org.apache.geronimo.security.jaas.JaasLoginModuleChain; import org.apache.geronimo.security.jaas.LoginModuleSettings; import org.apache.geronimo.security.jaas.JaasLoginModuleUse; +import org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule; import org.apache.geronimo.security.realm.providers.FileAuditLoginModule; import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredentialLoginModule; import org.apache.geronimo.security.realm.providers.RepeatedFailureLockoutLoginModule; @@ -750,6 +751,16 @@ props.setProperty("lockoutDurationSecs", data.getLockoutDuration()); list.add(module); } + if (data.getCredentialName() != null) { + module = new LoginModuleDetails(); + module.setClassName(NamedUPCredentialLoginModule.class.getName()); + module.setControlFlag("OPTIONAL"); + module.setLoginDomainName(data.getName() + "-NamedUPC"); + module.setServerSide(true); + props = module.getOptions(); + props.setProperty(NamedUPCredentialLoginModule.CREDENTIAL_NAME, data.getCredentialName()); + list.add(module); + } } else { list.addAll(Arrays.asList(data.modules)); } @@ -774,6 +785,7 @@ private boolean storePassword; private String abstractName; // used when editing existing realms private LoginModuleDetails[] modules; + private String credentialName; public void load(PortletRequest request) { name = request.getParameter("name"); @@ -794,6 +806,8 @@ if (abstractName != null && abstractName.equals("")) abstractName = null; String test = request.getParameter("storePassword"); storePassword = test != null && !test.equals("") && !test.equals("false"); + credentialName = request.getParameter("credentialName"); + if (credentialName != null && credentialName.equals("")) credentialName = null; Map map = request.getParameterMap(); for (Iterator it = map.keySet().iterator(); it.hasNext();) { String key = (String) it.next(); @@ -884,6 +898,7 @@ if (lockoutDuration != null) response.setRenderParameter("lockoutDuration", lockoutDuration); if (abstractName != null) response.setRenderParameter("abstractName", abstractName); if (storePassword) response.setRenderParameter("storePassword", "true"); + if (credentialName != null) response.setRenderParameter("credentialName", credentialName); for (Iterator it = options.keySet().iterator(); it.hasNext();) { String name = (String) it.next(); String value = (String) options.get(name); @@ -950,6 +965,10 @@ public boolean isLockoutEnabled() { return lockoutCount != null || lockoutWindow != null || lockoutDuration != null; + } + + public String getCredentialName() { + return credentialName; } public String getAbstractName() { Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp Mon Nov 6 13:44:22 2006 @@ -97,6 +97,22 @@ Subject. This will allow access to the password later after the login process has completed. This is not normally required. + + +
Named Credential:
+ + checked="checked" + onclick="document.getElementById('namedUPCDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('credentialName').value='';"/> +
noneblock;"> + Credential Name: +
+ + + + + If enabled, the realm will store each username and password in a private credential in the + Subject under a specified credential name. + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp Mon Nov 6 13:44:22 2006 @@ -20,6 +20,7 @@ + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp Mon Nov 6 13:44:22 2006 @@ -29,6 +29,7 @@ + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp Mon Nov 6 13:44:22 2006 @@ -16,6 +16,7 @@ + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Mon Nov 6 13:44:22 2006 @@ -18,6 +18,7 @@ + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp Mon Nov 6 13:44:22 2006 @@ -23,6 +23,7 @@ + Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp?view=diff&rev=471888&r1=471887&r2=471888 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp Mon Nov 6 13:44:22 2006 @@ -19,6 +19,7 @@ +