Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
381cf471
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,发现更多精彩内容 >>
提交
381cf471
编写于
1月 26, 2021
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#11119 Native tool password management enhancement (+MySQL)
Former-commit-id:
e96895d3
上级
02579848
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
34 addition
and
30 deletion
+34
-30
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
...jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
+2
-3
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tasks/PostgreNativeToolHandler.java
...beaver/ext/postgresql/tasks/PostgreNativeToolHandler.java
+1
-27
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
...s/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
+31
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
浏览文件 @
381cf471
...
...
@@ -56,9 +56,8 @@ public abstract class MySQLNativeToolHandler<SETTINGS extends AbstractNativeTool
protected
void
setupProcessParameters
(
DBRProgressMonitor
monitor
,
SETTINGS
settings
,
PROCESS_ARG
arg
,
ProcessBuilder
process
)
{
if
(!
isOverrideCredentials
(
settings
))
{
String
toolUserPassword
=
settings
.
getToolUserPassword
();
if
(
CommonUtils
.
isEmpty
(
settings
.
getToolUserName
()))
{
toolUserPassword
=
settings
.
getDataSourceContainer
().
getActualConnectionConfiguration
().
getUserPassword
();
if
(
CommonUtils
.
isEmpty
(
toolUserPassword
))
{
toolUserPassword
=
getDataSourcePassword
(
monitor
,
settings
);
}
if
(
CommonUtils
.
isNotEmpty
(
toolUserPassword
))
{
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tasks/PostgreNativeToolHandler.java
浏览文件 @
381cf471
package
org.jkiss.dbeaver.ext.postgresql.tasks
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.postgresql.PostgreConstants
;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.auth.DBAAuthCredentials
;
import
org.jkiss.dbeaver.model.auth.DBAAuthModel
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.tasks.nativetool.AbstractNativeToolHandler
;
...
...
@@ -18,7 +12,6 @@ import org.jkiss.utils.CommonUtils;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Properties
;
public
abstract
class
PostgreNativeToolHandler
<
SETTINGS
extends
AbstractNativeToolSettings
<
BASE_OBJECT
>,
BASE_OBJECT
extends
DBSObject
,
PROCESS_ARG
>
extends
AbstractNativeToolHandler
<
SETTINGS
,
BASE_OBJECT
,
PROCESS_ARG
>
{
...
...
@@ -27,26 +20,7 @@ public abstract class PostgreNativeToolHandler<SETTINGS extends AbstractNativeTo
protected
void
setupProcessParameters
(
DBRProgressMonitor
monitor
,
SETTINGS
settings
,
PROCESS_ARG
arg
,
ProcessBuilder
process
)
{
String
userPassword
=
settings
.
getToolUserPassword
();
if
(
CommonUtils
.
isEmpty
(
userPassword
))
{
// Try to obtain password thru auth model (mnakes sense for IAM-like models)
DBPDataSourceContainer
dataSourceContainer
=
settings
.
getDataSourceContainer
();
DBPConnectionConfiguration
cfg
=
new
DBPConnectionConfiguration
(
dataSourceContainer
.
getActualConnectionConfiguration
());
DBAAuthModel
authModel
=
cfg
.
getAuthModel
();
if
(
authModel
!=
AuthModelDatabaseNative
.
INSTANCE
)
{
DBAAuthCredentials
credentials
=
authModel
.
loadCredentials
(
dataSourceContainer
,
cfg
);
try
{
Properties
connProperties
=
new
Properties
();
authModel
.
initAuthentication
(
monitor
,
dataSourceContainer
.
getDataSource
(),
credentials
,
cfg
,
connProperties
);
Object
authPassword
=
connProperties
.
get
(
DBConstants
.
DATA_SOURCE_PROPERTY_PASSWORD
);
if
(
authPassword
!=
null
)
{
userPassword
=
CommonUtils
.
toString
(
authPassword
);
}
}
catch
(
DBException
e
)
{
// ignore
}
}
if
(
CommonUtils
.
isEmpty
(
userPassword
))
{
userPassword
=
dataSourceContainer
.
getActualConnectionConfiguration
().
getUserPassword
();
}
userPassword
=
getDataSourcePassword
(
monitor
,
settings
);
}
if
(!
CommonUtils
.
isEmpty
(
userPassword
))
{
process
.
environment
().
put
(
"PGPASSWORD"
,
userPassword
);
...
...
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
浏览文件 @
381cf471
...
...
@@ -4,12 +4,17 @@ import org.eclipse.core.runtime.IStatus;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.auth.DBAAuthCredentials
;
import
org.jkiss.dbeaver.model.auth.DBAAuthModel
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.connection.DBPDriver
;
import
org.jkiss.dbeaver.model.connection.DBPNativeClientLocation
;
import
org.jkiss.dbeaver.model.connection.DBPNativeClientLocationManager
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableContext
;
...
...
@@ -20,6 +25,7 @@ import org.jkiss.dbeaver.model.task.DBTTaskHandler;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.runtime.ProgressStreamReader
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.IOUtils
;
import
java.io.*
;
...
...
@@ -537,4 +543,29 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
return
GeneralUtils
.
UTF8_ENCODING
;
}
protected
String
getDataSourcePassword
(
DBRProgressMonitor
monitor
,
SETTINGS
settings
)
{
// Try to obtain password thru auth model (mnakes sense for IAM-like models)
String
userPassword
=
null
;
DBPDataSourceContainer
dataSourceContainer
=
settings
.
getDataSourceContainer
();
DBPConnectionConfiguration
cfg
=
new
DBPConnectionConfiguration
(
dataSourceContainer
.
getActualConnectionConfiguration
());
DBAAuthModel
authModel
=
cfg
.
getAuthModel
();
if
(
authModel
!=
AuthModelDatabaseNative
.
INSTANCE
)
{
DBAAuthCredentials
credentials
=
authModel
.
loadCredentials
(
dataSourceContainer
,
cfg
);
try
{
Properties
connProperties
=
new
Properties
();
authModel
.
initAuthentication
(
monitor
,
dataSourceContainer
.
getDataSource
(),
credentials
,
cfg
,
connProperties
);
Object
authPassword
=
connProperties
.
get
(
DBConstants
.
DATA_SOURCE_PROPERTY_PASSWORD
);
if
(
authPassword
!=
null
)
{
userPassword
=
CommonUtils
.
toString
(
authPassword
);
}
}
catch
(
DBException
e
)
{
// ignore
}
}
if
(
CommonUtils
.
isEmpty
(
userPassword
))
{
userPassword
=
dataSourceContainer
.
getActualConnectionConfiguration
().
getUserPassword
();
}
return
userPassword
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录