[jboss-svn-commits] JBL Code SVN: r19391 - labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-04-03 09:32:12 -0400 (Thu, 03 Apr 2008)
New Revision: 19391

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java
Log:
ssl processor on logged in user

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java	2008-04-03 13:26:32 UTC (rev 19390)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java	2008-04-03 13:32:12 UTC (rev 19391)
@@ -61,7 +61,7 @@
 			if(httpRequest.isSecure())
 			{
 				//check to see if a switch from ssl-mode to non-ssl-mode is needed
-				if(this.isSwitchFromSSLNeeded(requestURL))
+				if(this.isSwitchFromSSLNeeded(httpRequest))
 				{
 					Integer plainPort = (Integer)httpRequest.getSession().getAttribute("http");
 					if(plainPort!=null)
@@ -108,14 +108,14 @@
 	{		
 	}
 	
-	private boolean isSwitchFromSSLNeeded(String requestURL)
+	private boolean isSwitchFromSSLNeeded(HttpServletRequest httpRequest)
 	{
 		boolean switchNeeded = false;
 		
 		//these conditions need to be extracted out into an xml config file
 		//instead of hardcoding the values. 
 		//The implemenation will work for now
-		if(requestURL.indexOf("authsec")==-1 &&
+		/*if(requestURL.indexOf("authsec")==-1 &&
 		   requestURL.indexOf("j_security_check")==-1 &&
 		   requestURL.indexOf("ctrl:id=page.default.login")==-1 &&
 		   requestURL.indexOf("ctrl:id=window.default.LoginWindow")==-1				   
@@ -123,7 +123,9 @@
 		{			
 			switchNeeded = true;
 		}
-		return switchNeeded;
+		return switchNeeded;*/
+		
+		return httpRequest.getUserPrincipal() != null;
 	}
 	
 	private boolean isSwitchToSSLNeeded(String requestURL)