Ref #29480: use versioned assets

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java

@@ -24,6 +24,7 @@
 import eu.openanalytics.containerproxy.auth.IAuthenticationBackend;
 import eu.openanalytics.containerproxy.auth.UserLogoutHandler;
 import eu.openanalytics.containerproxy.auth.impl.OpenIDAuthenticationBackend;
+import eu.openanalytics.containerproxy.service.IdentifierService;
 import eu.openanalytics.containerproxy.util.AppRecoveryFilter;
 import eu.openanalytics.containerproxy.util.EnvironmentUtils;
 import eu.openanalytics.containerproxy.util.OverridingHeaderWriter;
@@ -93,6 +94,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Inject
 	private AppRecoveryFilter appRecoveryFilter;
+
+	@Inject
+	private IdentifierService identifierService;
 
 	@Autowired(required=false)
 	private List<ICustomSecurityConfig> customConfigs;
@@ -108,13 +112,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Override
 	public void configure(WebSecurity web) {
-//		web
-//			.ignoring().antMatchers("/css/**").and()
-//			.ignoring().antMatchers("/img/**").and()
-//			.ignoring().antMatchers("/js/**").and()
-//			.ignoring().antMatchers("/assets/**").and()
-//			.ignoring().antMatchers("/webjars/**").and();
-//		
 		if (customConfigs != null) {
 			for (ICustomSecurityConfig cfg: customConfigs) {
 				try {
@@ -225,7 +222,13 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Acc
 		if (auth.hasAuthorization()) {
 			http.authorizeRequests().antMatchers(
 					"/login", "/signin/**", "/auth-error", "/error", "/app-access-denied", "/logout-success",
-					"/favicon.ico", "/css/**", "/img/**", "/js/**", "/assets/**", "/webjars/**").permitAll();
+					"/favicon.ico",
+					"/" + identifierService.instanceId + "/css/**", "/css/**",
+					"/" + identifierService.instanceId + "/img/**", "/img/**",
+					"/" + identifierService.instanceId + "/js/**", "/js/**",
+					"/" + identifierService.instanceId + "/assets/**", "/assets/**",
+					"/" + identifierService.instanceId + "/webjars/**", "/webjars/**"
+					).permitAll();
 			http
 				.formLogin()
 					.loginPage("/login")

src/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java

@@ -20,11 +20,10 @@
  */
 package eu.openanalytics.containerproxy.ui;
 
+import eu.openanalytics.containerproxy.service.IdentifierService;
 import eu.openanalytics.containerproxy.util.EnvironmentUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -33,7 +32,6 @@
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
-import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
@@ -45,11 +43,21 @@ public class TemplateResolverConfig implements WebMvcConfigurer {
 
 	@Inject
     private Environment environment;
+
+	@Inject
+	private IdentifierService identifierService;
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("/assets/**")
-			.addResourceLocations("file:" + environment.getProperty(PROP_TEMPLATE_PATH) + "/assets/");
+				.addResourceLocations("file:" + environment.getProperty(PROP_TEMPLATE_PATH) + "/assets/");
+		// next line is to have versioned (based on shinyproxy instance) assets
+		registry.addResourceHandler("/" + identifierService.instanceId + "/**")
+				.addResourceLocations("classpath:/static/");
+		registry.addResourceHandler("/" + identifierService.instanceId + "/webjars/**")
+				.addResourceLocations("/webjars/");
+		registry.addResourceHandler("/" + identifierService.instanceId + "/assets/**")
+				.addResourceLocations("file:" + environment.getProperty(PROP_TEMPLATE_PATH) + "/assets/");
 	}
 
 	@Bean