Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
504efb5b
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
504efb5b
编写于
3月 04, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3 PG SSL
上级
6bda4bd3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
2 deletion
+13
-2
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
...rc/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreDataSourceProvider.java
...iss/dbeaver/ext/postgresql/PostgreDataSourceProvider.java
+6
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPage.java
...kiss/dbeaver/ext/postgresql/ui/PostgreConnectionPage.java
+6
-2
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
浏览文件 @
504efb5b
...
@@ -38,6 +38,7 @@ public class PostgreConstants {
...
@@ -38,6 +38,7 @@ public class PostgreConstants {
public
static
final
String
PROP_SHOW_NON_DEFAULT_DB
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"show-non-default-db@"
;
public
static
final
String
PROP_SHOW_NON_DEFAULT_DB
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"show-non-default-db@"
;
public
static
final
String
PROP_USE_SSL
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"ssl@"
;
public
static
final
String
PROP_USE_SSL
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"ssl@"
;
public
static
final
String
PROP_SSL_NON_VALIDATING
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"ssl-non-validating@"
;
public
static
final
String
PROP_SSL_CERT
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"ssl-cert@"
;
public
static
final
String
PROP_SSL_CERT
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"ssl-cert@"
;
public
static
final
DBSEntityType
ENTITY_TYPE_SEQUENCE
=
new
DBSEntityType
(
"pg_sequence"
,
"Sequence"
,
DBIcon
.
TREE_SEQUENCE
,
true
);
public
static
final
DBSEntityType
ENTITY_TYPE_SEQUENCE
=
new
DBSEntityType
(
"pg_sequence"
,
"Sequence"
,
DBIcon
.
TREE_SEQUENCE
,
true
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreDataSourceProvider.java
浏览文件 @
504efb5b
...
@@ -79,6 +79,12 @@ public class PostgreDataSourceProvider extends JDBCDataSourceProvider {
...
@@ -79,6 +79,12 @@ public class PostgreDataSourceProvider extends JDBCDataSourceProvider {
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getDatabaseName
()))
{
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getDatabaseName
()))
{
url
.
append
(
connectionInfo
.
getDatabaseName
());
url
.
append
(
connectionInfo
.
getDatabaseName
());
}
}
if
(
CommonUtils
.
toBoolean
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_USE_SSL
)))
{
url
.
append
(
"?ssl=true"
);
if
(
CommonUtils
.
toBoolean
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_SSL_NON_VALIDATING
)))
{
url
.
append
(
"&sslfactory=org.postgresql.ssl.NonValidatingFactory"
);
}
}
return
url
.
toString
();
return
url
.
toString
();
}
}
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPage.java
浏览文件 @
504efb5b
...
@@ -52,6 +52,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -52,6 +52,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
private
Text
passwordText
;
private
Text
passwordText
;
private
ClientHomesSelector
homesSelector
;
private
ClientHomesSelector
homesSelector
;
private
Button
useSslButton
;
private
Button
useSslButton
;
private
Button
sslNonValidating
;
private
Text
sslCertText
;
private
Text
sslCertText
;
private
Button
hideNonDefault
;
private
Button
hideNonDefault
;
private
boolean
activated
=
false
;
private
boolean
activated
=
false
;
...
@@ -149,7 +150,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -149,7 +150,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
{
{
Group
secureGroup
=
new
Group
(
addrGroup
,
SWT
.
NONE
);
Group
secureGroup
=
new
Group
(
addrGroup
,
SWT
.
NONE
);
secureGroup
.
setText
(
"Se
curity
"
);
secureGroup
.
setText
(
"Se
ttings
"
);
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
.
horizontalSpan
=
4
;
gd
.
horizontalSpan
=
4
;
secureGroup
.
setLayoutData
(
gd
);
secureGroup
.
setLayoutData
(
gd
);
...
@@ -160,7 +161,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -160,7 +161,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
{
{
Group
secureGroup
=
new
Group
(
addrGroup
,
SWT
.
NONE
);
Group
secureGroup
=
new
Group
(
addrGroup
,
SWT
.
NONE
);
secureGroup
.
setText
(
"
Options
"
);
secureGroup
.
setText
(
"
SSL
"
);
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
.
horizontalSpan
=
4
;
gd
.
horizontalSpan
=
4
;
secureGroup
.
setLayoutData
(
gd
);
secureGroup
.
setLayoutData
(
gd
);
...
@@ -175,6 +176,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -175,6 +176,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
}
}
}
}
});
});
sslNonValidating
=
UIUtils
.
createLabelCheckbox
(
secureGroup
,
"Do not validate certificate"
,
true
);
//sslCertText = UIUtils.createLabelText(secureGroup, "Certificate Path", "");
//sslCertText = UIUtils.createLabelText(secureGroup, "Certificate Path", "");
}
}
...
@@ -228,6 +230,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -228,6 +230,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
final
boolean
useSSL
=
CommonUtils
.
toBoolean
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_USE_SSL
));
final
boolean
useSSL
=
CommonUtils
.
toBoolean
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_USE_SSL
));
useSslButton
.
setSelection
(
useSSL
);
useSslButton
.
setSelection
(
useSSL
);
sslNonValidating
.
setSelection
(
CommonUtils
.
toBoolean
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_SSL_NON_VALIDATING
)));
if
(
sslCertText
!=
null
)
{
if
(
sslCertText
!=
null
)
{
sslCertText
.
setText
(
CommonUtils
.
toString
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_SSL_CERT
)));
sslCertText
.
setText
(
CommonUtils
.
toString
(
connectionInfo
.
getProperty
(
PostgreConstants
.
PROP_SSL_CERT
)));
sslCertText
.
setEnabled
(
useSSL
);
sslCertText
.
setEnabled
(
useSSL
);
...
@@ -263,6 +266,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
...
@@ -263,6 +266,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
}
}
connectionInfo
.
setProperty
(
PostgreConstants
.
PROP_USE_SSL
,
useSslButton
.
getSelection
());
connectionInfo
.
setProperty
(
PostgreConstants
.
PROP_USE_SSL
,
useSslButton
.
getSelection
());
connectionInfo
.
setProperty
(
PostgreConstants
.
PROP_SSL_NON_VALIDATING
,
sslNonValidating
.
getSelection
());
connectionInfo
.
setProperty
(
PostgreConstants
.
PROP_SHOW_NON_DEFAULT_DB
,
hideNonDefault
.
getSelection
());
connectionInfo
.
setProperty
(
PostgreConstants
.
PROP_SHOW_NON_DEFAULT_DB
,
hideNonDefault
.
getSelection
());
super
.
saveSettings
(
dataSource
);
super
.
saveSettings
(
dataSource
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录