Update: New Tests (#35)

* Update pom.xml

* fix: response id

* Create TestU2F.java

* Fix: u2f optional headers

* update existing tests

* update webauthn test to validateCheckWebauthn

* Create TestGetTokenInfo

* update and format tests

* update tests

add new tests

* Update tests

* some updates for the comments

* rm IPILogger and use PILogImplementation()

* formatting

* Update TestTriggerChallenge.java

* Update TestTriggerChallenge.java

+ only hotp
+ testWrongServerURL
+ testNoUsername

* Update TestGetTokenInfo and TestRollout

* rm redundant tests

* Add another case for validateCheckSerial

* Add error case for TestValidateCheck

+ Update TestValidateCheckSerial
+ rm TestErrors

* rm pollingIntervals

* Update TestWebAuthn

+ rm redundant TestServiceAccount

* Create TestPollTransaction.java

* Update TestU2F

+ update TestPollTransaction
+ update TestWebAuthn

* TestValidateCheck

add tearDown

Co-authored-by: Nils Behlen <29949516+nilsbehlen@users.noreply.github.com>

Author: lukasmatusiewicz

.gitignore

@@ -3,3 +3,4 @@ target/
 sdk-java.iml
 dependency-reduced-pom.xml
 *.iml
+/src/test/java/org/privacyidea/TestBuildHelper.java

pom.xml

@@ -20,7 +20,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12.4</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <skipTests>false</skipTests>
                 </configuration>
             </plugin>
 
@@ -81,30 +81,15 @@
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-junit-rule</artifactId>
-            <version>5.12.0</version>
+            <version>5.13.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.36</version>
-        </dependency>
-
-        <!-- Needed for MockServer if JDK >=16 -->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.70</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.70</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 </project>

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

@@ -27,6 +27,7 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.FormBody;
 import okhttp3.HttpUrl;
@@ -108,6 +109,7 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
         {
             privacyIDEA.error("Server url could not be parsed: " + (piconfig.serverURL + endpoint));
             // Invoke the callback to terminate the thread that called this method.
+            // TODO
             callback.onFailure(null,
                                new IOException("Request could not be created because the url could not be parsed"));
             return;
@@ -188,4 +190,4 @@ void sendRequestAsync(String endpoint, Map<String, String> params, Map<String, S
         //privacyIDEA.log("HEADERS:\n" + request.headers().toString());
         client.newCall(request).enqueue(callback);
     }
-}
+}

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

@@ -26,7 +26,6 @@ class PIConfig
     String serviceAccountName = "";
     String serviceAccountPass = "";
     String serviceAccountRealm = "";
-    List<Integer> pollingIntervals = new ArrayList<>();
     boolean disableLog = false;
     String userAgent = "";
 
@@ -35,4 +34,4 @@ public PIConfig(String serverURL, String userAgent)
         this.serverURL = serverURL;
         this.userAgent = userAgent;
     }
-}
+}

src/main/java/org/privacyidea/PIConstants.java

@@ -39,11 +39,6 @@ private PIConstants()
     public static final String HEADER_AUTHORIZATION = "Authorization";
     public static final String HEADER_USER_AGENT = "User-Agent";
 
-    // Will be used if single value from config cannot be parsed
-    public static final int DEFAULT_POLLING_INTERVAL = 1;
-    // Will be used if no intervals are specified
-    public static final List<Integer> DEFAULT_POLLING_ARRAY = Arrays.asList(4, 2, 1, 1, 2);
-
     // TOKEN TYPES
     public static final String TOKEN_TYPE_PUSH = "push";
     public static final String TOKEN_TYPE_OTP = "otp";

src/main/java/org/privacyidea/PIResponse.java

@@ -51,8 +51,7 @@ public class PIResponse
 
     public boolean pushAvailable()
     {
-        return multichallenge.stream()
-                             .anyMatch(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
+        return multichallenge.stream().anyMatch(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
     }
 
     /**
@@ -152,8 +151,7 @@ public String mergedSignRequest()
         }
         if (webAuthnSignRequests.size() == 1)
         {
-            return webAuthnSignRequests.get(0)
-                                       .signRequest();
+            return webAuthnSignRequests.get(0).signRequest();
         }
 
         WebAuthn webAuthn = webAuthnSignRequests.get(0);

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

@@ -29,7 +29,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.privacyidea.PIConstants.ENDPOINT_AUTH;
 import static org.privacyidea.PIConstants.ENDPOINT_POLLTRANSACTION;
@@ -147,6 +146,14 @@ public PIResponse validateCheckSerial(String serial, String otp, Map<String, Str
         return this.validateCheckSerial(serial, otp, null, headers);
     }
 
+    /**
+     * @see PrivacyIDEA#validateCheckSerial(String, String, String, Map)
+     */
+    public PIResponse validateCheckSerial(String serial, String otp, String transactionId)
+    {
+        return this.validateCheckSerial(serial, otp, transactionId, Collections.emptyMap());
+    }
+
     /**
      * Send a request to /validate/check with the serial rather than the username to identify the token.
      *
@@ -185,15 +192,14 @@ public PIResponse validateCheckWebAuthn(String user, String transactionId, Strin
      *
      * @param user                 username
      * @param transactionId        transactionId
-     * @param webAuthnSignResponse the WebAuthnSignResponse as returned from the
+     * @param webAuthnSignResponse the WebAuthnSignResponse as returned from the browser
      * @param origin               server name that was used for
      * @param headers              optional headers for the request
      * @return PIResponse or null if error
      */
     public PIResponse validateCheckWebAuthn(String user, String transactionId, String webAuthnSignResponse,
                                             String origin, Map<String, String> headers)
     {
-
         Map<String, String> params = new LinkedHashMap<>();
         // Standard validateCheck data
         params.put(USER, user);
@@ -213,12 +219,20 @@ public PIResponse validateCheckWebAuthn(String user, String transactionId, Strin
         return this.parser.parsePIResponse(response);
     }
 
+    /**
+     * @see PrivacyIDEA#validateCheckU2F(String, String, String, Map)
+     */
+    public PIResponse validateCheckU2F(String user, String transactionId, String signResponse)
+    {
+        return this.validateCheckU2F(user, transactionId, signResponse, Collections.emptyMap());
+    }
+
     /**
      * Sends a request to /validate/check with the data required to authenticate a U2F token.
      *
      * @param user            username
      * @param transactionId   transactionId
-     * @param u2fSignResponse the U2F Sign Response as returned from the
+     * @param u2fSignResponse the U2F Sign Response as returned from the browser
      * @return PIResponse or null if error
      */
     public PIResponse validateCheckU2F(String user, String transactionId, String u2fSignResponse,
@@ -549,7 +563,6 @@ public static class Builder
         private String serviceAccountPass = "";
         private String serviceAccountRealm = "";
         private String userAgent = "";
-        private List<Integer> pollingIntervals = Collections.singletonList(1);
         private IPILogger logger = null;
         private boolean disableLog = false;
         private IPISimpleLogger simpleLogBridge = null;
@@ -641,19 +654,6 @@ public Builder serviceRealm(String serviceAccountRealm)
             return this;
         }
 
-        /**
-         * Set the intervals at which the polling is done when using asyncPollTransaction.
-         * The last number will be repeated if the end of the list is reached.
-         *
-         * @param intervals list of integers that represent seconds
-         * @return Builder
-         */
-        public Builder pollingIntervals(List<Integer> intervals)
-        {
-            this.pollingIntervals = intervals;
-            return this;
-        }
-
         /**
          * Disable logging completely regardless of any set loggers.
          *
@@ -673,9 +673,8 @@ public PrivacyIDEA build()
             configuration.serviceAccountName = serviceAccountName;
             configuration.serviceAccountPass = serviceAccountPass;
             configuration.serviceAccountRealm = serviceAccountRealm;
-            configuration.pollingIntervals = pollingIntervals;
             configuration.disableLog = disableLog;
             return new PrivacyIDEA(configuration, logger, simpleLogBridge);
         }
     }
-}
+}

src/test/java/org/privacyidea/PILogImplementation.java

@@ -0,0 +1,28 @@
+package org.privacyidea;
+
+public class PILogImplementation implements IPILogger
+{
+    @Override
+    public void log(String message)
+    {
+        System.out.println(message);
+    }
+
+    @Override
+    public void error(String message)
+    {
+        System.out.println(message);
+    }
+
+    @Override
+    public void log(Throwable t)
+    {
+        t.printStackTrace();
+    }
+
+    @Override
+    public void error(Throwable t)
+    {
+        t.printStackTrace();
+    }
+}