added functions to get messages for triggered token

Author: nilsbehlen

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

@@ -27,6 +27,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -60,7 +61,7 @@
 class Endpoint {
 
     private final PrivacyIDEA privacyIDEA;
-    private List<String> logExcludedEndpointPrints = Collections.emptyList(); //Arrays.asList(PIConstants.ENDPOINT_AUTH, PIConstants.ENDPOINT_POLLTRANSACTION); //
+    private List<String> logExcludedEndpointPrints = Arrays.asList(PIConstants.ENDPOINT_AUTH, PIConstants.ENDPOINT_POLLTRANSACTION); //Collections.emptyList(); //
     private final PIConfig piconfig;
     private final OkHttpClient client;
 

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

@@ -24,6 +24,7 @@
 import com.google.gson.JsonSyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import static org.privacyidea.PIConstants.ATTRIBUTES;
@@ -40,6 +41,7 @@
 import static org.privacyidea.PIConstants.SERIAL;
 import static org.privacyidea.PIConstants.SIGNATURE;
 import static org.privacyidea.PIConstants.STATUS;
+import static org.privacyidea.PIConstants.TOKEN_TYPE_PUSH;
 import static org.privacyidea.PIConstants.TOKEN_TYPE_WEBAUTHN;
 import static org.privacyidea.PIConstants.TRANSACTION_ID;
 import static org.privacyidea.PIConstants.TYPE;
@@ -193,6 +195,45 @@ public String getMessage() {
         return message;
     }
 
+    public boolean isPushAvailable() {
+        return multichallenge.stream().anyMatch(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
+    }
+
+    /**
+     * Get the messages of all triggered push challenges reduced to a string to show on the push UI.
+     *
+     * @return messages of all push challenges combined
+     */
+    public String getPushMessage() {
+        return reduceChallengeMessagesWhere(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
+    }
+
+    /**
+     * Get the messages of all token that require an input field (HOTP, TOTP, SMS, Email...) reduced to a single string
+     * to show with the input field.
+     *
+     * @return message string
+     */
+    public String getOTPMessage() {
+        // Any challenge that is not WebAuthn or Push is considered OTP
+        return reduceChallengeMessagesWhere(c -> !(TOKEN_TYPE_WEBAUTHN.equals(c.getType())) && !(TOKEN_TYPE_PUSH.equals(c.getType())));
+    }
+
+    private String reduceChallengeMessagesWhere(Predicate<Challenge> predicate) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(multichallenge
+                .stream()
+                .filter(predicate)
+                .map(Challenge::getMessage)
+                .reduce("", (a, s) -> a + s + ", ").trim());
+
+        if (sb.length() > 0) {
+            sb.deleteCharAt(sb.length() - 1);
+        }
+
+        return sb.toString();
+    }
+
     /**
      * @return list of token types that were triggered or an empty list
      */
@@ -214,6 +255,21 @@ public List<Challenge> getMultiChallenge() {
         return multichallenge;
     }
 
+    /**
+     * Get all WebAuthn challenges from the multi_challenge.
+     *
+     * @return List of WebAuthn objects or empty list
+     */
+    public List<WebAuthn> getWebAuthnSignRequests() {
+        List<WebAuthn> ret = new ArrayList<>();
+        multichallenge.stream().filter(c -> TOKEN_TYPE_WEBAUTHN.equals(c.getType())).collect(Collectors.toList()).forEach(c -> {
+            if (c instanceof WebAuthn) {
+                ret.add((WebAuthn) c);
+            }
+        });
+        return ret;
+    }
+
     /**
      * @return the transaction id that was triggered or an empty string if nothing was triggered
      */
@@ -268,7 +324,7 @@ public String getType() {
         return type;
     }
 
-    public int getOTPlength() {
+    public int getOTPLength() {
         return otplen;
     }
 

src/main/java/org/privacyidea/WebAuthn.java

@@ -20,19 +20,19 @@
 
 public class WebAuthn extends Challenge {
 
-    private final List<String> attributes = new ArrayList<>();
     private final String signRequest;
 
     public WebAuthn(String serial, String message, String transaction_id, String signRequest) {
         super(serial, message, transaction_id, PIConstants.TOKEN_TYPE_WEBAUTHN);
         this.signRequest = signRequest;
     }
 
-    public List<String> getAttributes() {
-        return attributes;
-    }
-
-
+    /**
+     * Returns the WebAuthnSignRequest in JSON format as a string, ready to use with pi-webauthn.js.
+     * If this returns an empty string, it *might* indicate that the PIN of this token should be changed.
+     *
+     * @return sign request or empty string
+     */
     public String getSignRequest() {
         return signRequest;
     }

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

@@ -76,7 +76,7 @@ public void testOTPSuccess() {
         // Assert everything
         assertEquals("1", response.getID());
         assertEquals("matching 1 tokens", response.getMessage());
-        assertEquals(6, response.getOTPlength());
+        assertEquals(6, response.getOTPLength());
         assertEquals("PISP0001C673", response.getSerial());
         //assertEquals("140536383567616", response.getThreadID());
         //assertEquals("1589276995.4397042", response.getTime());