Update

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Test Server RPM
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $RETRY ./mvnw verify -B -P ci -pl :trino-server-rpm
+          $RETRY bash -c './mvnw verify -B -P ci -pl :trino-server-rpm || find core/trino-server-rpm/ -exec ls -ald {} +'
       - name: Clean Maven Output
         run: ./mvnw clean -pl '!:trino-server,!:trino-cli'
       - name: Test Docker Image
@@ -245,7 +245,7 @@ jobs:
           - ":trino-oracle"
           - ":trino-kudu"
           - ":trino-iceberg,:trino-druid"
-          - ":trino-phoenix,:trino-phoenix5"
+          # TODO (https://github.com/trinodb/trino/issues/7534) - ":trino-phoenix,:trino-phoenix5"
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v2

client/trino-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>355-SNAPSHOT</version>
+        <version>356-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

client/trino-cli/src/main/java/io/trino/cli/QueryRunner.java

@@ -20,6 +20,7 @@
 import io.trino.client.StatementClient;
 import io.trino.client.auth.external.ExternalAuthenticator;
 import io.trino.client.auth.external.HttpTokenPoller;
+import io.trino.client.auth.external.KnownToken;
 import io.trino.client.auth.external.RedirectHandler;
 import io.trino.client.auth.external.TokenPoller;
 import okhttp3.OkHttpClient;
@@ -34,7 +35,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.client.ClientSession.stripTransactionId;
 import static io.trino.client.OkHttpUtil.basicAuth;
-import static io.trino.client.OkHttpUtil.setupChannelSocket;
 import static io.trino.client.OkHttpUtil.setupCookieJar;
 import static io.trino.client.OkHttpUtil.setupHttpProxy;
 import static io.trino.client.OkHttpUtil.setupKerberos;
@@ -93,7 +93,6 @@ public QueryRunner(
 
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
-        setupChannelSocket(builder);
         setupTimeouts(builder, 30, SECONDS);
         setupCookieJar(builder);
         setupSocksProxy(builder, socksProxy);
@@ -195,6 +194,7 @@ private static void setupExternalAuth(
         ExternalAuthenticator authenticator = new ExternalAuthenticator(
                 redirectHandler,
                 poller,
+                KnownToken.local(),
                 Duration.ofMinutes(10));
 
         builder.authenticator(authenticator);

client/trino-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>355-SNAPSHOT</version>
+        <version>356-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -81,6 +81,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>

client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java

@@ -14,16 +14,12 @@
 package io.trino.client;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Splitter;
-import com.google.common.base.StandardSystemProperty;
-import com.google.common.collect.ImmutableList;
 import com.google.common.net.HostAndPort;
 import io.airlift.security.pem.PemReader;
 import okhttp3.Credentials;
 import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
 import okhttp3.Request;
 import okhttp3.internal.tls.LegacyHostnameVerifier;
 
@@ -246,26 +242,6 @@ public static void setupSsl(
         }
     }
 
-    public static void setupChannelSocket(OkHttpClient.Builder clientBuilder)
-    {
-        // Enable socket factory only for pre JDK 11
-        if (!isAtLeastJava11()) {
-            clientBuilder.socketFactory(new SocketChannelSocketFactory());
-            clientBuilder.protocols(ImmutableList.of(Protocol.HTTP_1_1));
-        }
-    }
-
-    private static boolean isAtLeastJava11()
-    {
-        String feature = Splitter.on(".").split(StandardSystemProperty.JAVA_VERSION.value()).iterator().next();
-        try {
-            return Integer.parseInt(feature) >= 11;
-        }
-        catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
     private static void validateCertificates(KeyStore keyStore)
             throws GeneralSecurityException
     {

client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java

@@ -44,41 +44,41 @@ public class ExternalAuthenticator
     private final TokenPoller tokenPoller;
     private final RedirectHandler redirectHandler;
     private final Duration timeout;
-    private Token knownToken;
+    private final KnownToken knownToken;
 
-    public ExternalAuthenticator(RedirectHandler redirect, TokenPoller tokenPoller, Duration timeout)
+    public ExternalAuthenticator(RedirectHandler redirect, TokenPoller tokenPoller, KnownToken knownToken, Duration timeout)
     {
         this.tokenPoller = requireNonNull(tokenPoller, "tokenPoller is null");
         this.redirectHandler = requireNonNull(redirect, "redirect is null");
+        this.knownToken = requireNonNull(knownToken, "knownToken is null");
         this.timeout = requireNonNull(timeout, "timeout is null");
     }
 
     @Nullable
     @Override
     public Request authenticate(Route route, Response response)
     {
-        knownToken = null;
-
-        Optional<ExternalAuthentication> authentication = toAuthentication(response);
-        if (!authentication.isPresent()) {
-            return null;
-        }
+        knownToken.setupToken(() -> {
+            Optional<ExternalAuthentication> authentication = toAuthentication(response);
+            if (!authentication.isPresent()) {
+                return Optional.empty();
+            }
 
-        Optional<Token> token = authentication.get().obtainToken(timeout, redirectHandler, tokenPoller);
-        if (!token.isPresent()) {
-            return null;
-        }
+            return authentication.get().obtainToken(timeout, redirectHandler, tokenPoller);
+        });
 
-        knownToken = token.get();
-        return withBearerToken(response.request(), knownToken);
+        return knownToken.getToken()
+                .map(token -> withBearerToken(response.request(), token))
+                .orElse(null);
     }
 
     @Override
     public Response intercept(Chain chain)
             throws IOException
     {
-        if (knownToken != null) {
-            return chain.proceed(withBearerToken(chain.request(), knownToken));
+        Optional<Token> token = knownToken.getToken();
+        if (token.isPresent()) {
+            return chain.proceed(withBearerToken(chain.request(), token.get()));
         }
 
         return chain.proceed(chain.request());

client/trino-client/src/main/java/io/trino/client/auth/external/KnownToken.java

@@ -0,0 +1,34 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.client.auth.external;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+public interface KnownToken
+{
+    Optional<Token> getToken();
+
+    void setupToken(Supplier<Optional<Token>> tokenSource);
+
+    static KnownToken local()
+    {
+        return new LocalKnownToken();
+    }
+
+    static KnownToken memoryCached()
+    {
+        return MemoryCachedKnownToken.INSTANCE;
+    }
+}

client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java

@@ -0,0 +1,46 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.client.auth.external;
+
+import javax.annotation.concurrent.NotThreadSafe;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * LocalKnownToken class keeps the token on its field
+ * and it's designed to use it in fully serialized manner.
+ */
+@NotThreadSafe
+class LocalKnownToken
+        implements KnownToken
+{
+    private Optional<Token> knownToken = Optional.empty();
+
+    @Override
+    public Optional<Token> getToken()
+    {
+        return knownToken;
+    }
+
+    @Override
+    public void setupToken(Supplier<Optional<Token>> tokenSource)
+    {
+        requireNonNull(tokenSource, "tokenSource is null");
+
+        knownToken = tokenSource.get();
+    }
+}