GEOS-9198: improved tests

geoserver · May 8, 2019 · 0b74e06 · 0b74e06
1 parent e6ac66f
commit 0b74e06
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/...community/authkey/src/main/java/org/geoserver/security/AuthenticationKeyFilterConfig.java b/...community/authkey/src/main/java/org/geoserver/security/AuthenticationKeyFilterConfig.java
@@ -34,7 +34,6 @@ public class AuthenticationKeyFilterConfig extends SecurityFilterConfig
     private String authKeyParamName = KeyAuthenticationToken.DEFAULT_URL_PARAM;
     private String userGroupServiceName;
     private Map<String, String> mapperParameters;
-    private boolean allowEnvParametrization = false;
 
     @Override
     public boolean providesAuthenticationEntryPoint() {
@@ -82,10 +81,6 @@ public void setMapperParameters(Map<String, String> mapperParameters) {
         this.mapperParameters = mapperParameters;
     }
 
-    public void setAllowEnvParametrization(boolean allowEnvParametrization) {
-        this.allowEnvParametrization = allowEnvParametrization;
-    }
-
     @Override
     public SecurityConfig clone(boolean allowEnvParametrization) {
         AuthenticationKeyFilterConfig target =
@@ -100,7 +95,8 @@ public SecurityConfig clone(boolean allowEnvParametrization) {
                         String key = param.getKey();
                         Object value = param.getValue();
 
-                        if (gsEnvironment != null && isEnvParametrizationAllowed()) {
+                        if (gsEnvironment != null
+                                && GeoServerEnvironment.ALLOW_ENV_PARAMETRIZATION) {
                             value = gsEnvironment.resolveValue(value);
                         }
 
@@ -112,8 +108,4 @@ public SecurityConfig clone(boolean allowEnvParametrization) {
 
         return target;
     }
-
-    protected boolean isEnvParametrizationAllowed() {
-        return allowEnvParametrization || GeoServerEnvironment.ALLOW_ENV_PARAMETRIZATION;
-    }
 }
diff --git a/src/community/authkey/src/test/java/org/geoserver/security/AuthKeyAuthenticationTest.java b/src/community/authkey/src/test/java/org/geoserver/security/AuthKeyAuthenticationTest.java
@@ -23,6 +23,7 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 import javax.servlet.http.HttpServletResponse;
+import org.geoserver.data.test.SystemTestData;
 import org.geoserver.platform.GeoServerEnvironment;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.security.auth.AbstractAuthenticationProviderTest;
@@ -105,12 +106,19 @@ public HTTPResponse post(URL url, InputStream in, String arg) throws IOException
     @Override
     protected void setUpSpring(List<String> springContextLocations) {
         try {
+            System.setProperty("ALLOW_ENV_PARAMETRIZATION", "true");
             super.setUpSpring(springContextLocations);
         } catch (Exception e) {
             // pass
         }
     }
 
+    @Override
+    protected void onTearDown(SystemTestData testData) throws Exception {
+        super.onTearDown(testData);
+        System.clearProperty("ALLOW_ENV_PARAMETRIZATION");
+    }
+
     @Override
     protected void onSetUp(org.geoserver.data.test.SystemTestData testData) throws Exception {
         super.onSetUp(testData);
@@ -149,7 +157,6 @@ public void testMapperParametersFromEnv() throws Exception {
         String filterName = "testAuthKeyParams2";
 
         AuthenticationKeyFilterConfig config = new AuthenticationKeyFilterConfig();
-        config.setAllowEnvParametrization(true);
         config.setClassName(GeoServerAuthenticationKeyFilter.class.getName());
         config.setName(filterName);
         config.setUserGroupServiceName("ug1");