auth.Method drop down is added to the Toolbar

dzmipt · Mar 22, 2024 · 398767a · 398767a
1 parent 6c43e56
commit 398767a
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 12 deletions.
diff --git a/notes.md b/notes.md
@@ -1,3 +1,4 @@
+* Adding auth.method control to the toolbar
 * Any IO errors are added as Error tab (pop-up error message is used for internal bugs)
     * KX errors from servers are now display with ' (not as symbol)
 * Parent folder can be specified in the server form (in add and edit server)

diff --git a/src/studio/core/AuthenticationManager.java b/src/studio/core/AuthenticationManager.java
@@ -9,10 +9,7 @@
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -22,14 +19,14 @@ public class AuthenticationManager {
 
     private static AuthenticationManager instance;
     private Map classMap = new HashMap();
+    private String[] authMechanisms;
 
     public Class lookup(String authenticationMethod) {
         return (Class) classMap.get(authenticationMethod);
     }
 
     public String[] getAuthenticationMechanisms() {
-        Set s = classMap.keySet();
-        return (String[]) s.toArray(new String[0]);
+        return authMechanisms;
     }
 
     public synchronized static AuthenticationManager getInstance() {
@@ -38,6 +35,14 @@ public synchronized static AuthenticationManager getInstance() {
         return instance;
     }
 
+    private void init() {
+        List<String> auths = new ArrayList<>(classMap.keySet());
+        auths.remove(DefaultAuthenticationMechanism.NAME);
+        Collections.sort(auths);
+        auths.add(0, DefaultAuthenticationMechanism.NAME);
+        authMechanisms = auths.toArray(new String[0]);
+    }
+
     private AuthenticationManager() {
         DefaultAuthenticationMechanism dam = new DefaultAuthenticationMechanism();
         classMap.put(dam.getMechanismName(),dam.getClass());
@@ -88,5 +93,7 @@ private AuthenticationManager() {
                     log.error("Error loading plugin {}", filename, e);
                 }
             }
+
+        init();
     }
 }
diff --git a/src/studio/core/DefaultAuthenticationMechanism.java b/src/studio/core/DefaultAuthenticationMechanism.java
@@ -8,7 +8,7 @@ public class DefaultAuthenticationMechanism implements IAuthenticationMechanism
     private static final String[] PROP_NAMES = new String[]{USERNAME,PASSWORD};
     private Properties props;
 
-    public final static String NAME = "Username and password";
+    public final static String NAME = "Plain";
 
     public String getMechanismName() {
         return NAME;

diff --git a/src/studio/kdb/Config.java b/src/studio/kdb/Config.java
@@ -21,6 +21,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -98,11 +99,13 @@ public class Config extends AbstractConfig {
     private static final String CONFIG_FILENAME = "studio.properties";
     private static final String WORKSPACE_FILENAME = "workspace.properties";
 
+    private static final String OLD_DEF_AUTHMETHOD = "Username and password";
+    private static final String VERSION14 = "1.4";
     private static final String VERSION13 = "1.3";
     private static final String VERSION12 = "1.2";
     private static final String OLD_VERSION = "1.1";
 
-    private static final String VERSION = VERSION13;
+    private static final String VERSION = VERSION14;
 
 
     private PropertiesConfig workspaceConfig;
@@ -310,6 +313,32 @@ private void init() {
         initTableConnExtractor();
     }
 
+    private void upgradeTo14() {
+        log.info("Upgrading config to version 1.4");
+        String defAuth = DefaultAuthenticationMechanism.NAME;
+        if (getDefaultAuthMechanism().equals(OLD_DEF_AUTHMETHOD) ) {
+            setDefaultAuthMechanism(defAuth);
+        }
+
+        setDefaultCredentials(defAuth, getDefaultCredentials(OLD_DEF_AUTHMETHOD));
+        config.remove("auth." + OLD_DEF_AUTHMETHOD + ".user");
+        config.remove("auth." + OLD_DEF_AUTHMETHOD + ".password");
+
+        //server.1.authenticationMechanism
+        Pattern pattern = Pattern.compile("server\\.[0-9]+\\.authenticationMechanism");
+        for (String key: config.keySet().toArray(new String[0]) ) {
+            if (pattern.matcher(key).matches() ) {
+                String value = config.getProperty(key);
+                if (value.equals(OLD_DEF_AUTHMETHOD)) {
+                    config.setProperty(key, defAuth);
+                }
+            }
+        }
+
+        config.setProperty("version", VERSION);
+        save();
+    }
+
     private void upgradeTo12() {
         try {
             log.info("Found old config. Converting...");
@@ -387,6 +416,11 @@ private void checkForUpgrade() {
             config.setProperty("version", VERSION12);
         }
 
+
+        if (config.getProperty("version", VERSION).equals(VERSION13)) {
+            upgradeTo14();
+        }
+
         initServers();
         if (config.getProperty("version").equals(VERSION12)) {
             initServerHistory();
@@ -469,8 +503,11 @@ public void setLookAndFeel(String lf) {
     // host:port
     // If user and password are not found, defaults form default AuthenticationMechanism are used
     public Server getServerByConnectionString(String connectionString) {
-        String defaultAuth = getDefaultAuthMechanism();
-        return QConnection.getByConnection(connectionString, defaultAuth, getDefaultCredentials(defaultAuth), servers.values());
+        return getServerByConnectionString(connectionString, getDefaultAuthMechanism());
+    }
+
+    public Server getServerByConnectionString(String connectionString, String authMethod) {
+        return QConnection.getByConnection(connectionString, authMethod, getDefaultCredentials(authMethod), servers.values());
     }
 
     public Credentials getDefaultCredentials(String authenticationMechanism) {
@@ -655,6 +692,7 @@ public void replaceServer(Server oldServer, Server newServer) {
             log.error("Failed to add server", e);
             addServer(oldServer);
         }
+        saveAllServers();
     }
 
     private void purgeAll() {

diff --git a/src/studio/kdb/Server.java b/src/studio/kdb/Server.java
@@ -1,6 +1,7 @@
 package studio.kdb;
 
 import studio.core.Credentials;
+import studio.core.DefaultAuthenticationMechanism;
 
 import java.awt.*;
 import java.util.Collections;
@@ -10,7 +11,7 @@
 import java.util.stream.Collectors;
 
 public class Server {
-    private String authenticationMechanism;
+    private String authenticationMechanism = DefaultAuthenticationMechanism.NAME;
     private Color backgroundColor = Color.white;
     private String name = "";
     private String host = "";

diff --git a/src/studio/ui/StudioWindow.java b/src/studio/ui/StudioWindow.java
@@ -5,6 +5,7 @@
 import org.apache.logging.log4j.Logger;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
+import studio.core.AuthenticationManager;
 import studio.core.Studio;
 import studio.kdb.*;
 import studio.kdb.config.ActionOnExit;
@@ -78,6 +79,7 @@ public class StudioWindow extends JFrame implements WindowListener {
     private boolean loading = true;
 
     private JComboBox<String> comboServer;
+    private JComboBox<String> comboAuthMethod;
     private JTextField txtServer;
     private String lastQuery = null;
     private JToolBar toolbar;
@@ -1074,6 +1076,17 @@ private void showServerList(boolean selectHistory) {
     }
 
 
+    private void selectAuthMethod() {
+        Object selectedItem = comboAuthMethod.getSelectedItem();
+        String newAuthMethod =  selectedItem == null ? "" : selectedItem.toString();
+        if (editor.getServer().getAuthenticationMechanism().equals(newAuthMethod)) return;
+
+        Server server = CONFIG.getServerByConnectionString(txtServer.getText().trim(), newAuthMethod);
+        setServer(server);
+        refreshServer();
+
+    }
+
     private void selectServerName() {
         String selection = comboServer.getSelectedItem().toString();
         if(! CONFIG.getServerNames().contains(selection)) return;
@@ -1125,6 +1138,7 @@ private void refreshServer() {
         Server server = editor.getServer();
         String name = server == Server.NO_SERVER ? "" : server.getFullName();
         comboServer.setSelectedItem(name);
+        comboAuthMethod.getModel().setSelectedItem(server.getAuthenticationMechanism());
 
         refreshConnectionText();
         refreshActionState();
@@ -1140,6 +1154,9 @@ private void initToolbar() {
         // Cut the width if it is too wide.
         comboServer.setMinimumSize(new Dimension(0, 0));
 
+        comboAuthMethod = new JComboBox<>(AuthenticationManager.getInstance().getAuthenticationMechanisms());
+        comboAuthMethod.addActionListener(e->selectAuthMethod());
+
         txtServer = new JTextField(32);
         txtServer.setName("serverEntryTextField");
         txtServer.addActionListener(e -> {
@@ -1159,6 +1176,7 @@ public void focusLost(FocusEvent e) {
         toolbar.add(Box.createRigidArea(new Dimension(3,0)));
         toolbar.add(new JLabel(I18n.getString("Server")));
         toolbar.add(comboServer);
+        toolbar.add(comboAuthMethod);
         toolbar.add(txtServer);
 
         Action[] actions = new Action[] {

diff --git a/src/studio/utils/QConnection.java b/src/studio/utils/QConnection.java
@@ -46,7 +46,8 @@ public static Server getByConnection(String connection ,String defaultAuth,
         Color bgColor = Config.getInstance().getColor(Config.COLOR_BACKGROUND);
 
         for (Server s: servers) {
-            if (s.getHost().equals(host) && s.getPort() == port && s.getUsername().equals(user) && s.getPassword().equals(password)) {
+            if (s.getHost().equals(host) && s.getPort() == port && s.getUsername().equals(user) && s.getPassword().equals(password)
+                        && s.getAuthenticationMechanism().equals(auth) ) {
                 return s;
             }
         }