#866 Backport to Jaybird 6.0.2: #834 FBManager auth plugin support

Author: mrotteveel

src/docs/asciidoc/release_notes.adoc

@@ -33,6 +33,12 @@ Changes per Jaybird 6 release.
 See also <<whats-new-in-jaybird-6>>.
 For known issues, consult <<known-issues>>.
 
+=== Jaybird 6.0.2
+
+The following was fixed or changed since Jaybird 6.0.1:
+
+* Improvement: added `authPlugins` property on `FBManager` (https://github.com/FirebirdSQL/jaybird/issues/866[#866])
+
 === Jaybird 6.0.1
 
 The following was fixed or changed since Jaybird 6.0.0:

src/main/org/firebirdsql/management/FBManager.java

@@ -42,17 +42,11 @@
  */
 public class FBManager implements FBManagerMBean {
 
-    private static final int DEFAULT_PORT = 3050;
     private static final System.Logger log = System.getLogger(FBManager.class.getName());
 
     private FbDatabaseFactory dbFactory;
-    private String host = "localhost";
-    private Integer port;
+    private final IConnectionProperties connectionProperties = new FbConnectionProperties();
     private String fileName;
-    private String userName;
-    private String password;
-    private String roleName;
-    private String enableProtocol;
     private int dialect = ISCConstants.SQL_DIALECT_CURRENT;
     private int pageSize = -1;
     private String defaultCharacterSet;
@@ -71,10 +65,11 @@ public FBManager() {
 
     public FBManager(GDSType type) {
         this.type = type;
+        connectionProperties.setType(type.toString());
     }
 
     public FBManager(String type) {
-        this.type = GDSType.getType(type);
+        this(GDSType.getType(type));
     }
 
     //Service methods
@@ -129,22 +124,22 @@ public String getName() {
 
     @Override
     public void setServer(String host) {
-        this.host = host;
+        connectionProperties.setServerName(host);
     }
 
     @Override
     public String getServer() {
-        return host;
+        return connectionProperties.getServerName();
     }
 
     @Override
     public void setPort(int port) {
-        this.port = port;
+        connectionProperties.setPortNumber(port);
     }
 
     @Override
     public int getPort() {
-        return port != null ? port : DEFAULT_PORT;
+        return connectionProperties.getPortNumber();
     }
 
     @Override
@@ -159,7 +154,7 @@ public void setFileName(String fileName) {
 
     @Override
     public String getType() {
-        return this.type.toString();
+        return type.toString();
     }
 
     @Override
@@ -171,46 +166,57 @@ public void setType(String type) {
         }
 
         this.type = gdsType;
+        connectionProperties.setType(gdsType.toString());
     }
 
     @Override
     public String getUserName() {
-        return userName;
+        return connectionProperties.getUser();
     }
 
     @Override
     public void setUserName(String userName) {
-        this.userName = userName;
+        connectionProperties.setUser(userName);
     }
 
     @Override
     public String getPassword() {
-        return password;
+        return connectionProperties.getPassword();
     }
 
     @Override
     public void setPassword(String password) {
-        this.password = password;
+        connectionProperties.setPassword(password);
     }
 
     @Override
     public String getRoleName() {
-        return roleName;
+        return connectionProperties.getRoleName();
     }
 
     @Override
     public void setRoleName(String roleName) {
-        this.roleName = roleName;
+        connectionProperties.setRoleName(roleName);
+    }
+
+    @Override
+    public String getAuthPlugins() {
+        return connectionProperties.getAuthPlugins();
+    }
+
+    @Override
+    public void setAuthPlugins(String authPlugins) {
+        connectionProperties.setAuthPlugins(authPlugins);
     }
 
     @Override
     public void setEnableProtocol(String enableProtocol) {
-        this.enableProtocol = enableProtocol;
+        connectionProperties.setEnableProtocol(enableProtocol);
     }
 
     @Override
     public String getEnableProtocol() {
-        return enableProtocol;
+        return connectionProperties.getEnableProtocol();
     }
 
     @Override
@@ -299,15 +305,16 @@ public synchronized void createDatabase(String fileName, String user, String pas
             IConnectionProperties connectionProperties = createDefaultConnectionProperties(user, password, roleName);
             connectionProperties.setDatabaseName(fileName);
             FbDatabase db = dbFactory.connect(connectionProperties);
-            db.attach();
-
-            // if forceCreate is set, drop the database correctly
-            // otherwise exit, database already exists
-            if (forceCreate)
-                db.dropDatabase();
-            else {
-                db.close();
-                return; //database exists, don't wipe it out.
+            try {
+                db.attach();
+                if (forceCreate) {
+                    db.dropDatabase();
+                } else {
+                    // database exists, don't wipe it out
+                    return;
+                }
+            } finally {
+                if (db.isAttached()) db.close();
             }
         } catch (SQLException e) {
             // we ignore it
@@ -349,8 +356,12 @@ public synchronized void dropDatabase(String fileName, String user, String passw
             IConnectionProperties connectionProperties = createDefaultConnectionProperties(user, password, roleName);
             connectionProperties.setDatabaseName(fileName);
             FbDatabase db = dbFactory.connect(connectionProperties);
-            db.attach();
-            db.dropDatabase();
+            try {
+                db.attach();
+                db.dropDatabase();
+            } finally {
+                if (db.isAttached()) db.close();
+            }
         } catch (Exception e) {
             log.log(System.Logger.Level.ERROR, "Exception dropping database", e);
             throw e;
@@ -363,23 +374,20 @@ public synchronized boolean isDatabaseExists(String fileName, String user, Strin
         try {
             IConnectionProperties connectionProperties = createDefaultConnectionProperties(user, password, null);
             connectionProperties.setDatabaseName(fileName);
-            FbDatabase db = dbFactory.connect(connectionProperties);
-            db.attach();
-            db.close();
+            try (FbDatabase db = dbFactory.connect(connectionProperties)) {
+                db.attach();
+            }
             return true;
         } catch (Exception e) {
             return false;
         }
     }
 
     private IConnectionProperties createDefaultConnectionProperties(String user, String password, String roleName) {
-        FbConnectionProperties connectionProperties = new FbConnectionProperties();
+        var connectionProperties = this.connectionProperties.asNewMutable();
         connectionProperties.setUser(user);
         connectionProperties.setPassword(password);
         connectionProperties.setRoleName(roleName);
-        connectionProperties.setServerName(getServer());
-        connectionProperties.setPortNumber(getPort());
-        connectionProperties.setEnableProtocol(getEnableProtocol());
         return connectionProperties;
     }
 

src/main/org/firebirdsql/management/FBManagerMBean.java

@@ -192,6 +192,26 @@ public interface FBManagerMBean extends AutoCloseable {
      */
     void setRoleName(String roleName);
 
+    /**
+     * Sets the authentication plugins to try.
+     * <p>
+     * Invalid names are skipped during authentication.
+     * </p>
+     *
+     * @param authPlugins
+     *         comma-separated list of authentication plugins
+     * @since 6.0.2
+     */
+    void setAuthPlugins(String authPlugins);
+
+    /**
+     * Get the list of authentication plugins to try.
+     *
+     * @return comma-separated list of authentication plugins
+     * @since 6.0.2
+     */
+    String getAuthPlugins();
+
     /**
      * @return enable protocol value (see also {@link AttachmentProperties#getEnableProtocol()}.
      * @since 6