[portal-commits] JBoss Portal SVN: r9072 - in branches/JBoss_Portal_Branch_2_6/core/src: resources/portal-core-sar/conf and 1 other directory.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2007-11-22 03:34:22 -0500 (Thu, 22 Nov 2007)
New Revision: 9072

Modified:
   branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
   branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml
Log:
JBPORTAL-1813: Switching to secured login should be enabled by configuration

Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2007-11-21 23:14:11 UTC (rev 9071)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2007-11-22 08:34:22 UTC (rev 9072)
@@ -214,6 +214,11 @@
             {
                portalURL = new PortalURLImpl(cc, controllerCtx, Boolean.TRUE, null);
             }
+            String securedLogin = config.getProperty("core.login.secured");
+            if (securedLogin != null && "true".equals(securedLogin.toLowerCase()))
+            {
+               portalURL.setSecure(Boolean.TRUE);
+            }
             rd.setAttribute("org.jboss.portal.header.LOGIN_URL", portalURL);
          }
 

Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml	2007-11-21 23:14:11 UTC (rev 9071)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml	2007-11-22 08:34:22 UTC (rev 9072)
@@ -34,4 +34,6 @@
    <entry key="core.render.window_not_found">show</entry>
    <!-- Namespace to use when logging-in, use "dashboard" to directly log-in the dashboard otherwise use "default" -->
    <entry key="core.login.namespace">default</entry>
+   <!-- true if the server should switch to HTTPS for logging-in. Secured layer must be properly set before -->
+   <entry key="core.login.secured">false</entry>
 </properties>