Capitalize page permission key conf

trinodb · May 31, 2024 · 5315748 · 5315748
1 parent 0e68ce5
commit 5315748
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbFormAuthManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbFormAuthManager.java
@@ -32,6 +32,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+
 public class LbFormAuthManager
 {
     private static final Logger log = Logger.get(LbFormAuthManager.class);
@@ -48,7 +50,9 @@ public LbFormAuthManager(FormAuthConfiguration configuration,
             Map<String, String> pagePermissions)
     {
         this.presetUsers = presetUsers;
-        this.pagePermissions = pagePermissions;
+        this.pagePermissions = pagePermissions.entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .collect(toImmutableMap(entry -> entry.getKey().toUpperCase(), Map.Entry::getValue));
 
         if (configuration != null) {
             this.lbKeyProvider = new LbKeyProvider(configuration

diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java
@@ -48,6 +48,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.hash.Hashing.sha256;
 import static com.nimbusds.oauth2.sdk.ResponseType.CODE;
 import static com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet.NONCE_CLAIM_NAME;
@@ -67,7 +68,9 @@ public class LbOAuthManager
     public LbOAuthManager(OAuthConfiguration configuration, Map<String, String> pagePermissions)
     {
         this.oauthConfig = configuration;
-        this.pagePermissions = pagePermissions;
+        this.pagePermissions = pagePermissions.entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .collect(toImmutableMap(entry -> entry.getKey().toUpperCase(), Map.Entry::getValue));
     }
 
     public String getUserIdField()

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java
@@ -36,6 +36,7 @@
 
 import static io.trino.gateway.ha.security.SessionCookie.OAUTH_ID_TOKEN;
 import static io.trino.gateway.ha.security.SessionCookie.logOut;
+import static java.util.Collections.unmodifiableMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @TestInstance(Lifecycle.PER_CLASS)
@@ -119,7 +120,7 @@ public void testPresetUsers()
     public void testNoLdapNoPresetUsers()
             throws Exception
     {
-        LbFormAuthManager authentication = new LbFormAuthManager(null, null, null);
+        LbFormAuthManager authentication = new LbFormAuthManager(null, null, ImmutableMap.of());
         assertThat(authentication.authenticate(new BasicCredentials("user1", "pass1")))
                 .isFalse();
     }
@@ -128,11 +129,23 @@ public void testNoLdapNoPresetUsers()
     public void testWrongLdapConfig()
             throws Exception
     {
-        LbFormAuthManager authentication = new LbFormAuthManager(null, null, null);
+        LbFormAuthManager authentication = new LbFormAuthManager(null, null, ImmutableMap.of());
         assertThat(authentication.authenticate(new BasicCredentials("user1", "pass1")))
                 .isFalse();
     }
 
+    @Test
+    public void testNullInPagePermission()
+    {
+        Map<String, UserConfiguration> presetUsers = ImmutableMap.of("user1", new UserConfiguration("admin, user, api", "pass1"));
+        Map<String, String> pagePermission = new HashMap<>();
+        pagePermission.put("user", null);
+
+        LbFormAuthManager authentication = new LbFormAuthManager(null, presetUsers, unmodifiableMap(pagePermission));
+        assertThat(authentication.authenticate(new BasicCredentials("user1", "pass1")))
+                .isTrue();
+    }
+
     @Test
     public void testLogout()
             throws Exception