Sidecar security matcher

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.5.0
+* Made the way `HttpSecurity#securityMatcher` is applied in Sidecars customizable #221
+  * By default `PathPatternRequestMatcher` is now used instead of `MvcRequestMatcher` or `AntPathRequestMatcher`
+  * This fixes problems where the app/servlet utilizes an existing `urlMapping` that could result in incorrect path interception.
+  * Further details can be found in `software.xdev.sse.web.sidecar.httpsecurity`
+
 # 1.4.0
 * Vaadin
   * Deprecated `TotalVaadinFlowWebSecurity` because `VaadinWebSecurity` is deprecated

bom/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>bom</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>bom</name>
@@ -51,62 +51,62 @@
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>client-storage</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>crypto-symmetric</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>crypto-symmetric-managed</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>codec-sha256</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>csp</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>metrics</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>oauth2-oidc</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>oauth2-oidc-remember-me</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>vaadin</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web-sidecar-actuator</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web-sidecar-common</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

client-storage/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>client-storage</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>client-storage</name>

codec-sha256/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>codec-sha256</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>codec-sha256</name>

crypto-symmetric-managed/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>crypto-symmetric-managed</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>crypto-symmetric-managed</name>

crypto-symmetric/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>crypto-symmetric</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>crypto-symmetric</name>

csp/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>csp</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>csp</name>

demo/entities-metamodel/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo</groupId>
 		<artifactId>demo</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities-metamodel</artifactId>
 

demo/entities/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo</groupId>
 		<artifactId>demo</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities</artifactId>
 

demo/integration-tests/pom.xml

@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>software.xdev.sse.demo</groupId>
 		<artifactId>demo</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>software.xdev.sse.demo.it</groupId>
 	<artifactId>integration-tests</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -31,31 +31,31 @@
 			<dependency>
 				<groupId>software.xdev.sse.demo.it</groupId>
 				<artifactId>tci-db</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>software.xdev.sse.demo.it</groupId>
 				<artifactId>tci-webapp</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>software.xdev.sse.demo.it</groupId>
 				<artifactId>tci-webapp-rest</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>software.xdev.sse.demo.it</groupId>
 				<artifactId>tci-webapp-vaadin</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>software.xdev.sse.demo.it</groupId>
 				<artifactId>webapp-it-base</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Selenium -->

demo/integration-tests/tci-db/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tci-db</artifactId>
 

demo/integration-tests/tci-webapp-rest/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tci-webapp-rest</artifactId>
 

demo/integration-tests/tci-webapp-vaadin/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tci-webapp-vaadin</artifactId>
 

demo/integration-tests/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppImageNameResolver.java

@@ -0,0 +1,31 @@
+package software.xdev.sse.demo.tci.webapp.factory;
+
+import software.xdev.sse.demo.tci.webapp.containers.WebAppContainerBuilder;
+
+
+public final class VaadinWebAppImageNameResolver
+{
+	public static final String PROPERTY_APP_DOCKERIMAGE = "appDockerImage";
+
+	private static String appImageName;
+
+	public static synchronized String getAppImageName()
+	{
+		if(appImageName != null)
+		{
+			return appImageName;
+		}
+
+		appImageName = System.getProperty(PROPERTY_APP_DOCKERIMAGE);
+		if(appImageName == null)
+		{
+			appImageName = WebAppContainerBuilder.getBuiltImageName("tci-webapp-vaadin");
+		}
+
+		return appImageName;
+	}
+
+	private VaadinWebAppImageNameResolver()
+	{
+	}
+}

demo/integration-tests/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppOnDemandTCIFactory.java

@@ -0,0 +1,33 @@
+package software.xdev.sse.demo.tci.webapp.factory;
+
+import java.util.function.Consumer;
+
+import software.xdev.sse.demo.tci.webapp.VaadinWebAppTCI;
+import software.xdev.sse.demo.tci.webapp.containers.VaadinWebAppContainer;
+import software.xdev.tci.factory.ondemand.OnDemandTCIFactory;
+
+
+public class VaadinWebAppOnDemandTCIFactory extends OnDemandTCIFactory<VaadinWebAppContainer, VaadinWebAppTCI>
+{
+	public VaadinWebAppOnDemandTCIFactory(
+		final String variantName,
+		final Consumer<VaadinWebAppContainer> additionalContainerBuilder)
+	{
+		super(
+			VaadinWebAppTCI::new,
+			() -> {
+				final VaadinWebAppContainer container = VaadinWebAppTCIFactoryBase.createDefaultContainer();
+				additionalContainerBuilder.accept(container);
+				return container;
+			},
+			"webapp-" + variantName,
+			"container.webapp-" + variantName);
+	}
+
+	@Override
+	protected void warmUpInternal()
+	{
+		VaadinWebAppImageNameResolver.getAppImageName();
+		super.warmUpInternal();
+	}
+}

demo/integration-tests/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppPreStartableTCIFactory.java

@@ -0,0 +1,32 @@
+package software.xdev.sse.demo.tci.webapp.factory;
+
+import java.util.function.Consumer;
+
+import software.xdev.sse.demo.tci.webapp.VaadinWebAppTCI;
+import software.xdev.sse.demo.tci.webapp.containers.VaadinWebAppContainer;
+import software.xdev.tci.factory.prestart.PreStartableTCIFactory;
+
+
+public class VaadinWebAppPreStartableTCIFactory extends PreStartableTCIFactory<VaadinWebAppContainer, VaadinWebAppTCI>
+{
+	public VaadinWebAppPreStartableTCIFactory(final Consumer<VaadinWebAppContainer> additionalContainerBuilder)
+	{
+		super(
+			VaadinWebAppTCI::new,
+			() -> {
+				final VaadinWebAppContainer container = VaadinWebAppTCIFactoryBase.createDefaultContainer();
+				additionalContainerBuilder.accept(container);
+				return container;
+			},
+			"webapp",
+			"container.webapp",
+			"WebApp");
+	}
+
+	@Override
+	protected void warmUpInternal()
+	{
+		VaadinWebAppImageNameResolver.getAppImageName();
+		super.warmUpInternal();
+	}
+}