rmaps;
+ if (requestMapMap.containsKey(requestUri)
+ // Ensure that overridden view exists.
+ && (viewUri == null || viewMapMap.containsKey(viewUri)
+ || ("SOAPService".equals(requestUri) && "wsdl".equalsIgnoreCase(req.getQueryString())))){
+ rmaps = requestMapMap.get(requestUri);
+ } else if (defaultRequest != null) {
+ rmaps = requestMapMap.get(defaultRequest);
+ } else {
+ rmaps = null;
}
return rmaps != null ? rmaps : Collections.emptyList();
}
@@ -179,33 +232,6 @@ public class RequestHandler {
}
}
- /**
- * Finds the request maps matching a segmented path.
- *
- * A segmented path can match request maps where the {@code uri} attribute
- * contains an URI template like in the {@code foo/bar/{baz}} example.
- *
- * @param rMapMap the map associating URIs to a list of request maps corresponding to different HTTP methods
- * @param request the HTTP request to match
- * @return a collection of request maps which might be empty but not {@code null}
- */
- private static Collection resolveTemplateURI(Map> rMapMap,
- HttpServletRequest request) {
- // Retrieve the request path without the leading '/' character.
- String path = request.getPathInfo().substring(1);
- MultivaluedHashMap vars = new MultivaluedHashMap<>();
- for (Map.Entry> entry : rMapMap.entrySet()) {
- URITemplate uriTemplate = URITemplate.createExactTemplate(entry.getKey());
- // Check if current path the URI template exactly.
- if (uriTemplate.match(path, vars) && vars.getFirst("FINAL_MATCH_GROUP").equals("/")) {
- // Set attributes from template variables to be used in context.
- uriTemplate.getVariables().forEach(var -> request.setAttribute(var, vars.getFirst(var)));
- return entry.getValue();
- }
- }
- return Collections.emptyList();
- }
-
public void doRequest(HttpServletRequest request, HttpServletResponse response, String chain,
GenericValue userLogin, Delegator delegator) throws RequestHandlerException, RequestHandlerExceptionAllowExternalRequests {
@@ -216,7 +242,7 @@ public class RequestHandler {
// Parse controller config.
try {
- ccfg = ConfigXMLReader.getControllerConfig(controllerConfigURL);
+ ccfg = new ControllerConfig(getControllerConfig());
} catch (WebAppConfigurationException e) {
Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
throw new RequestHandlerException(e);
@@ -241,27 +267,18 @@ public class RequestHandler {
String path = request.getPathInfo();
String requestUri = getRequestUri(path);
+ String overrideViewUri = getOverrideViewUri(path);
Collection rmaps = resolveURI(ccfg, request);
if (rmaps.isEmpty()) {
if (throwRequestHandlerExceptionOnMissingLocalRequest) {
- if (path.contains("/checkLogin/")) {
- // Nested requests related with checkLogin uselessly clutter the log. There is nothing to worry about, better remove this wrong error message.
- return;
- } else if (path.contains("/images/") || path.contains("d.png")) {
- if (Debug.warningOn()) Debug.logWarning("You should check if this request is really a problem or a false alarm: " + request.getRequestURL(), module);
- throw new RequestHandlerException(requestMissingErrorMessage);
- } else {
- throw new RequestHandlerException(requestMissingErrorMessage);
- }
+ throw new RequestHandlerException(requestMissingErrorMessage);
} else {
- throw new RequestHandlerExceptionAllowExternalRequests();
+ throw new RequestHandlerExceptionAllowExternalRequests();
}
}
- // The "overriddenView" attribute is set by resolveURI when necessary.
- String overrideViewUri = (String) request.getAttribute("overriddenView");
- String method = UtilHttp.getRequestMethod(request);
+ String method = request.getMethod();
RequestMap requestMap = resolveMethod(method, rmaps).orElseThrow(() -> {
String msg = UtilProperties.getMessage("WebappUiLabels", "RequestMethodNotMatchConfig",
UtilMisc.toList(requestUri, method), UtilHttp.getLocale(request));
@@ -280,7 +297,7 @@ public class RequestHandler {
// Check for chained request.
if (chain != null) {
String chainRequestUri = RequestHandler.getRequestUri(chain);
- requestMap = ccfg.getRequestMapMap().get(chainRequestUri);
+ requestMap = ccfg.getRequestMapMap().getFirst(chainRequestUri);
if (requestMap == null) {
throw new RequestHandlerException("Unknown chained request [" + chainRequestUri + "]; this request does not exist");
}
@@ -304,11 +321,11 @@ public class RequestHandler {
// Check to make sure we are allowed to access this request directly. (Also checks if this request is defined.)
// If the request cannot be called, or is not defined, check and see if there is a default-request we can process
if (!requestMap.securityDirectRequest) {
- if (ccfg.getDefaultRequest() == null || !ccfg.getRequestMapMap().get(ccfg.getDefaultRequest()).securityDirectRequest) {
+ if (ccfg.getDefaultRequest() == null || !ccfg.getRequestMapMap().getFirst(ccfg.getDefaultRequest()).securityDirectRequest) {
// use the same message as if it was missing for security reasons, ie so can't tell if it is missing or direct request is not allowed
throw new RequestHandlerException(requestMissingErrorMessage);
} else {
- requestMap = ccfg.getRequestMapMap().get(ccfg.getDefaultRequest());
+ requestMap = ccfg.getRequestMapMap().getFirst(ccfg.getDefaultRequest());
}
}
// Check if we SHOULD be secure and are not.
@@ -350,7 +367,7 @@ public class RequestHandler {
String newUrl = RequestHandler.makeUrl(request, response, urlBuf.toString());
if (newUrl.toUpperCase().startsWith("HTTPS")) {
// if we are supposed to be secure, redirect secure.
- callRedirect(newUrl, response, request, ccfg.getStatusCode());
+ callRedirect(newUrl, response, request, ccfg.getStatusCodeString());
return;
}
}
@@ -358,7 +375,33 @@ public class RequestHandler {
// Check for HTTPS client (x.509) security
if (request.isSecure() && requestMap.securityCert) {
- if (!checkCertificates(request, certs -> SSLUtil.isClientTrusted(certs, null))) {
+ X509Certificate[] clientCerts = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"); // 2.2 spec
+ if (clientCerts == null) {
+ clientCerts = (X509Certificate[]) request.getAttribute("javax.net.ssl.peer_certificates"); // 2.1 spec
+ }
+ if (clientCerts == null) {
+ Debug.logWarning("Received no client certificates from browser", module);
+ }
+
+ // check if the client has a valid certificate (in our db store)
+ boolean foundTrustedCert = false;
+
+ if (clientCerts == null) {
+ throw new RequestHandlerException(requestMissingErrorMessage);
+ } else {
+ if (Debug.infoOn()) {
+ for (int i = 0; i < clientCerts.length; i++) {
+ Debug.logInfo(clientCerts[i].getSubjectX500Principal().getName(), module);
+ }
+ }
+
+ // check if this is a trusted cert
+ if (SSLUtil.isClientTrusted(clientCerts, null)) {
+ foundTrustedCert = true;
+ }
+ }
+
+ if (!foundTrustedCert) {
Debug.logWarning(requestMissingErrorMessage, module);
throw new RequestHandlerException(requestMissingErrorMessage);
}
@@ -429,20 +472,13 @@ public class RequestHandler {
if (Debug.verboseOn()) Debug.logVerbose("[Processing Request]: " + requestMap.uri + showSessionId(request), module);
request.setAttribute("thisRequestUri", requestMap.uri); // store the actual request URI
- // Store current requestMap map to be referred later when generating csrf token
- request.setAttribute("requestMapMap", getControllerConfig().getRequestMapMap());
-
- // Perform CSRF token check when request not on chain
- if (chain==null && originalRequestMap.securityCsrfToken) {
- CsrfUtil.checkToken(request, path);
- }
// Perform security check.
if (requestMap.securityAuth) {
// Invoke the security handler
// catch exceptions and throw RequestHandlerException if failed.
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler]: AuthRequired. Running security check. " + showSessionId(request), module);
- ConfigXMLReader.Event checkLoginEvent = ccfg.getRequestMapMap().get("checkLogin").event;
+ ConfigXMLReader.Event checkLoginEvent = ccfg.getRequestMapMap().getFirst("checkLogin").event;
String checkLoginReturnString = null;
try {
@@ -455,9 +491,9 @@ public class RequestHandler {
eventReturn = checkLoginReturnString;
// if the request is an ajax request we don't want to return the default login check
if (!"XMLHttpRequest".equals(request.getHeader("X-Requested-With"))) {
- requestMap = ccfg.getRequestMapMap().get("checkLogin");
+ requestMap = ccfg.getRequestMapMap().getFirst("checkLogin");
} else {
- requestMap = ccfg.getRequestMapMap().get("ajaxCheckLogin");
+ requestMap = ccfg.getRequestMapMap().getFirst("ajaxCheckLogin");
}
}
}
@@ -466,7 +502,9 @@ public class RequestHandler {
// we know this is the case if the _PREVIOUS_PARAM_MAP_ attribute is there, but the _PREVIOUS_REQUEST_ attribute has already been removed
if (request.getSession().getAttribute("_PREVIOUS_PARAM_MAP_FORM_") != null && request.getSession().getAttribute("_PREVIOUS_REQUEST_") == null) {
Map previousParamMap = UtilGenerics.checkMap(request.getSession().getAttribute("_PREVIOUS_PARAM_MAP_FORM_"), String.class, Object.class);
- previousParamMap.forEach(request::setAttribute);
+ for (Map.Entry previousParamEntry: previousParamMap.entrySet()) {
+ request.setAttribute(previousParamEntry.getKey(), previousParamEntry.getValue());
+ }
// to avoid this data being included again, now remove the _PREVIOUS_PARAM_MAP_ attribute
request.getSession().removeAttribute("_PREVIOUS_PARAM_MAP_FORM_");
@@ -561,7 +599,6 @@ public class RequestHandler {
for (Map.Entry entry: preRequestMap.entrySet()) {
String key = entry.getKey();
if ("_ERROR_MESSAGE_LIST_".equals(key) || "_ERROR_MESSAGE_MAP_".equals(key) || "_ERROR_MESSAGE_".equals(key) ||
- "_WARNING_MESSAGE_LIST_".equals(key) || "_WARNING_MESSAGE_".equals(key) ||
"_EVENT_MESSAGE_LIST_".equals(key) || "_EVENT_MESSAGE_".equals(key)) {
request.setAttribute(key, entry.getValue());
}
@@ -587,13 +624,8 @@ public class RequestHandler {
if (UtilValidate.isNotEmpty(queryString)) {
redirectTarget += "?" + queryString;
}
- String link = makeLink(request, response, redirectTarget);
-
- // add / update csrf token to link when required
- String tokenValue = CsrfUtil.generateTokenForNonAjax(request,redirectTarget);
- link = CsrfUtil.addOrUpdateTokenInUrl(link, tokenValue);
-
- callRedirect(link, response, request, ccfg.getStatusCode());
+
+ callRedirect(makeLink(request, response, redirectTarget), response, request, ccfg.getStatusCodeString());
return;
}
}
@@ -651,44 +683,31 @@ public class RequestHandler {
}
}
- // The status code used to redirect the HTTP client.
- String redirectSC = UtilValidate.isNotEmpty(nextRequestResponse.statusCode)
- ? nextRequestResponse.statusCode
- : ccfg.getStatusCode();
-
+ String responseStatusCode = nextRequestResponse.statusCode;
+ if(UtilValidate.isNotEmpty(responseStatusCode))
+ ccfg.setStatusCodeString(responseStatusCode);
+
if ("url".equals(nextRequestResponse.type)) {
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a URL redirect." + showSessionId(request), module);
- callRedirect(nextRequestResponse.value, response, request, redirectSC);
+ callRedirect(nextRequestResponse.value, response, request, ccfg.getStatusCodeString());
} else if ("url-redirect".equals(nextRequestResponse.type)) {
// check for a cross-application redirect
if (Debug.verboseOn())
Debug.logVerbose("[RequestHandler.doRequest]: Response is a URL redirect with redirect parameters."
+ showSessionId(request), module);
callRedirect(nextRequestResponse.value + this.makeQueryString(request, nextRequestResponse), response,
- request, redirectSC);
+ request, ccfg.getStatusCodeString());
} else if ("cross-redirect".equals(nextRequestResponse.type)) {
// check for a cross-application redirect
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Cross-Application redirect." + showSessionId(request), module);
String url = nextRequestResponse.value.startsWith("/") ? nextRequestResponse.value : "/" + nextRequestResponse.value;
- callRedirect(url + this.makeQueryString(request, nextRequestResponse), response, request, redirectSC);
+ callRedirect(url + this.makeQueryString(request, nextRequestResponse), response, request, ccfg.getStatusCodeString());
} else if ("request-redirect".equals(nextRequestResponse.type)) {
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect." + showSessionId(request), module);
- String link = makeLinkWithQueryString(request, response, "/" + nextRequestResponse.value, nextRequestResponse);
-
- // add / update csrf token to link when required
- String tokenValue = CsrfUtil.generateTokenForNonAjax(request, nextRequestResponse.value);
- link = CsrfUtil.addOrUpdateTokenInUrl(link, tokenValue);
-
- callRedirect(link, response, request, redirectSC);
+ callRedirect(makeLinkWithQueryString(request, response, "/" + nextRequestResponse.value, nextRequestResponse), response, request, ccfg.getStatusCodeString());
} else if ("request-redirect-noparam".equals(nextRequestResponse.type)) {
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect with no parameters." + showSessionId(request), module);
- String link = makeLink(request, response, nextRequestResponse.value);
-
- // add token to link when required
- String tokenValue = CsrfUtil.generateTokenForNonAjax(request, nextRequestResponse.value);
- link = CsrfUtil.addOrUpdateTokenInUrl(link, tokenValue);
-
- callRedirect(link, response, request, redirectSC);
+ callRedirect(makeLink(request, response, nextRequestResponse.value), response, request, ccfg.getStatusCodeString());
} else if ("view".equals(nextRequestResponse.type)) {
if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), module);
@@ -705,13 +724,13 @@ public class RequestHandler {
Map urlParams = null;
if (session.getAttribute("_SAVED_VIEW_NAME_") != null) {
viewName = (String) session.getAttribute("_SAVED_VIEW_NAME_");
- urlParams = UtilGenerics.cast(session.getAttribute("_SAVED_VIEW_PARAMS_"));
+ urlParams = UtilGenerics.checkMap(session.getAttribute("_SAVED_VIEW_PARAMS_"));
} else if (session.getAttribute("_HOME_VIEW_NAME_") != null) {
viewName = (String) session.getAttribute("_HOME_VIEW_NAME_");
- urlParams = UtilGenerics.cast(session.getAttribute("_HOME_VIEW_PARAMS_"));
+ urlParams = UtilGenerics.checkMap(session.getAttribute("_HOME_VIEW_PARAMS_"));
} else if (session.getAttribute("_LAST_VIEW_NAME_") != null) {
viewName = (String) session.getAttribute("_LAST_VIEW_NAME_");
- urlParams = UtilGenerics.cast(session.getAttribute("_LAST_VIEW_PARAMS_"));
+ urlParams = UtilGenerics.checkMap(session.getAttribute("_LAST_VIEW_PARAMS_"));
} else if (UtilValidate.isNotEmpty(nextRequestResponse.value)) {
viewName = nextRequestResponse.value;
}
@@ -756,7 +775,7 @@ public class RequestHandler {
Map urlParams = null;
if (session.getAttribute("_HOME_VIEW_NAME_") != null) {
viewName = (String) session.getAttribute("_HOME_VIEW_NAME_");
- urlParams = UtilGenerics.cast(session.getAttribute("_HOME_VIEW_PARAMS_"));
+ urlParams = UtilGenerics.checkMap(session.getAttribute("_HOME_VIEW_PARAMS_"));
}
if (urlParams != null) {
for (Map.Entry urlParamEntry: urlParams.entrySet()) {
@@ -789,7 +808,7 @@ public class RequestHandler {
try {
String errorPageLocation = getControllerConfig().getErrorpage();
errorPage = FlexibleLocation.resolveLocation(errorPageLocation);
- } catch (MalformedURLException e) {
+ } catch (WebAppConfigurationException | MalformedURLException e) {
Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
}
if (errorPage == null) {
@@ -800,8 +819,14 @@ public class RequestHandler {
/** Returns the default status-code for this request. */
public String getStatusCode(HttpServletRequest request) {
- String statusCode = getControllerConfig().getStatusCode();
- return UtilValidate.isNotEmpty(statusCode) ? statusCode : null;
+ String statusCode = null;
+ try {
+ statusCode = getControllerConfig().getStatusCode();
+ } catch (WebAppConfigurationException e) {
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ }
+ if (UtilValidate.isNotEmpty(statusCode)) return statusCode;
+ return null;
}
/** Returns the ViewFactory Object. */
@@ -846,11 +871,11 @@ public class RequestHandler {
return nextPage;
}
- private static void callRedirect(String url, HttpServletResponse resp, HttpServletRequest req, String statusCodeString) throws RequestHandlerException {
+ private void callRedirect(String url, HttpServletResponse resp, HttpServletRequest req, String statusCodeString) throws RequestHandlerException {
if (Debug.infoOn()) Debug.logInfo("Sending redirect to: [" + url + "]. " + showSessionId(req), module);
// set the attributes in the session so we can access it.
Enumeration attributeNameEnum = UtilGenerics.cast(req.getAttributeNames());
- Map reqAttrMap = new HashMap<>();
+ Map reqAttrMap = new HashMap();
Integer statusCode;
try {
statusCode = Integer.valueOf(statusCodeString);
@@ -943,7 +968,13 @@ public class RequestHandler {
req.getSession().removeAttribute("_SAVED_VIEW_PARAMS_");
}
- ConfigXMLReader.ViewMap viewMap = (view == null) ? null : getControllerConfig().getViewMapMap().get(view);
+ ConfigXMLReader.ViewMap viewMap = null;
+ try {
+ viewMap = (view == null ? null : getControllerConfig().getViewMapMap().get(view));
+ } catch (WebAppConfigurationException e) {
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ throw new RequestHandlerException(e);
+ }
if (viewMap == null) {
throw new RequestHandlerException("No definition found for view with name [" + view + "]");
}
@@ -1068,7 +1099,7 @@ public class RequestHandler {
}
}
- private static void addNameValuePairToQueryString(StringBuilder queryString, String name, String value) {
+ private void addNameValuePairToQueryString(StringBuilder queryString, String name, String value) {
if (UtilValidate.isNotEmpty(value)) {
if (queryString.length() > 1) {
queryString.append("&");
@@ -1093,10 +1124,6 @@ public class RequestHandler {
}
public String makeLink(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode) {
- return makeLink(request, response, url, fullPath, secure, encode, "");
- }
-
- public String makeLink(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode, String targetControlPath) {
WebSiteProperties webSiteProps = null;
try {
webSiteProps = WebSiteProperties.from(request);
@@ -1108,7 +1135,13 @@ public class RequestHandler {
String requestUri = RequestHandler.getRequestUri(url);
ConfigXMLReader.RequestMap requestMap = null;
if (requestUri != null) {
- requestMap = getControllerConfig().getRequestMapMap().get(requestUri);
+ try {
+ requestMap = getControllerConfig().getRequestMapMap().get(requestUri);
+ } catch (WebAppConfigurationException e) {
+ // If we can't read the controller.xml file, then there is no point in continuing.
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ return null;
+ }
}
boolean didFullSecure = false;
boolean didFullStandard = false;
@@ -1140,12 +1173,8 @@ public class RequestHandler {
return null;
}
}
-
- String controlPath = targetControlPath;
- if (UtilValidate.isEmpty(controlPath)){
- // create the path to the control servlet
- controlPath = (String) request.getAttribute("_CONTROL_PATH_");
- }
+ // create the path to the control servlet
+ String controlPath = (String) request.getAttribute("_CONTROL_PATH_");
//If required by webSite parameter, surcharge control path
if (webSiteProps.getWebappPath() != null) {
@@ -1168,7 +1197,7 @@ public class RequestHandler {
try {
GenericValue webSiteValue = EntityQuery.use(delegator).from("WebSite").where("webSiteId", webSiteId).cache().queryOne();
if (webSiteValue != null) {
- ServletContext application = (request.getServletContext());
+ ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
String domainName = request.getLocalName();
if (application.getAttribute("MULTI_SITE_ENABLED") != null && UtilValidate.isNotEmpty(webSiteValue.getString("hostedPathAlias")) && !domainName.equals(webSiteValue.getString("httpHost"))) {
newURL.append('/');
@@ -1199,9 +1228,9 @@ public class RequestHandler {
return makeUrl(request, response, url, false, false, false);
}
- public static String makeUrl(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath,
- boolean secure, boolean encode) {
- RequestHandler rh = from(request);
+ public static String makeUrl(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode) {
+ ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
return rh.makeLink(request, response, url, fullPath, secure, encode);
}
@@ -1248,58 +1277,55 @@ public class RequestHandler {
runEvents(req, resp, prod, "before-logout");
}
- /**
- * Checks if a request must be tracked according a global toggle and a request map predicate.
- *
- * @param request the request that can potentially be tracked
- * @param globalToggle the global configuration toggle
- * @param pred the predicate checking if each individual request map must be tracked or not.
- * @return {@code true} when the request must be tracked.
- * @throws NullPointerException when either {@code request} or {@code pred} is {@code null}.
- */
- private boolean track(HttpServletRequest request, boolean globalToggle, Predicate pred) {
- if (!globalToggle) {
+ public boolean trackStats(HttpServletRequest request) {
+ if (trackServerHit) {
+ String uriString = RequestHandler.getRequestUri(request.getPathInfo());
+ if (uriString == null) {
+ uriString="";
+ }
+ ConfigXMLReader.RequestMap requestMap = null;
+ try {
+ requestMap = getControllerConfig().getRequestMapMap().get(uriString);
+ if (requestMap == null) {
+ requestMap = getControllerConfig().getRequestMapMap().get(getControllerConfig().getDefaultRequest());
+ if (requestMap == null) {
+ return false;
+ }
+ }
+ } catch (WebAppConfigurationException e) {
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ }
+ return requestMap.trackServerHit;
+ } else {
return false;
}
- // XXX: We are basically re-implementing `resolveURI` poorly, It would be better
- // to take a `request-map` as input but it is not currently not possible because this method
- // is used outside `doRequest`.
- String uriString = RequestHandler.getRequestUri(request.getPathInfo());
- if (uriString == null) {
- uriString= "";
- }
- Map rmaps = getControllerConfig().getRequestMapMap();
- RequestMap requestMap = rmaps.get(uriString);
- if (requestMap == null) {
- requestMap = rmaps.get(getControllerConfig().getDefaultRequest());
- if (requestMap == null) {
- return false;
- }
- }
- return pred.test(requestMap);
}
- /**
- * Checks if server hits must be tracked for a given request.
- *
- * @param request the HTTP request that can potentially be tracked
- * @return {@code true} when the request must be tracked.
- */
- public boolean trackStats(HttpServletRequest request) {
- return track(request, trackServerHit, rmap -> rmap.trackServerHit);
- }
-
- /**
- * Checks if visits must be tracked for a given request.
- *
- * @param request the HTTP request that can potentially be tracked
- * @return {@code true} when the request must be tracked.
- */
public boolean trackVisit(HttpServletRequest request) {
- return track(request, trackVisit, rmap -> rmap.trackVisit);
+ if (trackVisit) {
+ String uriString = RequestHandler.getRequestUri(request.getPathInfo());
+ if (uriString == null) {
+ uriString="";
+ }
+ ConfigXMLReader.RequestMap requestMap = null;
+ try {
+ requestMap = getControllerConfig().getRequestMapMap().get(uriString);
+ if (requestMap == null) {
+ requestMap = getControllerConfig().getRequestMapMap().get(getControllerConfig().getDefaultRequest());
+ if (requestMap == null) {
+ return false;
+ }
+ }
+ } catch (WebAppConfigurationException e) {
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ }
+ return requestMap.trackVisit;
+ } else {
+ return false;
+ }
}
- private static String showSessionId(HttpServletRequest request) {
+ private String showSessionId(HttpServletRequest request) {
Delegator delegator = (Delegator) request.getAttribute("delegator");
boolean showSessionIdInLog = EntityUtilProperties.propertyValueEqualsIgnoreCase("requestHandler", "show-sessionId-in-log", "Y", delegator);
if (showSessionIdInLog) {
@@ -1307,42 +1333,4 @@ public class RequestHandler {
}
return " Hidden sessionId by default.";
}
-
- /**
- * Checks that the request contains some valid certificates.
- *
- * @param request the request to verify
- * @param validator the predicate applied the certificates found
- * @return true if the request contains some valid certificates, otherwise false.
- */
- static boolean checkCertificates(HttpServletRequest request, Predicate validator) {
- return Stream.of("javax.servlet.request.X509Certificate", // 2.2 spec
- "javax.net.ssl.peer_certificates") // 2.1 spec
- .map(request::getAttribute)
- .filter(Objects::nonNull)
- .map(X509Certificate[].class::cast)
- .peek(certs -> {
- if (Debug.infoOn()) {
- for (X509Certificate cert : certs) {
- Debug.logInfo(cert.getSubjectX500Principal().getName(), module);
- }
- }
- })
- .map(validator::test)
- .findFirst().orElseGet(() -> {
- Debug.logWarning("Received no client certificates from browser", module);
- return false;
- });
- }
-
- /**
- * Retrieves the request handler which is stored inside an HTTP request.
- *
- * @param request the HTTP request containing the request handler
- * @return a request handler or {@code null} when absent
- * @throws NullPointerException when {@code request} or the servlet context is {@code null}.
- */
- public static RequestHandler from(HttpServletRequest request) {
- return UtilGenerics.cast(request.getServletContext().getAttribute("_REQUEST_HANDLER_"));
- }
}
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java
deleted file mode 100644
index 6a2d89e878..0000000000
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *******************************************************************************/
-package org.apache.ofbiz.webapp.ftl;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.ofbiz.security.CsrfUtil;
-
-import freemarker.core.Environment;
-import freemarker.ext.beans.BeanModel;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateTransformModel;
-
-/**
- * CsrfTokenAjaxTransform - Freemarker Transform for csrf token in Ajax call
- */
-public class CsrfTokenAjaxTransform implements TemplateTransformModel {
-
- public final static String module = CsrfTokenAjaxTransform.class.getName();
-
- @Override
- public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args)
- throws TemplateModelException, IOException {
-
- return new Writer(out) {
-
- @Override
- public void close() throws IOException {
- try {
- Environment env = Environment.getCurrentEnvironment();
- BeanModel req = (BeanModel) env.getVariable("request");
- if (req != null) {
- HttpServletRequest request = (HttpServletRequest) req.getWrappedObject();
- String tokenValue = CsrfUtil.generateTokenForAjax(request);
- out.write(tokenValue);
- }
- return;
- } catch (Exception e) {
- throw new IOException(e.getMessage());
- }
- }
-
- @Override
- public void flush() throws IOException {
- out.flush();
- }
-
- @Override
- public void write(char cbuf[], int off, int len) {
-
- }
- };
-
- }
-}
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java
deleted file mode 100644
index d51bd61088..0000000000
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *******************************************************************************/
-package org.apache.ofbiz.webapp.ftl;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.ofbiz.security.CsrfUtil;
-
-import freemarker.core.Environment;
-import freemarker.ext.beans.BeanModel;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateTransformModel;
-
-/**
- * CsrfTokenPairNonAjaxTransform - Freemarker Transform for csrf token in non-Ajax call
- */
-public class CsrfTokenPairNonAjaxTransform implements TemplateTransformModel {
-
- public final static String module = CsrfTokenPairNonAjaxTransform.class.getName();
-
- @Override
- public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args)
- throws TemplateModelException, IOException {
-
- final StringBuffer buf = new StringBuffer();
-
- return new Writer(out) {
-
- @Override
- public void close() throws IOException {
- try {
- Environment env = Environment.getCurrentEnvironment();
- BeanModel req = (BeanModel) env.getVariable("request");
- if (req != null) {
- HttpServletRequest request = (HttpServletRequest) req.getWrappedObject();
- String tokenValue = CsrfUtil.generateTokenForNonAjax(request, buf.toString());
- out.write(CsrfUtil.tokenNameNonAjax +"="+tokenValue);
- }
- return;
- } catch (Exception e) {
- throw new IOException(e.getMessage());
- }
- }
-
- @Override
- public void write(char cbuf[], int off, int len) {
- buf.append(cbuf, off, len);
- }
-
- @Override
- public void flush() throws IOException {
- out.flush();
- }
- };
- }
-}
diff --git a/framework/webtools/groovyScripts/entity/CheckDb.groovy b/framework/webtools/groovyScripts/entity/CheckDb.groovy
index 567714fbcf..fd822de87e 100644
--- a/framework/webtools/groovyScripts/entity/CheckDb.groovy
+++ b/framework/webtools/groovyScripts/entity/CheckDb.groovy
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
+import org.apache.ofbiz.entity.Delegator
+import org.apache.ofbiz.security.Security
import org.apache.ofbiz.entity.jdbc.DatabaseUtil
+import org.apache.ofbiz.entity.model.ModelEntity
controlPath = parameters._CONTROL_PATH_
@@ -113,7 +114,7 @@ if (security.hasPermission("ENTITY_MAINT", session)) {
miter = messages.iterator()
context.miters = miter
}
- context.checkDbURL = "view/checkdb"
+ context.encodeURLCheckDb = response.encodeURL(controlPath + "/view/checkdb")
context.groupName = groupName ?: "org.apache.ofbiz"
context.entityName = entityName ?: ""
}
diff --git a/framework/webtools/groovyScripts/entity/EntityRef.groovy b/framework/webtools/groovyScripts/entity/EntityRef.groovy
index 279e448bcd..17933dbff7 100644
--- a/framework/webtools/groovyScripts/entity/EntityRef.groovy
+++ b/framework/webtools/groovyScripts/entity/EntityRef.groovy
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.security.CsrfUtil;
-
controlPath = parameters._CONTROL_PATH_
list = "$controlPath/view/entityref_list"
main = "$controlPath/view/entityref_main"
@@ -31,9 +29,5 @@ if (search) {
list = "$list?forstatic=$forstatic"
main = "$main?forstatic=$forstatic"
}
-tokenList = CsrfUtil.generateTokenForNonAjax(request, "view/entityref_list")
-tokenMain = CsrfUtil.generateTokenForNonAjax(request, "view/entityref_main")
-list = CsrfUtil.addOrUpdateTokenInUrl(list, tokenList)
-main = CsrfUtil.addOrUpdateTokenInUrl(main, tokenMain)
context.encodeUrlList = response.encodeURL(list)
context.encodeUrlMain = response.encodeURL(main)
diff --git a/framework/webtools/template/entity/CheckDb.ftl b/framework/webtools/template/entity/CheckDb.ftl
index 91cf8d39b9..ac814595b6 100644
--- a/framework/webtools/template/entity/CheckDb.ftl
+++ b/framework/webtools/template/entity/CheckDb.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
${uiLabelMap.WebtoolsCheckUpdateDatabase}
-