Cache contextpath

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/api/ProxyRouteController.java

@@ -24,8 +24,7 @@
 import eu.openanalytics.containerproxy.service.ProxyService;
 import eu.openanalytics.containerproxy.service.UserService;
 import eu.openanalytics.containerproxy.util.ProxyMappingManager;
-import eu.openanalytics.containerproxy.util.SessionHelper;
-import org.springframework.core.env.Environment;
+import eu.openanalytics.containerproxy.util.ContextPathHelper;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -45,15 +44,12 @@ public class ProxyRouteController extends BaseController {
 	@Inject
 	private ProxyMappingManager mappingManager;
 
-	@Inject
-	private Environment environment;
-	
 	@RequestMapping(value="/api/route/**")
 	public void route(HttpServletRequest request, HttpServletResponse response) {
 		try {
 			// Ensure that the caller is the owner of the target proxy.
 			boolean hasAccess = false;
-			String baseURL = SessionHelper.getContextPath(environment, true) + "api/route/";
+			String baseURL = ContextPathHelper.withEndingSlash() + "api/route/";
 			String mapping = request.getRequestURI().substring(baseURL.length());
 			String proxyId = mappingManager.getProxyId(mapping);
 			if (proxyId != null) {

src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java

@@ -24,7 +24,7 @@
 import eu.openanalytics.containerproxy.auth.impl.oidc.OpenIdReAuthorizeFilter;
 import eu.openanalytics.containerproxy.spec.expression.SpecExpressionContext;
 import eu.openanalytics.containerproxy.spec.expression.SpecExpressionResolver;
-import eu.openanalytics.containerproxy.util.SessionHelper;
+import eu.openanalytics.containerproxy.util.ContextPathHelper;
 import net.minidev.json.JSONArray;
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
@@ -161,7 +161,7 @@ public void configureAuthenticationManagerBuilder(AuthenticationManagerBuilder a
 	}
 
 	public String getLoginRedirectURI() {
-		return SessionHelper.getContextPath(environment, false) 
+		return ContextPathHelper.withoutEndingSlash()
 				+ OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI 
 				+ "/" + REG_ID;
 	}

src/main/java/eu/openanalytics/containerproxy/auth/impl/SAMLAuthenticationBackend.java

@@ -23,7 +23,7 @@
 import eu.openanalytics.containerproxy.auth.IAuthenticationBackend;
 import eu.openanalytics.containerproxy.auth.impl.saml.AuthenticationFailureHandler;
 import eu.openanalytics.containerproxy.auth.impl.saml.Saml2MetadataFilter;
-import eu.openanalytics.containerproxy.util.SessionHelper;
+import eu.openanalytics.containerproxy.util.ContextPathHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.env.Environment;
@@ -158,7 +158,7 @@ public static String determineLogoutSuccessURL(Environment environment) {
     }
 
     public String getLoginRedirectURI() {
-        return SessionHelper.getContextPath(environment, false)
+        return ContextPathHelper.withoutEndingSlash()
                 + "/saml2/authenticate/"
                 + REG_ID;
     }

…s/containerproxy/util/SessionHelper.java …ntainerproxy/util/ContextPathHelper.javasrc/main/java/eu/openanalytics/containerproxy/util/SessionHelper.java renamed to src/main/java/eu/openanalytics/containerproxy/util/ContextPathHelper.java src/main/java/eu/openanalytics/containerproxy/util/SessionHelper.java renamed to src/main/java/eu/openanalytics/containerproxy/util/ContextPathHelper.java

@@ -20,24 +20,37 @@
  */
 package eu.openanalytics.containerproxy.util;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
 
-public class SessionHelper {
+@Component
+public class ContextPathHelper {
 
-	/**
-	 * Get the context path that has been configured for this instance.
-	 * 
-	 * @param environment The Spring environment containing the context-path setting.
-	 * @param endWithSlash True to always end the context path with a slash.
-	 * @return The instance's context path, may be empty, never null.
-	 */
-	public static String getContextPath(Environment environment, boolean endWithSlash) {
+	private static String contextPathWithoutSlash = null;
+	private static String contextPathWithSlash = null;
+
+	@Autowired
+	public void setEnvironment(Environment environment){
+		contextPathWithSlash = getContextPath(environment, true);
+		contextPathWithoutSlash = getContextPath(environment, false);
+	}
+
+	public static String withEndingSlash() {
+		return contextPathWithSlash;
+	}
+
+	public static String withoutEndingSlash() {
+		return contextPathWithoutSlash;
+	}
+
+	private static String getContextPath(Environment environment, boolean endWithSlash) {
 		String contextPath = environment.getProperty("server.servlet.context-path");
 		if (contextPath == null || contextPath.trim().equals("/") || contextPath.trim().isEmpty()) return endWithSlash ? "/" : "";
-		
+
 		if (!contextPath.startsWith("/")) contextPath = "/" + contextPath;
 		if (endWithSlash && !contextPath.endsWith("/")) contextPath += "/";
-		
+
 		return contextPath;
 	}