#33849 Fix potential NPEs (#34056)

dbeaver · May 24, 2024 · 0f1cd18 · 0f1cd18
1 parent 19941f6
commit 0f1cd18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...kiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java b/...kiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
@@ -180,6 +180,7 @@ public void setClientHomeId(String clientHomeId) {
         this.clientHomeId = clientHomeId;
     }
 
+    @Nullable
     public String getHostName() {
         return hostName;
     }

diff --git a/...jkiss.dbeaver.net.ssh.sshj/src/org/jkiss/dbeaver/model/net/ssh/SSHJSessionController.java b/...jkiss.dbeaver.net.ssh.sshj/src/org/jkiss/dbeaver/model/net/ssh/SSHJSessionController.java
@@ -76,7 +76,7 @@ protected SSHClient createNewSession(
         try {
             client.connect(host.hostname(), host.port());
 
-            if (auth instanceof SSHAuthConfiguration.Password password) {
+            if (auth instanceof SSHAuthConfiguration.Password password && password.password() != null) {
                 client.authPassword(host.username(), password.password());
             } else if (auth instanceof SSHAuthConfiguration.KeyFile key) {
                 if (CommonUtils.isEmpty(key.password())) {

diff --git a/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java b/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
@@ -228,7 +228,7 @@ private static SSHPortForwardConfiguration loadPortForwardConfiguration(
 
         String sshRemoteHost = CommonUtils.toString(configuration.getProperty(SSHConstants.PROP_REMOTE_HOST));
         if (CommonUtils.isEmpty(sshRemoteHost)) {
-            sshRemoteHost = connectionInfo.getHostName();
+            sshRemoteHost = CommonUtils.notEmpty(connectionInfo.getHostName());
         }
 
         int sshRemotePort = configuration.getIntProperty(SSHConstants.PROP_REMOTE_PORT);