svn commit: r1244140 - in /ofbiz/branches/release11.04: ./ framework/webapp/src/org/ofbiz
Locked
svn commit: r1244140 - in /ofbiz/branches/release11.04: ./ framework/webapp/src/org/ofbiz
 
|
Author: jleroux
Date: Tue Feb 14 18:10:42 2012 New Revision: 1244140 URL: http://svn.apache.org/viewvc?rev=1244140&view=rev Log: "Applied fix from trunk for revision: 1244139" ------------------------------------------------------------------------ r1244139 | jleroux | 2012-02-14 19:08:01 +0100 (mar., 14 févr. 2012) | 3 lines A patch from Michael Brohl "return value of currentDelegatorTenantId.trim() ignored in org.ofbiz.webapp.control.LoginWorker.login()" https://issues.apache.org/jira/browse/OFBIZ- The return value of currentDelegatorTenantId.trim() is not assigned in org.ofbiz.webapp.control.LoginWorker.login() so trim() has no effect. ------------------------------------------------------------------------ Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 14 18:10:42 2012 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1227965,1229304,1229952,1231004,1231444,1232053,1232539 +/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139 Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1244140&r1=1244139&r2=1244140&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Tue Feb 14 18:10:42 2012 @@ -133,7 +133,7 @@ public class LoginWorker { String sesExtKey = (String) session.getAttribute(EXTERNAL_LOGIN_KEY_ATTR); if (sesExtKey != null) { - if (isAjax(request)) return sesExtKey; + if (isAjax(request)) return sesExtKey; externalLoginKeys.remove(sesExtKey); } @@ -319,39 +319,39 @@ public class LoginWorker { request.setAttribute("_ERROR_MESSAGE_LIST_", unpwErrMsgList); return "error"; } - + boolean setupNewDelegatorEtc = false; - + LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = (Delegator) request.getAttribute("delegator"); // if a tenantId was passed in, see if the userLoginId is associated with that tenantId (can use any delegator for this, entity is not tenant-specific) String tenantId = request.getParameter("tenantId"); if (UtilValidate.isNotEmpty(tenantId)) { - // see if we need to activate a tenant delegator, only do if the current delegatorName has a hash symbol in it, and if the passed in tenantId doesn't match the one in the delegatorName + // see if we need to activate a tenant delegator, only do if the current delegatorName has a hash symbol in it, and if the passed in tenantId doesn't match the one in the delegatorName String oldDelegatorName = delegator.getDelegatorName(); int delegatorNameHashIndex = oldDelegatorName.indexOf('#'); String currentDelegatorTenantId = null; if (delegatorNameHashIndex > 0) { currentDelegatorTenantId = oldDelegatorName.substring(delegatorNameHashIndex + 1); - if (currentDelegatorTenantId != null) currentDelegatorTenantId.trim(); + if (currentDelegatorTenantId != null) currentDelegatorTenantId = currentDelegatorTenantId.trim(); } - + if (delegatorNameHashIndex == -1 || (currentDelegatorTenantId != null && !tenantId.equals(currentDelegatorTenantId))) { - /* don't require this, allow a user to authenticate inside the tenant as long as the userLoginId and - * password match what is in that tenant's database; instead just set things up below + /* don't require this, allow a user to authenticate inside the tenant as long as the userLoginId and + * password match what is in that tenant's database; instead just set things up below try { List<GenericValue> tenantUserLoginList = delegator.findList("TenantUserLogin", EntityCondition.makeCondition(EntityOperator.AND, "tenantId", tenantId, "userLoginId", username), null, null, null, false); if (tenantUserLoginList != null && tenantUserLoginList.size() > 0) { ServletContext servletContext = session.getServletContext(); - + // if so make that tenant active, setup a new delegator and a new dispatcher String delegatorName = delegator.getDelegatorName() + "#" + tenantId; - + // after this line the delegator is replaced with the new per-tenant delegator delegator = DelegatorFactory.getDelegator(delegatorName); dispatcher = ContextFilter.makeWebappDispatcher(servletContext, delegator); - + // NOTE: these will be local for now and set in the request and session later, after we've verified that the user setupNewDelegatorEtc = true; } else { @@ -369,10 +369,10 @@ public class LoginWorker { */ ServletContext servletContext = session.getServletContext(); - + // make that tenant active, setup a new delegator and a new dispatcher String delegatorName = delegator.getDelegatorBaseName() + "#" + tenantId; - + try { // after this line the delegator is replaced with the new per-tenant delegator delegator = DelegatorFactory.getDelegator(delegatorName); @@ -384,7 +384,7 @@ public class LoginWorker { request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } - + // NOTE: these will be local for now and set in the request and session later, after we've verified that the user setupNewDelegatorEtc = true; } @@ -449,7 +449,7 @@ public class LoginWorker { // now set the delegator and dispatcher in a bunch of places just in case they were changed setWebContextObjects(request, response, delegator, dispatcher, true); } - + // check to see if a password change is required for the user Map<String, Object> userLoginSession = checkMap(result.get("userLoginSession"), String.class, Object.class); if (userLogin != null && "Y".equals(userLogin.getString("requirePasswordChange"))) { @@ -466,7 +466,7 @@ public class LoginWorker { } catch (GenericServiceException e) { Debug.logError(e, "Error setting user preference", module); } - + // finally do the main login routine to set everything else up in the session, etc return doMainLogin(request, response, userLogin, userLoginSession); } else { @@ -476,30 +476,30 @@ public class LoginWorker { return "error"; } } - - /* persistSerialized is set at false in the context of a cluster when using (at least) DeltaManager. + + /* persistSerialized is set at false in the context of a cluster when using (at least) DeltaManager. Because we have no easy ways to set DeltaManager.pathname to null from OFBiz So persistSerialized is set to true when login out. This prevent a NPE due to non serialized objects put in session*/ private static void setWebContextObjects(HttpServletRequest request, HttpServletResponse response, Delegator delegator, LocalDispatcher dispatcher, Boolean persistSerialized) { HttpSession session = request.getSession(); - + // NOTE: we do NOT want to set this in the servletContet, only in the request and session session.setAttribute("delegatorName", delegator.getDelegatorName()); - + request.setAttribute("delegator", delegator); if (!persistSerialized) { session.setAttribute("delegator", null); } else { session.setAttribute("delegator", delegator); } - + request.setAttribute("dispatcher", dispatcher); if (!persistSerialized) { session.setAttribute("dispatcher", null); } else { session.setAttribute("dispatcher", dispatcher); } - + if (persistSerialized) { // we also need to setup the security and authz objects since they are dependent on the delegator try { @@ -509,7 +509,7 @@ public class LoginWorker { } catch (SecurityConfigurationException e) { Debug.logError(e, module); } - + try { Authorization authz = AuthorizationFactory.getInstance(delegator); request.setAttribute("authz", authz); @@ -518,7 +518,7 @@ public class LoginWorker { Debug.logError(e, module); } } - + // get rid of the visit info since it was pointing to the previous database, and get a new one session.removeAttribute("visitor"); session.removeAttribute("visit"); @@ -641,7 +641,7 @@ public class LoginWorker { // setup some things that should always be there UtilHttp.setInitialRequestInfo(request); - + if (currCatalog != null) session.setAttribute("CURRENT_CATALOG_ID", currCatalog); if (delegatorName != null) { // if there is a tenantId in the delegatorName remove it now so that tenant selection doesn't last beyond logout @@ -652,7 +652,7 @@ public class LoginWorker { delegator = DelegatorFactory.getDelegator(delegatorName); LocalDispatcher dispatcher = ContextFilter.makeWebappDispatcher(session.getServletContext(), delegator); - // get the container configuration + // get the container configuration String ofbizHome = System.getProperty("ofbiz.home"); String configFile = ofbizHome + "/framework/base/config/ofbiz-containers.xml"; ContainerConfig.Container cc = null; @@ -669,7 +669,7 @@ public class LoginWorker { setWebContextObjects(request, response, delegator, dispatcher, true); } } - + // DON'T save the cart, causes too many problems: if (shoppingCart != null) session.setAttribute("shoppingCart", new WebShoppingCart(shoppingCart, session)); } @@ -972,7 +972,7 @@ public class LoginWorker { GenericValue userLogin = LoginWorker.externalLoginKeys.get(externalKey); if (userLogin != null) { - //to check it's the right tenant + //to check it's the right tenant //in case username and password are the same in different tenants LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = (Delegator) request.getAttribute("delegator"); @@ -1069,9 +1069,9 @@ public class LoginWorker { } return userLoginSessionMap; } - + public static boolean isAjax(HttpServletRequest request) { return "XMLHttpRequest".equals(request.getHeader("X-Requested-With")); } - + } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |