From 8ad69540f831d9112c532a999ab89174265ca4a8 Mon Sep 17 00:00:00 2001 From: sumauppa Date: Tue, 1 Aug 2017 15:06:51 +0530 Subject: [PATCH 1/4] added password attributes --- .../cluster/src/main/resources/cluster/clusterNew.jsf | 3 ++- .../admingui/cluster/src/main/resources/node/nodeAttr.inc | 6 +++--- .../admingui/cluster/src/main/resources/node/nodeEdit.jsf | 2 +- .../admingui/cluster/src/main/resources/node/nodeNew.jsf | 2 +- .../admingui/common/security/AdminConsoleAuthModule.java | 2 +- .../common/src/main/resources/appServer/pswdAliasAttr.inc | 4 ++-- .../common/src/main/resources/appServer/pswdAliasEdit.jsf | 2 +- .../common/src/main/resources/appServer/pswdAliasNew.jsf | 2 +- .../main/resources/appServer/serverInstAdminPassword.jsf | 6 +++--- .../src/main/resources/security/realms/manageUserEdit.jsf | 6 +++--- .../src/main/resources/security/realms/manageUserNew.jsf | 4 ++-- .../common/src/main/resources/security/security.jsf | 2 +- .../common/src/main/resources/security/securityAttrs.inc | 2 +- .../src/main/resources/branding/loginform.inc | 4 ++-- .../jca/src/main/resources/connectorSecurityMapAttr.inc | 2 +- .../jca/src/main/resources/connectorSecurityMapEdit.jsf | 2 +- .../jca/src/main/resources/connectorSecurityMapNew.jsf | 2 +- .../src/main/resources/configureJmsClusterSheet.inc | 2 +- .../admingui/jms-plugin/src/main/resources/jmsHost.inc | 4 ++-- .../admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf | 2 +- .../admingui/jms-plugin/src/main/resources/jmsHostNew.jsf | 2 +- .../community/adminweb/basic/src/test/SeleniumTest.java | 2 +- .../adminconsole/src/test/admin/BaseAdminConsoleTest.java | 2 +- .../quicklook/adminweb/basic/src/test/SeleniumTest.java | 2 +- .../community/adminweb/basic/src/test/SeleniumTest.java | 2 +- .../appserv-tests/sqetests/admin-gui/src/AdminGUITest.java | 2 +- .../java/org/apache/catalina/authenticator/Constants.java | 2 +- 27 files changed, 38 insertions(+), 37 deletions(-) diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf index 04d9b691ae9..7f778dd7868 100644 --- a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf +++ b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf @@ -1,3 +1,4 @@ +<%@ taglib prefix="sun" uri="http://java.sun.com/jsf/html" %> @@ -86,14 +86,14 @@ - + $page{ps1}); /> - + $page{ps2}); /> diff --git a/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf b/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf index d91f91cf3ed..0e7e53f76d6 100644 --- a/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf +++ b/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf @@ -65,7 +65,7 @@ } /> - + #include "/common/shared/alertMsg.inc" - + $page{ps1}); /> - + $page{ps2}); /> diff --git a/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf b/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf index e19e0c95a9c..71dce904158 100644 --- a/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf +++ b/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf @@ -64,7 +64,7 @@ setPageSessionAttribute(key="emptyPswdMsg", value="$resource{i18n.msg.JS.manageUser.setEmptyPassword}") /> - + #include "/common/shared/alertMsg.inc" - + $page{ps1}); /> diff --git a/appserver/admingui/common/src/main/resources/security/security.jsf b/appserver/admingui/common/src/main/resources/security/security.jsf index 428fe104f2a..180ef6fc746 100644 --- a/appserver/admingui/common/src/main/resources/security/security.jsf +++ b/appserver/admingui/common/src/main/resources/security/security.jsf @@ -62,7 +62,7 @@ setPageSessionAttribute(key="convertToFalseList" value={"auditEnabled","activateDefaultPrincipalToRoleMapping"}) /> - + #include "/common/shared/alertMsg.inc" diff --git a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc index ffb6bbdc89c..7122d610e02 100644 --- a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc +++ b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc @@ -69,7 +69,7 @@ - + diff --git a/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc b/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc index 4b0d3a400da..f121df98478 100644 --- a/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc +++ b/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc @@ -51,7 +51,7 @@ /> -
+ @@ -59,7 +59,7 @@
- +
- + diff --git a/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf b/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf index 138ee20fe23..813c535e4b1 100644 --- a/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf +++ b/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf @@ -96,7 +96,7 @@ /> - + #include "/jca/connectorConnectionPoolTabs.inc" #include "/common/shared/alertMsg_1.inc" diff --git a/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf b/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf index e8da70fc49f..6be76661fc1 100644 --- a/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf +++ b/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf @@ -69,7 +69,7 @@ /> - + #include "/jca/connectorConnectionPoolTabs.inc" #include "/common/shared/alertMsg_1.inc" diff --git a/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc b/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc index c4c3901d5fb..8cc2ab0c5ba 100644 --- a/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc +++ b/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc @@ -132,7 +132,7 @@ - diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc b/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc index f10e974bd7f..53bb7505903 100644 --- a/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc +++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc @@ -99,14 +99,14 @@ - + $page{ps1}); /> - + $page{ps2}); /> diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf b/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf index 978b3e01243..2c50e26e1b6 100644 --- a/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf +++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf @@ -63,7 +63,7 @@ gf.getEntityAttrs(endpoint="#{pageSession.selfUrl}.json", valueMap="#{pageSession.valueMap}"); /> - + #include "/jms/jmsHost.inc" diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf b/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf index ebdb6ed8cec..3cb7abd2f01 100644 --- a/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf +++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf @@ -61,7 +61,7 @@ gf.getDefaultValues(endpoint="#{pageSession.selfUrl}", valueMap="#{pageSession.valueMap}"); /> - + #include "/jms/jmsHost.inc" diff --git a/appserver/tests/community/adminweb/basic/src/test/SeleniumTest.java b/appserver/tests/community/adminweb/basic/src/test/SeleniumTest.java index 1e6cd51d1f3..cea20aa33c6 100644 --- a/appserver/tests/community/adminweb/basic/src/test/SeleniumTest.java +++ b/appserver/tests/community/adminweb/basic/src/test/SeleniumTest.java @@ -96,7 +96,7 @@ public void testLoginScreen() throws Exception { selenium.type("j_username", "admin"); //selenium.waitForPageToLoad("30000"); //selenium.type("Login.password", "adminadmin"); - selenium.type("j_password", "adminadmin"); + selenium.type("password", "adminadmin"); //selenium.waitForPageToLoad("3000"); selenium.click("loginButton"); //selenium.waitForPageToLoad("30000"); diff --git a/appserver/tests/quicklook/adminconsole/src/test/admin/BaseAdminConsoleTest.java b/appserver/tests/quicklook/adminconsole/src/test/admin/BaseAdminConsoleTest.java index f1fc4ba94a8..4793f168e70 100644 --- a/appserver/tests/quicklook/adminconsole/src/test/admin/BaseAdminConsoleTest.java +++ b/appserver/tests/quicklook/adminconsole/src/test/admin/BaseAdminConsoleTest.java @@ -142,7 +142,7 @@ public void loginBeforeTest(String url, int port) throws Exception { // The login for was found, so let's now POST the form to authenticate our session. PostMethod post = new PostMethod(adminUrl + "j_security_check"); post.setRequestBody(new NameValuePair[]{ - new NameValuePair("j_username", "admin"), new NameValuePair("j_password", "") + new NameValuePair("j_username", "admin"), new NameValuePair("password", "") }); post.getParams().setCookiePolicy(CookiePolicy.RFC_2109); diff --git a/appserver/tests/quicklook/adminweb/basic/src/test/SeleniumTest.java b/appserver/tests/quicklook/adminweb/basic/src/test/SeleniumTest.java index 1e6cd51d1f3..cea20aa33c6 100644 --- a/appserver/tests/quicklook/adminweb/basic/src/test/SeleniumTest.java +++ b/appserver/tests/quicklook/adminweb/basic/src/test/SeleniumTest.java @@ -96,7 +96,7 @@ public void testLoginScreen() throws Exception { selenium.type("j_username", "admin"); //selenium.waitForPageToLoad("30000"); //selenium.type("Login.password", "adminadmin"); - selenium.type("j_password", "adminadmin"); + selenium.type("password", "adminadmin"); //selenium.waitForPageToLoad("3000"); selenium.click("loginButton"); //selenium.waitForPageToLoad("30000"); diff --git a/appserver/tests/v2-tests/appserv-tests/community/adminweb/basic/src/test/SeleniumTest.java b/appserver/tests/v2-tests/appserv-tests/community/adminweb/basic/src/test/SeleniumTest.java index c788af5e58b..f295fd0774b 100644 --- a/appserver/tests/v2-tests/appserv-tests/community/adminweb/basic/src/test/SeleniumTest.java +++ b/appserver/tests/v2-tests/appserv-tests/community/adminweb/basic/src/test/SeleniumTest.java @@ -56,7 +56,7 @@ public void testLoginScreen() throws Exception { selenium.type("j_username", "admin"); //selenium.waitForPageToLoad("30000"); //selenium.type("Login.password", "adminadmin"); - selenium.type("j_password", "adminadmin"); + selenium.type("password", "adminadmin"); //selenium.waitForPageToLoad("3000"); selenium.click("loginButton"); //selenium.waitForPageToLoad("30000"); diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/admin-gui/src/AdminGUITest.java b/appserver/tests/v2-tests/appserv-tests/sqetests/admin-gui/src/AdminGUITest.java index d413086d0e6..010d9851712 100644 --- a/appserver/tests/v2-tests/appserv-tests/sqetests/admin-gui/src/AdminGUITest.java +++ b/appserver/tests/v2-tests/appserv-tests/sqetests/admin-gui/src/AdminGUITest.java @@ -132,7 +132,7 @@ private void authorize() { WebResponse client = sr.getResponse(URL+loginPage); WebForm form = client.getFormWithName("loginform"); form.setParameter("j_username", new String[]{user}); - form.setParameter("j_password", new String[]{passwd}); + form.setParameter("password", new String[]{passwd}); SubmitButton sb = form.getSubmitButton("loginButton"); form.submit(sb); } catch (Exception ex) { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/Constants.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/Constants.java index 53d357cb2a0..0f43a8d94da 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/Constants.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/Constants.java @@ -76,7 +76,7 @@ public class Constants { // Form based authentication constants public static final String FORM_ACTION = "/j_security_check"; - public static final String FORM_PASSWORD = "j_password"; + public static final String FORM_PASSWORD = "password"; public static final String FORM_USERNAME = "j_username"; // Cookie name for single sign on support From fafc0a9840c9969c8e8a20c5616d2c9462a74a6b Mon Sep 17 00:00:00 2001 From: sumauppa Date: Wed, 2 Aug 2017 10:57:47 +0530 Subject: [PATCH 2/4] Removed a line that is added by mistake. --- .../admingui/cluster/src/main/resources/cluster/clusterNew.jsf | 1 - 1 file changed, 1 deletion(-) diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf index 7f778dd7868..7a51d807cd5 100644 --- a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf +++ b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf @@ -1,4 +1,3 @@ -<%@ taglib prefix="sun" uri="http://java.sun.com/jsf/html" %>