diff --git a/doc/licenses/spring-framework-5.3.27/README b/doc/licenses/spring-framework-5.3.27/README deleted file mode 100644 index c534a2b6b..000000000 --- a/doc/licenses/spring-framework-5.3.27/README +++ /dev/null @@ -1,8 +0,0 @@ -Spring Framework (https://spring.io/projects/spring-framework) --------------------------------------------------------------- - - Version: 5.3.27 - From: 'Spring' (https://spring.io/) - License(s): - Apache v2.0 - diff --git a/doc/licenses/spring-framework-5.3.27/dep-coordinates.txt b/doc/licenses/spring-framework-5.3.27/dep-coordinates.txt deleted file mode 100644 index 8afba931c..000000000 --- a/doc/licenses/spring-framework-5.3.27/dep-coordinates.txt +++ /dev/null @@ -1,7 +0,0 @@ -org.springframework:spring-aop:jar:5.3.27 -org.springframework:spring-beans:jar:5.3.27 -org.springframework:spring-context:jar:5.3.27 -org.springframework:spring-core:jar:5.3.27 -org.springframework:spring-expression:jar:5.3.27 -org.springframework:spring-jcl:jar:5.3.27 -org.springframework:spring-web:jar:5.3.27 diff --git a/doc/licenses/spring-security-5.8.3/NOTICE b/doc/licenses/spring-security-5.8.3/NOTICE deleted file mode 100644 index 7aac7fe5c..000000000 --- a/doc/licenses/spring-security-5.8.3/NOTICE +++ /dev/null @@ -1,2 +0,0 @@ -This product includes software developed by Spring Security -Project (https://www.springframework.org/security). diff --git a/doc/licenses/spring-security-5.8.3/README b/doc/licenses/spring-security-5.8.3/README deleted file mode 100644 index 46b0ae1b1..000000000 --- a/doc/licenses/spring-security-5.8.3/README +++ /dev/null @@ -1,8 +0,0 @@ -Spring Security (https://spring.io/projects/spring-security) ------------------------------------------------------------- - - Version: 5.8.3 - From: 'Spring' (https://spring.io/) - License(s): - Apache v2.0 - diff --git a/doc/licenses/spring-security-5.8.3/dep-coordinates.txt b/doc/licenses/spring-security-5.8.3/dep-coordinates.txt deleted file mode 100644 index b1b573395..000000000 --- a/doc/licenses/spring-security-5.8.3/dep-coordinates.txt +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.security:spring-security-core:jar:5.8.3 -org.springframework.security:spring-security-crypto:jar:5.8.3 -org.springframework.security:spring-security-web:jar:5.8.3 diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java index 947a36338..248f8b2c9 100644 --- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java +++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java @@ -52,7 +52,7 @@ public class RequestValidationService { * @param confService * The (mock) instance of ConfigurationService */ - private RequestValidationService(ConfigurationService confService) { + public RequestValidationService(ConfigurationService confService) { this.confService = confService; } diff --git a/extensions/guacamole-auth-json/src/test/java/org/apache/guacamole/auth/json/RequestValidationServiceTest.java b/extensions/guacamole-auth-json/src/test/java/org/apache/guacamole/auth/json/RequestValidationServiceTest.java index eacac27da..ed5d77ce3 100644 --- a/extensions/guacamole-auth-json/src/test/java/org/apache/guacamole/auth/json/RequestValidationServiceTest.java +++ b/extensions/guacamole-auth-json/src/test/java/org/apache/guacamole/auth/json/RequestValidationServiceTest.java @@ -61,7 +61,7 @@ public class RequestValidationServiceTest { */ private MockConfigurationService(String trustedNetworks) { if (trustedNetworks == null || trustedNetworks.isEmpty()) - trustedNetworks = Collections.emptyList(); + this.trustedNetworks = Collections.emptyList(); else this.trustedNetworks = Arrays.asList(Pattern.compile(",\\s*").split(trustedNetworks)); } @@ -372,7 +372,7 @@ public class RequestValidationServiceTest { @Test public void testNoTrustedNetwork() { - requestService = new RequestValidationService(new MockConfigurationService()); + requestService = new RequestValidationService(new MockConfigurationService(null)); try { assertTrue(requestService.isAuthenticationAllowed(mockHttpServletRequest("1.1.1.1")));