Use Request timeout for on premises store login

Author: gmfeinberg

CHANGELOG.md

@@ -13,9 +13,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
   - QueryRequest.get/setNumberOfOperations()
   - QueryRequest.get/setOperationNumber()
 - Added new cloud region codes: hsg, abl, dfw, pbv, nbq, ibg, pcz, mez, den, kal
-- Added rowMetadata support, new API for Get/Put/Delete/MultiDelete request and result
-  get/set RomMetadata.
-- Added row creation time support, new API: GetResult getCreationTime(), 
+- Added rowMetadata support, new API for Get/Put/Delete/MultiDelete request and
+  result get/set RowMetadata.
+- Added row creation time support, new API: GetResult getCreationTime(),
   Put/Delete/Write/WriteMultiple Result getExistingCreationTime().
 
 ## [5.4.17] 2025-03-03
@@ -29,6 +29,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 - Update netty dependency to 4.1.118.Final
+- Authentication calls for on premises login will now honor the request timeout
+  rather than using a hard-coded 30s timeout
+
 
 ## [5.4.16] 2024-11-21
 

driver/src/main/java/oracle/nosql/driver/http/Client.java

@@ -798,7 +798,7 @@ public Result execute(Request kvRequest) {
                 if (authProvider instanceof StoreAccessTokenProvider) {
                     final StoreAccessTokenProvider satp =
                         (StoreAccessTokenProvider) authProvider;
-                    satp.bootstrapLogin();
+                    satp.bootstrapLogin(kvRequest);
                     kvRequest.addRetryException(rae.getClass());
                     kvRequest.incrementRetries();
                     exception = rae;

driver/src/main/java/oracle/nosql/driver/kv/StoreAccessTokenProvider.java

@@ -82,9 +82,12 @@ public class StoreAccessTokenProvider implements AuthorizationProvider {
     private static final String LOGOUT_SERVICE = "/logout";
 
     /*
-     * Default timeout when sending http request to server
+     * Default timeout when sending http request to server if not specified
+     * by a request timeout. This is fairly long because it is usually
+     * performed in an async fashion from a timer task and not in the
+     * request path
      */
-    private static final int HTTP_TIMEOUT_MS = 30000;
+    private static final int HTTP_TIMEOUT_MS = 20000;
 
     /*
      * Authentication string which contain the Bearer prefix and login token's
@@ -220,7 +223,7 @@ public StoreAccessTokenProvider(String userName,
      *
      * Bootstrap login using the provided credentials
      */
-    public synchronized void bootstrapLogin() {
+    public synchronized void bootstrapLogin(Request request) {
 
         /* re-check the authString in case of a race */
         if (!isSecure || isClosed || authString.get() != null) {
@@ -236,11 +239,16 @@ public synchronized void bootstrapLogin() {
                 encodeToString((
                     userName + ":" + String.valueOf(password)).getBytes());
 
+            /*
+             * Use the request timeout for this operation if available
+             */
+            int timeoutMs = (request != null ?
+                             request.getTimeoutInternal() : 0);
             /*
              * Send request to server for login token
              */
             HttpResponse response = sendRequest(BASIC_PREFIX + encoded,
-                                                LOGIN_SERVICE);
+                                                LOGIN_SERVICE, timeoutMs);
 
             /*
              * login fail
@@ -294,7 +302,7 @@ public String getAuthorizationString(Request request) {
          * the login token and generate the auth string.
          */
         if (authString.get() == null) {
-            bootstrapLogin();
+            bootstrapLogin(request);
         }
         return authString.get();
     }
@@ -330,7 +338,7 @@ public synchronized void close() {
          */
         try {
             final HttpResponse response =
-                sendRequest(authString.get(), LOGOUT_SERVICE);
+                sendRequest(authString.get(), LOGOUT_SERVICE, 0);
             if (response.getStatusCode() != HttpResponseStatus.OK.code()) {
                 if (logger != null) {
                     logger.info("Failed to logout user " + userName +
@@ -497,7 +505,8 @@ private String parseJsonResult(String jsonResult) {
      * authentication information.
      */
     private HttpResponse sendRequest(String authHeader,
-                                     String serviceName) throws Exception {
+                                     String serviceName,
+                                     int timeoutMs) throws Exception {
         HttpClient client = null;
         try {
             final HttpHeaders headers = new DefaultHttpHeaders();
@@ -509,11 +518,14 @@ private HttpResponse sendRequest(String authHeader,
                  sslHandshakeTimeoutMs,
                  serviceName,
                  logger);
+            if (timeoutMs == 0) {
+                timeoutMs = HTTP_TIMEOUT_MS;
+            }
             return HttpRequestUtil.doGetRequest(
                 client,
                 NoSQLHandleConfig.createURL(endpoint, basePath + serviceName)
                 .toString(),
-                headers, HTTP_TIMEOUT_MS, logger);
+                headers, timeoutMs, logger);
         } finally {
             if (client != null) {
                 client.shutdown();
@@ -560,7 +572,8 @@ public void run() {
             try {
                 final String oldAuth = authString.get();
                 HttpResponse response = sendRequest(oldAuth,
-                                                    RENEW_SERVICE);
+                                                    RENEW_SERVICE,
+                                                    0);
                 final String token = parseJsonResult(response.getOutput());
                 if (response.getStatusCode() != HttpResponseStatus.OK.code()) {
                     throw new InvalidAuthorizationException(token);

driver/src/test/java/oracle/nosql/driver/kv/StoreAccessTokenProviderTest.java

@@ -185,7 +185,7 @@ private class TestMultiThreads implements Runnable {
         public void run() {
             try {
                 for (int i = 0; i < 5; i++) {
-                    sap.bootstrapLogin();
+                    sap.bootstrapLogin(null);
                 }
             } finally {
                 sap.close();