Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
09eb7505
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
09eb7505
编写于
5月 22, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3508 SSH tunnel test
上级
336370e9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
87 addition
and
0 deletion
+87
-0
plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementationJsch.java
...rg/jkiss/dbeaver/model/net/ssh/SSHImplementationJsch.java
+10
-0
plugins/org.jkiss.dbeaver.net.ssh.sshj/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementationSshj.java
...rg/jkiss/dbeaver/model/net/ssh/SSHImplementationSshj.java
+10
-0
plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
...org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
+59
-0
plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementation.java
...rc/org/jkiss/dbeaver/model/net/ssh/SSHImplementation.java
+4
-0
plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
...sh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
+4
-0
未找到文件。
plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementationJsch.java
浏览文件 @
09eb7505
...
...
@@ -92,6 +92,16 @@ public class SSHImplementationJsch extends SSHImplementationAbstract {
}
}
@Override
public
String
getClientVersion
()
{
return
session
==
null
?
null
:
session
.
getClientVersion
();
}
@Override
public
String
getServerVersion
()
{
return
session
==
null
?
null
:
session
.
getServerVersion
();
}
@Override
public
void
invalidateTunnel
(
DBRProgressMonitor
monitor
)
throws
DBException
,
IOException
{
boolean
isAlive
=
session
!=
null
&&
session
.
isConnected
();
...
...
plugins/org.jkiss.dbeaver.net.ssh.sshj/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementationSshj.java
浏览文件 @
09eb7505
...
...
@@ -106,6 +106,16 @@ public class SSHImplementationSshj extends SSHImplementationAbstract {
}
}
@Override
public
String
getClientVersion
()
{
return
sshClient
==
null
?
null
:
sshClient
.
getTransport
().
getClientVersion
();
}
@Override
public
String
getServerVersion
()
{
return
sshClient
==
null
?
null
:
sshClient
.
getTransport
().
getServerVersion
();
}
@Override
public
void
invalidateTunnel
(
DBRProgressMonitor
monitor
)
throws
DBException
,
IOException
{
boolean
isAlive
=
sshClient
!=
null
&&
sshClient
.
isConnected
();
...
...
plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
浏览文件 @
09eb7505
...
...
@@ -16,23 +16,31 @@
*/
package
org.jkiss.dbeaver.ui.net.ssh
;
import
org.eclipse.jface.dialogs.MessageDialog
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.layout.GridLayout
;
import
org.eclipse.swt.widgets.*
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.net.DBWHandlerConfiguration
;
import
org.jkiss.dbeaver.model.net.ssh.SSHConstants
;
import
org.jkiss.dbeaver.model.net.ssh.SSHTunnelImpl
;
import
org.jkiss.dbeaver.model.net.ssh.registry.SSHImplementationDescriptor
;
import
org.jkiss.dbeaver.model.net.ssh.registry.SSHImplementationRegistry
;
import
org.jkiss.dbeaver.runtime.ui.DBUserInterface
;
import
org.jkiss.dbeaver.ui.IObjectPropertyConfigurator
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.TextWithOpen
;
import
org.jkiss.dbeaver.ui.controls.TextWithOpenFile
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.Map
;
/**
...
...
@@ -40,6 +48,8 @@ import java.util.Map;
*/
public
class
SSHTunnelConfiguratorUI
implements
IObjectPropertyConfigurator
<
DBWHandlerConfiguration
>
{
private
DBWHandlerConfiguration
savedConfiguration
;
private
Text
hostText
;
private
Spinner
portText
;
private
Text
userNameText
;
...
...
@@ -107,6 +117,13 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBWH
tunnelTimeout
=
UIUtils
.
createLabelSpinner
(
advancedGroup
,
SSHUIMessages
.
model_ssh_configurator_label_tunnel_timeout
,
SSHConstants
.
DEFAULT_CONNECT_TIMEOUT
,
0
,
300000
);
}
Button
testButton
=
UIUtils
.
createPushButton
(
composite
,
"Test runnel configuration"
,
null
,
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
testTunnelConnection
();
}
});
authMethodCombo
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
...
...
@@ -117,6 +134,46 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBWH
}
private
void
testTunnelConnection
()
{
DBWHandlerConfiguration
configuration
=
new
DBWHandlerConfiguration
(
savedConfiguration
);
saveSettings
(
configuration
);
try
{
final
String
[]
tunnelVersions
=
new
String
[
2
];
DBeaverUI
.
runInProgressDialog
(
monitor
->
{
monitor
.
beginTask
(
"Instantiate SSH tunnel"
,
2
);
SSHTunnelImpl
tunnel
=
new
SSHTunnelImpl
();
DBPConnectionConfiguration
connectionConfig
=
new
DBPConnectionConfiguration
();
connectionConfig
.
setHostName
(
"localhost"
);
connectionConfig
.
setHostPort
(
configuration
.
getProperties
().
get
(
SSHConstants
.
PROP_PORT
));
try
{
monitor
.
subTask
(
"Initialize tunnel"
);
tunnel
.
initializeTunnel
(
monitor
,
DBeaverCore
.
getInstance
(),
configuration
,
connectionConfig
);
monitor
.
worked
(
1
);
// Get info
tunnelVersions
[
0
]
=
tunnel
.
getImplementation
().
getClientVersion
();
tunnelVersions
[
1
]
=
tunnel
.
getImplementation
().
getServerVersion
();
// Close it
monitor
.
subTask
(
"Close tunnel"
);
tunnel
.
closeTunnel
(
monitor
);
monitor
.
worked
(
1
);
}
catch
(
Exception
e
)
{
throw
new
InvocationTargetException
(
e
);
}
monitor
.
done
();
});
MessageDialog
.
openInformation
(
hostText
.
getShell
(),
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_success
,
"Connected!\n\nClient version: "
+
tunnelVersions
[
0
]
+
"\nServer version: "
+
tunnelVersions
[
1
]);
}
catch
(
InvocationTargetException
ex
)
{
DBUserInterface
.
getInstance
().
showError
(
CoreMessages
.
dialog_connection_wizard_start_dialog_error_title
,
null
,
GeneralUtils
.
makeExceptionStatus
(
ex
.
getTargetException
()));
}
}
@Override
public
void
loadSettings
(
DBWHandlerConfiguration
configuration
)
{
...
...
@@ -163,6 +220,8 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBWH
tunnelTimeout
.
setSelection
(
CommonUtils
.
toInt
(
timeoutString
));
}
updatePrivateKeyVisibility
();
savedConfiguration
=
new
DBWHandlerConfiguration
(
configuration
);
}
@Override
...
...
plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHImplementation.java
浏览文件 @
09eb7505
...
...
@@ -32,6 +32,10 @@ public interface SSHImplementation {
DBPConnectionConfiguration
initTunnel
(
DBRProgressMonitor
monitor
,
DBPPlatform
platform
,
DBWHandlerConfiguration
configuration
,
DBPConnectionConfiguration
connectionInfo
)
throws
DBException
,
IOException
;
String
getClientVersion
();
String
getServerVersion
();
void
invalidateTunnel
(
DBRProgressMonitor
monitor
)
throws
DBException
,
IOException
;
...
...
plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
浏览文件 @
09eb7505
...
...
@@ -43,6 +43,10 @@ public class SSHTunnelImpl implements DBWTunnel {
private
SSHImplementation
implementation
;
public
SSHImplementation
getImplementation
()
{
return
implementation
;
}
@Override
public
DBPConnectionConfiguration
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBPPlatform
platform
,
DBWHandlerConfiguration
configuration
,
DBPConnectionConfiguration
connectionInfo
)
throws
DBException
,
IOException
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录