Enforce length > 1 for H2 and WebServices path

Fixes gh-12485

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java

@@ -48,8 +48,10 @@ public class H2ConsoleProperties {
 
 	public void setPath(String path) {
 		Assert.notNull(path, "Path must not be null");
-		Assert.isTrue(path.isEmpty() || path.startsWith("/"),
-				"Path must start with / or be empty");
+		Assert.isTrue(path.length() > 1,
+				"Path must have length greater than 1");
+		Assert.isTrue(path.startsWith("/"),
+				"Path must start with '/'");
 		this.path = path;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java

@@ -45,8 +45,10 @@ public class WebServicesProperties {
 
 	public void setPath(String path) {
 		Assert.notNull(path, "Path must not be null");
-		Assert.isTrue(path.isEmpty() || path.startsWith("/"),
-				"Path must start with / or be empty");
+		Assert.isTrue(path.length() > 1,
+				"Path must have length greater than 1");
+		Assert.isTrue(path.startsWith("/"),
+				"Path must start with '/'");
 		this.path = path;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsolePropertiesTests.java

+/*
+ * Copyright 2012-2018 the original author or authors.
+ *
+ * Licensed 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.springframework.boot.autoconfigure.h2;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests for {@link H2ConsoleProperties}.
+ *
+ * @author Madhura Bhave
+ */
+public class H2ConsolePropertiesTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	private H2ConsoleProperties properties;
+
+	@Test
+	public void pathMustNotBeEmpty() {
+		this.properties = new H2ConsoleProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must have length greater than 1");
+		this.properties.setPath("");
+	}
+
+	@Test
+	public void pathMustHaveLengthGreaterThanOne() {
+		this.properties = new H2ConsoleProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must have length greater than 1");
+		this.properties.setPath("/");
+	}
+
+	@Test
+	public void customPathMustBeginWithASlash() {
+		this.properties = new H2ConsoleProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must start with '/'");
+		this.properties.setPath("custom");
+	}
+
+}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesPropertiesTests.java

+/*
+ * Copyright 2012-2018 the original author or authors.
+ *
+ * Licensed 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.springframework.boot.autoconfigure.webservices;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests for {@link WebServicesProperties}.
+ *
+ * @author Madhura Bhave
+ */
+public class WebServicesPropertiesTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	private WebServicesProperties properties;
+
+	@Test
+	public void pathMustNotBeEmpty() {
+		this.properties = new WebServicesProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must have length greater than 1");
+		this.properties.setPath("");
+	}
+
+	@Test
+	public void pathMustHaveLengthGreaterThanOne() {
+		this.properties = new WebServicesProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must have length greater than 1");
+		this.properties.setPath("/");
+	}
+
+	@Test
+	public void customPathMustBeginWithASlash() {
+		this.properties = new WebServicesProperties();
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Path must start with '/'");
+		this.properties.setPath("custom");
+	}
+
+}