Merge pull request #58 from privacyidea/http_timeouts

http timeouts, v1.2.2

Author: lukasmatusiewicz

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.privacyidea</groupId>
     <artifactId>privacyidea-java-client</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/privacyidea/Endpoint.java

@@ -73,6 +73,10 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers()
         this.piconfig = privacyIDEA.configuration();
 
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        builder.connectTimeout(piconfig.httpTimeoutMs, TimeUnit.MILLISECONDS)
+               .writeTimeout(piconfig.httpTimeoutMs, TimeUnit.MILLISECONDS)
+               .readTimeout(piconfig.httpTimeoutMs, TimeUnit.MILLISECONDS);
+
         if (!this.piconfig.doSSLVerify)
         {
             // Trust all certs and verify every host
@@ -108,7 +112,7 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
         if (httpUrl == null)
         {
             privacyIDEA.error("Server url could not be parsed: " + (piconfig.serverURL + endpoint));
-            // Invoke the callback to terminate the thread that called this method.
+            // Invoke the callback to terminate the thread that called this function.
             callback.onFailure(null, new IOException("Request could not be created because the url could not be parsed"));
             return;
         }
@@ -118,12 +122,7 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
                        {
                            if (k.equals("pass") || k.equals("password"))
                            {
-                               StringBuilder tmp = new StringBuilder();
-                               for (int i = 0; i < v.length(); i++)
-                               {
-                                   tmp.append("*");
-                               }
-                               v = tmp.toString();
+                               v = "*".repeat(v.length());
                            }
 
                            privacyIDEA.log(k + "=" + v);
@@ -133,15 +132,8 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
         {
             params.forEach((key, value) ->
                            {
-                               try
-                               {
-                                   String encValue = URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
-                                   urlBuilder.addQueryParameter(key, encValue);
-                               }
-                               catch (UnsupportedEncodingException e)
-                               {
-                                   e.printStackTrace();
-                               }
+                               String encValue = URLEncoder.encode(value, StandardCharsets.UTF_8);
+                               urlBuilder.addQueryParameter(key, encValue);
                            });
         }
 
@@ -168,14 +160,7 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
                                    // they are already in the correct encoding for the server
                                    if (!WEBAUTHN_PARAMETERS.contains(key))
                                    {
-                                       try
-                                       {
-                                           encValue = URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
-                                       }
-                                       catch (UnsupportedEncodingException e)
-                                       {
-                                           privacyIDEA.error(e);
-                                       }
+                                       encValue = URLEncoder.encode(value, StandardCharsets.UTF_8);
                                    }
                                    formBodyBuilder.add(key, encValue);
                                }

src/main/java/org/privacyidea/PIConfig.java

@@ -26,6 +26,7 @@ class PIConfig
     String serviceAccountRealm = "";
     boolean disableLog = false;
     String userAgent;
+    int httpTimeoutMs = 30000;
 
     public PIConfig(String serverURL, String userAgent)
     {

src/main/java/org/privacyidea/PrivacyIDEA.java

@@ -567,6 +567,7 @@ public static class Builder
         private IPILogger logger = null;
         private boolean disableLog = false;
         private IPISimpleLogger simpleLogBridge = null;
+        private int httpTimeoutMs = 30000;
 
         /**
          * @param serverURL the server URL is mandatory to communicate with privacyIDEA.
@@ -666,6 +667,17 @@ public Builder disableLog()
             return this;
         }
 
+        /**
+         * Set the timeout for http requests in milliseconds.
+         * @param httpTimeoutMs timeout in milliseconds
+         * @return Builder
+         */
+        public Builder httpTimeoutMs(int httpTimeoutMs)
+        {
+            this.httpTimeoutMs = httpTimeoutMs;
+            return this;
+        }
+
         public PrivacyIDEA build()
         {
             PIConfig configuration = new PIConfig(serverURL, userAgent);
@@ -675,6 +687,7 @@ public PrivacyIDEA build()
             configuration.serviceAccountPass = serviceAccountPass;
             configuration.serviceAccountRealm = serviceAccountRealm;
             configuration.disableLog = disableLog;
+            configuration.httpTimeoutMs = httpTimeoutMs;
             return new PrivacyIDEA(configuration, logger, simpleLogBridge);
         }
     }

src/test/java/org/privacyidea/TestGetTokenInfo.java

@@ -49,6 +49,7 @@ public void setup()
                                  .serviceAccount(serviceAccount, servicePassword)
                                  .serviceRealm(serviceRealm)
                                  .disableLog()
+                                 .httpTimeoutMs(15000)
                                  .sslVerify(false)
                                  .logger(new PILogImplementation())
                                  .build();