Refactor admin user and group handling

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/service/RuntimeValueService.java

@@ -53,6 +53,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -103,7 +104,7 @@ public Proxy addRuntimeValuesBeforeSpel(Authentication user, ProxySpec spec, Pro
             proxyBuilder.addRuntimeValue(new RuntimeValue(RealmIdKey.inst, identifierService.realmId), false);
         }
         proxyBuilder.addRuntimeValue(new RuntimeValue(UserIdKey.inst, proxy.getUserId()), false);
-        String[] groups = UserService.getGroups(user);
+        List<String> groups = UserService.getGroups(user);
         proxyBuilder.addRuntimeValue(new RuntimeValue(UserGroupsKey.inst, String.join(",", groups)), true);
         proxyBuilder.addRuntimeValue(new RuntimeValue(CreatedTimestampKey.inst, Long.toString(proxy.getCreatedTimestamp())), false);
 

src/main/java/eu/openanalytics/containerproxy/service/UserService.java

@@ -88,7 +88,7 @@ public String getCurrentUserId() {
 		return getUserId(getCurrentAuth());
 	}
 
-	public String[] getAdminGroups() {
+	public Set<String> getAdminGroups() {
 		Set<String> adminGroups = new HashSet<>();
 
 		// Support for old, non-array notation
@@ -105,10 +105,10 @@ public String[] getAdminGroups() {
 			adminGroups.add(groupName.toUpperCase());
 		}
 
-		return adminGroups.toArray(new String[adminGroups.size()]);
+		return adminGroups;
 	}
 
-	public String[] getAdminUsers() {
+	public Set<String> getAdminUsers() {
 		Set<String> adminUsers = new HashSet<>();
 
 		// Support for old, non-array notation
@@ -125,14 +125,14 @@ public String[] getAdminUsers() {
 			adminUsers.add(userName);
 		}
 
-		return adminUsers.toArray(new String[adminUsers.size()]);
+		return adminUsers;
 	}
 
-	public String[] getGroups() {
+	public List<String> getGroups() {
 		return getGroups(getCurrentAuth());
 	}
 
-	public static String[] getGroups(Authentication auth) {
+	public static List<String> getGroups(Authentication auth) {
 		List<String> groups = new ArrayList<>();
 		if (auth != null) {
 			for (GrantedAuthority grantedAuth: auth.getAuthorities()) {
@@ -141,15 +141,15 @@ public static String[] getGroups(Authentication auth) {
 				groups.add(authName);
 			}
 		}
-		return groups.toArray(new String[groups.size()]);
+		return groups;
 	}
 
 	public boolean isAdmin() {
 		return isAdmin(getCurrentAuth());
 	}
 
 	public boolean isAdmin(Authentication auth) {
-		if (!authBackend.hasAuthorization()) {
+		if (!authBackend.hasAuthorization() || auth == null) {
 			return false;
 		}
 
@@ -161,7 +161,7 @@ public boolean isAdmin(Authentication auth) {
 
 		String userName = getUserId(auth);
 		for (String adminUser: getAdminUsers()) {
-			if (userName != null && userName.equals(adminUser)) {
+			if (userName != null && userName.equalsIgnoreCase(adminUser)) {
 				return true;
 			}
 		}

src/main/java/eu/openanalytics/containerproxy/spec/expression/SpecExpressionContext.java

@@ -135,7 +135,7 @@ public static SpecExpressionContext create(SpecExpressionContextBuilder builder,
                 builder.ldapUser = (LdapUserDetails) o;
             }
             if (o instanceof Authentication) {
-                builder.groups = Arrays.asList(UserService.getGroups((Authentication) o));
+                builder.groups = UserService.getGroups((Authentication) o);
                 builder.userId = UserService.getUserId(((Authentication) o));
             }
         }