From e6cbdfad883dbba5fb5d4399681ebae818b8813f Mon Sep 17 00:00:00 2001
From: Henri Manson <h.manson@aal-audio.com>
Date: Sat, 7 Nov 2020 18:01:13 +0100
Subject: [PATCH] use realm from sasl, login dialog called before
 Sasl.createSaslClient

---
 app/sasl_win.bat                              |  2 +-
 app/src/main/java/nl/mansoft/sasl/Client.java | 44 +++++++++++++------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/app/sasl_win.bat b/app/sasl_win.bat
index a3995e7..8528fd4 100644
--- a/app/sasl_win.bat
+++ b/app/sasl_win.bat
@@ -1,6 +1,6 @@
 @echo off
 
-goto browser-client
+REM goto browser-client
 
 :java-client
 echo starting SaslJavaClient > plugin.log
diff --git a/app/src/main/java/nl/mansoft/sasl/Client.java b/app/src/main/java/nl/mansoft/sasl/Client.java
index 20cfece..6a36688 100644
--- a/app/src/main/java/nl/mansoft/sasl/Client.java
+++ b/app/src/main/java/nl/mansoft/sasl/Client.java
@@ -5,8 +5,6 @@
  */
 package nl.mansoft.sasl;
 
-import java.io.BufferedWriter;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Base64;
@@ -47,19 +45,13 @@
 
 public class Client extends Application {
     private Dialog<Pair<String, String>> dialog;
+    private String authorizationId;
     private String password;
 
     public void processCallbacks(Callback[] callbacks) {
         for (Callback callback : callbacks) {
             if (callback instanceof NameCallback) {
                 NameCallback nameCallback = (NameCallback) callback;
-                Optional<Pair<String, String>> result = dialog.showAndWait();
-                result.ifPresent(usernamePassword -> {
-                    //System.out.println("Username=" + usernamePassword.getKey() + ", Password=" + usernamePassword.getValue());
-                    nameCallback.setName(usernamePassword.getKey());
-                    password = usernamePassword.getValue();
-                });
-
                 nameCallback.setName(nameCallback.getDefaultName());
             } else if (callback instanceof PasswordCallback) {
                 PasswordCallback passwordCallback = (PasswordCallback) callback;
@@ -76,6 +68,11 @@ public static String jsonGetString(JsonObject jsonObject, String name) {
         return jsonString == null ? null : jsonString.getString();
     }
 
+    public static JsonObject jsonGetObject(JsonObject jsonObject, String name) {
+        JsonObject jsonObjectOut = jsonObject.getJsonObject(name);
+        return  jsonObjectOut;
+    }
+
     public static boolean addString(JsonObjectBuilder builder, JsonObject jsonObject, String name) {
         String value = jsonGetString(jsonObject, name);
         boolean result = value != null;
@@ -85,6 +82,15 @@ public static boolean addString(JsonObjectBuilder builder, JsonObject jsonObject
         return result;
     }
 
+    public static boolean addObject(JsonObjectBuilder builder, JsonObject jsonObject, String name) {
+        JsonObject value = jsonGetObject(jsonObject, name);
+        boolean result = value != null;
+        if (result) {
+            builder.add(name, value);
+        }
+        return result;
+    }
+
     public static void printArgs(PrintWriter logwriter, String[] args) {
         if (args.length == 0) {
             System.err.println("No arguments");
@@ -103,7 +109,6 @@ private void createDialog() {
 // Create the custom dialog.
         dialog = new Dialog<>();
         dialog.setTitle("Login Dialog");
-        dialog.setHeaderText("Look, a Custom Login Dialog");
 
 // Set the icon (must be included in the project).
 //dialog.setGraphic(new ImageView(this.getClass().getResource("login.png").toString()));
@@ -154,22 +159,31 @@ private void createDialog() {
     public void start(Stage primaryStage) {
         try {
             System.err.println("STARTING");
-            //printArgs(logwriter, args);
             createDialog();
-
             JsonObject inputJson;
             String mechanism = "DIGEST-MD5";
             SaslClient sc = null;
             NativeMessaging nativeMessaging = new NativeMessaging();
             while ((inputJson = nativeMessaging.readMessage()) != null) {
                 System.err.println(inputJson);
+                String realm = jsonGetString(inputJson, "realm");
                 if (!inputJson.containsKey("s2s")) {
                     System.err.println("no realm, creating SASL client");
                     if (sc != null) {
                         System.err.println("disposing previous SASL client");
                         sc.dispose();
                     }
-                    sc = Sasl.createSaslClient(new String[] { mechanism }, "henri", "http", "test-realm.nl", null, new CallbackHandler() {
+
+                    dialog.setHeaderText(realm);
+
+                    Optional<Pair<String, String>> result = dialog.showAndWait();
+                    result.ifPresent(usernamePassword -> {
+                        System.err.println("Username=" + usernamePassword.getKey() + ", Password=" + usernamePassword.getValue());
+                        authorizationId = usernamePassword.getKey();
+                        password = usernamePassword.getValue();
+                    });
+
+                    sc = Sasl.createSaslClient(new String[] { mechanism }, authorizationId, "http", realm, null, new CallbackHandler() {
                         @Override
                         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                             processCallbacks(callbacks);
@@ -179,7 +193,9 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallback
                 JsonBuilderFactory factory = Json.createBuilderFactory(null);
                 JsonObjectBuilder outputJsonBuilder = factory.createObjectBuilder()
                     .add("mech", "DIGEST-MD5");
-                addString(outputJsonBuilder, inputJson, "realm");
+                outputJsonBuilder.add("realm", realm);
+                addString(outputJsonBuilder, inputJson, "requestId");
+                addObject(outputJsonBuilder, inputJson, "extraInfoSpec");
                 addString(outputJsonBuilder, inputJson, "s2s");
                 String s2cBase64 = jsonGetString(inputJson, "s2c");
                 if (s2cBase64 != null) {