Authentication status tests (#34)

* add result->authentication to PIResponse

* fix: authentication type of AuthenticationStatus

* add tests for authenticationStatus

* update mockserver for JDK >=16

+ add dependency for bouncycastle encryption

* fix response.id

Co-authored-by: Nils Behlen <[email protected]>

Author: lukasmatusiewicz

pom.xml

@@ -62,33 +62,48 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.0</version>
+            <version>4.9.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-junit-rule</artifactId>
-            <version>5.11.1</version>
+            <version>5.12.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.6.1</version>
+            <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>

src/main/java/org/privacyidea/JSONParser.java

@@ -151,7 +151,7 @@ public PIResponse parsePIResponse(String serverResponse)
             return response;
         }
 
-        response.id = getString(obj, ID);
+        response.id = getInt(obj, ID);
         response.piVersion = getString(obj, VERSION_NUMBER);
         response.signature = getString(obj, SIGNATURE);
         response.jsonRPCVersion = getString(obj, JSONRPC);

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

@@ -22,7 +22,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static org.privacyidea.AuthenticationStatus.NONE;
 import static org.privacyidea.PIConstants.TOKEN_TYPE_PUSH;
 import static org.privacyidea.PIConstants.TOKEN_TYPE_U2F;
 import static org.privacyidea.PIConstants.TOKEN_TYPE_WEBAUTHN;
@@ -37,11 +36,11 @@ public class PIResponse
     public List<Challenge> multichallenge = new ArrayList<>();
     public String transactionID = "";
     public String serial = "";
-    public String id = "";
+    public int id = 0;
     public String jsonRPCVersion = "";
     public boolean status = false;
     public boolean value = false;
-    public AuthenticationStatus authentication = NONE;
+    public AuthenticationStatus authentication = AuthenticationStatus.NONE;
     public String piVersion = ""; // e.g. 3.2.1
     public String rawMessage = "";
     public String signature = "";

src/test/java/org/privacyidea/TestOTP.java

@@ -65,6 +65,7 @@ public void testOTPSuccess() {
                 "  \"id\": 1,\n" +
                 "  \"jsonrpc\": \"2.0\",\n" +
                 "  \"result\": {\n" +
+                "    \"authentication\": \"ACCEPT\",\n" +
                 "    \"status\": true,\n" +
                 "    \"value\": true\n" +
                 "  },\n" +
@@ -78,7 +79,7 @@ public void testOTPSuccess() {
         PIResponse response = privacyIDEA.validateCheck(username, otp);
 
         // Assert everything
-        assertEquals("1", response.id);
+        assertEquals(1, response.id);
         assertEquals("matching 1 tokens", response.message);
         assertEquals(6, response.otpLength);
         assertEquals("PISP0001C673", response.serial);
@@ -94,6 +95,7 @@ public void testOTPSuccess() {
         // result
         assertTrue(response.status);
         assertTrue(response.value);
+        assertEquals(AuthenticationStatus.ACCEPT, response.authentication);
     }
 
     @Test

src/test/java/org/privacyidea/TestWebAuthn.java

@@ -131,6 +131,7 @@ public void test() {
                                 "  \"id\": 1,\n" +
                                 "  \"jsonrpc\": \"2.0\",\n" +
                                 "  \"result\": {\n" +
+                                "    \"authentication\": \"CHALLENGE\",\n" +
                                 "    \"status\": true,\n" +
                                 "    \"value\": false\n" +
                                 "  },\n" +
@@ -142,6 +143,7 @@ public void test() {
 
         Optional<Challenge> opt = response.multiChallenge().stream().filter(challenge -> TOKEN_TYPE_WEBAUTHN.equals(challenge.getType())).findFirst();
         assertTrue(opt.isPresent());
+        assertEquals(AuthenticationStatus.CHALLENGE, response.authentication);
         Challenge a = opt.get();
         if (a instanceof WebAuthn) {
             WebAuthn b = (WebAuthn) a;