Add additional classes to configuration classloader whitelist

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/ConfigurationClassLoader.java

@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
@@ -53,15 +54,18 @@ public class ConfigurationClassLoader extends ClassLoader {
             AuthorizationStack.class,
             Collections.class,
             Configuration.class,
+            Enum.class,
             Filter.class,
             Group.class,
             HashMap.class,
+            HashSet.class,
             IAuthorizationPlugin.class,
             IgnoredNames.class,
             LuceneLockName.class,
             Project.class,
             RemoteSCM.class,
             RepositoryInfo.class,
+            Set.class,
             StatsdConfig.class,
             StatsdFlavor.class,
             String.class,

opengrok-indexer/src/test/java/org/opengrok/indexer/configuration/ConfigurationTest.java

@@ -225,9 +225,9 @@ void testDeserializationOfNotWhiteListedClassThrowsError(final String exploit) {
 
     @Test
     void testLoadingValidConfiguration() throws IOException {
-        try (var bf = new BufferedReader(new InputStreamReader(ConfigurationTest.class.getClassLoader()
+        try (var br = new BufferedReader(new InputStreamReader(ConfigurationTest.class.getClassLoader()
                 .getResourceAsStream("configuration/valid_configuration.xml")))) {
-            String xml = bf.lines().collect(Collectors.joining(System.lineSeparator()));
+            String xml = br.lines().collect(Collectors.joining(System.lineSeparator()));
             var config = Configuration.makeXMLStringAsConfiguration(xml);
             assertEquals("/opt/opengrok_data", config.getDataRoot());
         }