From b049cd24b2d6cbab7bff6e0eaf33039afeb94b05 Mon Sep 17 00:00:00 2001 From: jurgen Date: Wed, 18 Dec 2013 16:18:31 +0000 Subject: [PATCH] SSH tunnel preferred auth option added --- docs/todo.txt | 3 +-- .../src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/todo.txt b/docs/todo.txt index b8db142e21..19b2f8823c 100644 --- a/docs/todo.txt +++ b/docs/todo.txt @@ -1,7 +1,6 @@ Major: -S/DB selector combo works as crap -Multiple tabs - tab removed after execute +error: S/DB selector combo works as crap SOCKS proxy, HTTP proxy 1. Browse data by foreign keys diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java index a78641fe9c..0f88a9fc20 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java @@ -119,6 +119,8 @@ public class SSHTunnelImpl implements DBWTunnel { session = jsch.getSession(sshUser, sshHost, sshPortNum); session.setConfig("StrictHostKeyChecking", "no"); + session.setConfig("PreferredAuthentications", + privKeyFile != null ? "publickey" : "password"); session.setUserInfo(ui); session.connect(); try { -- GitLab