Fix OAuth2 Web UI authentication filter tests

Some of OAuth2 authentication Web UI tests were using `Bearer` authorization header for which support has been removed.
trinodb · Jan 12, 2021 · e80712b · e80712b
1 parent b777864
commit e80712b
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/...in/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilter.java b/...in/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilter.java
@@ -66,7 +66,6 @@
 import static io.trino.server.security.oauth2.TestingHydraService.TTL_ACCESS_TOKEN_IN_SECONDS;
 import static io.trino.server.ui.OAuthWebUiCookie.OAUTH2_COOKIE;
 import static java.lang.String.format;
-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
 import static javax.ws.rs.core.HttpHeaders.LOCATION;
 import static javax.ws.rs.core.Response.Status.OK;
 import static javax.ws.rs.core.Response.Status.SEE_OTHER;
@@ -181,10 +180,8 @@ public void testInvalidToken()
                 .signWith(signatureAlgorithm, keyGenerator.generateKeyPair().getPrivate())
                 .compact();
 
-        try (Response response = httpClient.newCall(
-                uiCall()
-                        .header(AUTHORIZATION, "Bearer " + token)
-                        .build())
+        try (Response response = httpClientUsingCookie(new Cookie.Builder(OAUTH2_COOKIE, token).build())
+                .newCall(uiCall().build())
                 .execute()) {
             assertUnauthorizedUICall(response);
         }
@@ -210,11 +207,7 @@ public void testExpiredAccessToken()
             Cookie cookie = driver.manage().getCookieNamed(OAUTH2_COOKIE);
             assertThat(cookie).withFailMessage(OAUTH2_COOKIE + " is missing").isNotNull();
             Thread.sleep((TTL_ACCESS_TOKEN_IN_SECONDS + 1) * 1000L); // wait for the token expiration
-            try (Response response = httpClient.newCall(
-                    uiCall()
-                            .header(AUTHORIZATION, "Bearer " + cookie.getValue())
-                            .build())
-                    .execute()) {
+            try (Response response = httpClientUsingCookie(cookie).newCall(uiCall().build()).execute()) {
                 assertUnauthorizedUICall(response);
             }
         }));
@@ -303,6 +296,16 @@ private void assertAccessToken(Jws<Claims> jwt)
 
     private void assertUICallWithCookie(Cookie cookie)
             throws IOException
+    {
+        OkHttpClient httpClient = httpClientUsingCookie(cookie);
+        // pass access token in Trino UI cookie
+        assertThat(httpClient.newCall(uiCall().build())
+                .execute()
+                .code())
+                .isEqualTo(OK.getStatusCode());
+    }
+
+    private static OkHttpClient httpClientUsingCookie(Cookie cookie)
     {
         OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
         setupInsecureSsl(httpClientBuilder);
@@ -327,12 +330,7 @@ public List<okhttp3.Cookie> loadForRequest(HttpUrl url)
                         .build());
             }
         });
-
-        // pass access token in Presto UI cookie
-        assertThat(httpClientBuilder.build().newCall(uiCall().build())
-                .execute()
-                .code())
-                .isEqualTo(OK.getStatusCode());
+        return httpClientBuilder.build();
     }
 
     private static int findAvailablePort()