Author: channa Date: Thu Aug 7 01:39:33 2008 New Revision: 20528 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20528
Log: Steps to prevent an error when a user remembered on https uses https to access pages. Ensuring that if a user is not remembered, anonymous is always shown. Also added condition to ensure getRoles can deal with a null username. MASHUP-968. Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java trunk/mashup/java/modules/www/validate_login.jsp Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java?rev=20528&r1=20527&r2=20528&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java Thu Aug 7 01:39:33 2008 @@ -244,16 +244,17 @@ public String getCommonSQL(int sqlID) { return null; } - public synchronized String[] getUserRoles(String userName) throws UserStoreException { - String[] roles; - try { - roles = (new UserAdmin()).getUserRoles(userName); - } catch (AxisFault e) { - throw new UserStoreException(e.getMessage()); + // Ensure an empty array is returned if the role search fails. + String[] roles = new String[0]; + if (userName != null) { + try { + roles = (new UserAdmin()).getUserRoles(userName); + } catch (AxisFault e) { + throw new UserStoreException(e.getMessage()); + } } return roles; } - } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java?rev=20528&r1=20527&r2=20528&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java Thu Aug 7 01:39:33 2008 @@ -230,11 +230,14 @@ } public String[] getUserRoles(String userName) throws UserStoreException { - String[] roles; - try { - roles = (new UserAdmin()).getUserRoles(userName); - } catch (AxisFault e) { - throw new UserStoreException(e.getMessage()); + // Ensure an empty array is returned if the role search fails. + String[] roles = new String[0]; + if (userName != null) { + try { + roles = (new UserAdmin()).getUserRoles(userName); + } catch (AxisFault e) { + throw new UserStoreException(e.getMessage()); + } } return roles; } Modified: trunk/mashup/java/modules/www/validate_login.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/validate_login.jsp?rev=20528&r1=20527&r2=20528&view=diff ============================================================================== --- trunk/mashup/java/modules/www/validate_login.jsp (original) +++ trunk/mashup/java/modules/www/validate_login.jsp Thu Aug 7 01:39:33 2008 @@ -52,8 +52,8 @@ if (cookies != null) { boolean rememberMe = false; - String userNameStored = null; - String passwordStored = null; + String userNameStored = RegistryConstants.ANONYMOUS_USER; + String passwordStored = RegistryConstants.ANONYMOUS_PASSWORD; String openIdStored = null; Cookie curCookie = null; _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
