Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 2093271c 编写于 作者: S Serge Rider
浏览文件
操作

Secure storage. Saved editors opening error handler.

上级 952299c6
隐藏空白更改
内联 并排
Showing with 111 addition and 80 deletion
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @ 2093271c
......@@ -690,20 +690,24 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
private void saveSecuredPassword(XMLBuilder xml, DataSourceDescriptor dataSource, String subNode, String password) throws IOException {
boolean saved = false;
final DBASecureStorage secureStorage = getPlatform().getSecureStorage();
if (secureStorage.useSecurePreferences()) {
{
try {
ISecurePreferences prefNode = dataSource.getSecurePreferences();
if (subNode != null) {
for (String nodeName : subNode.split("/")) {
prefNode = prefNode.node(nodeName);
}
}
if (!CommonUtils.isEmpty(password)) {
prefNode.put(RegistryConstants.ATTR_PASSWORD, password, true);
if (!secureStorage.useSecurePreferences()) {
prefNode.removeNode();
} else {
prefNode.remove(RegistryConstants.ATTR_PASSWORD);
if (subNode != null) {
for (String nodeName : subNode.split("/")) {
prefNode = prefNode.node(nodeName);
}
}
if (!CommonUtils.isEmpty(password)) {
prefNode.put(RegistryConstants.ATTR_PASSWORD, password, true);
saved = true;
} else {
prefNode.remove(RegistryConstants.ATTR_PASSWORD);
}
}
saved = true;
} catch (StorageException e) {
log.error("Can't save password in secure storage", e);
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorInputFactory.java
浏览文件 @ 2093271c
......@@ -39,6 +39,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.entity.EntityEditorInput;
import org.jkiss.utils.CommonUtils;
......@@ -81,87 +82,21 @@ public class DatabaseEditorInputFactory implements IElementFactory
final String activePageId = memento.getString(TAG_ACTIVE_PAGE);
final String activeFolderId = memento.getString(TAG_ACTIVE_FOLDER);
DBPDataSourceContainer dataSourceContainer = DataSourceRegistry.findDataSource(dataSourceId);
final DBPDataSourceContainer dataSourceContainer = DataSourceRegistry.findDataSource(dataSourceId);
if (dataSourceContainer == null) {
log.error("Can't find data source '" + dataSourceId + "'"); //$NON-NLS-2$
return null;
}
final DBPDataSourceContainer dsObject = dataSourceContainer;
if (lookupEditor && !dsObject.isConnected()) {
if (lookupEditor && !dataSourceContainer.isConnected()) {
// Do not instantiate editor input if we are just looking for opened editor
//. for some object. Connection must be instantiated.
return null;
}
final IProject project = dsObject.getRegistry().getProject();
final IProject project = dataSourceContainer.getRegistry().getProject();
final DBNModel navigatorModel = DBeaverCore.getInstance().getNavigatorModel();
navigatorModel.ensureProjectLoaded(project);
DBRRunnableWithResult<IEditorInput> opener = new DBRRunnableWithResult<IEditorInput>() {
private IStatus errorStatus;
@Override
public void run(final DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException
{
DBNDataSource dsNode = null;
try {
if (!dsObject.isConnected()) {
dsObject.connect(monitor, true, true);
}
dsNode = (DBNDataSource) navigatorModel.getNodeByObject(monitor, dsObject, true);
if (dsNode != null) {
dsNode.initializeNode(monitor, new DBRProgressListener() {
@Override
public void onTaskFinished(IStatus status)
{
if (!status.isOK()) {
errorStatus = status;
return;
}
try {
final DBNNode node = navigatorModel.getNodeByPath(
monitor, project, nodePath);
if (node == null) {
throw new DBException("Node '" + nodePath + "' not found");
}
Class<?> aClass = Class.forName(inputClass);
if (aClass == ErrorEditorInput.class) {
aClass = EntityEditorInput.class;
}
Constructor<?> constructor = null;
for (Class nodeType = node.getClass(); nodeType != null; nodeType = nodeType.getSuperclass()) {
try {
constructor = aClass.getConstructor(nodeType);
break;
} catch (NoSuchMethodException e) {
// No such constructor
}
}
if (constructor != null) {
final DatabaseEditorInput input = DatabaseEditorInput.class.cast(constructor.newInstance(node));
input.setDefaultPageId(activePageId);
input.setDefaultFolderId(activeFolderId);
result = input;
} else {
throw new DBException("Can't create object instance [" + inputClass + "]");
}
} catch (Exception e) {
errorStatus = new Status(IStatus.ERROR, DBeaverCore.getCorePluginID(), e.getMessage(), e);
log.error(e);
}
}
});
}
} catch (Exception e) {
errorStatus = new Status(IStatus.ERROR, DBeaverCore.getCorePluginID(), e.getMessage(), e);
}
if (result == null && errorStatus != null) {
if (dsNode == null) {
log.error("Can't find navigator node for datasource '" + dsObject.getName() + "'");
} else {
result = new ErrorEditorInput(errorStatus, dsNode);
}
}
}
};
final EditorOpener opener = new EditorOpener(dataSourceContainer, navigatorModel, project, nodePath, inputClass, activePageId, activeFolderId);
try {
DBeaverUI.runInProgressService(opener);
} catch (InvocationTargetException e) {
......@@ -169,6 +104,14 @@ public class DatabaseEditorInputFactory implements IElementFactory
} catch (InterruptedException e) {
// ignore
}
if (opener.errorStatus != null) {
DBeaverUI.asyncExec(new Runnable() {
@Override
public void run() {
UIUtils.showErrorDialog(null, "Editor open", "Can't open saved editor of '" + dataSourceContainer.getName() + "'\nNode path=" + nodePath, opener.errorStatus);
}
});
}
return opener.getResult();
}
......@@ -198,4 +141,88 @@ public class DatabaseEditorInputFactory implements IElementFactory
}
}
private static class EditorOpener extends DBRRunnableWithResult<IEditorInput> {
private final DBPDataSourceContainer dataSource;
private final DBNModel navigatorModel;
private final IProject project;
private final String nodePath;
private final String inputClass;
private final String activePageId;
private final String activeFolderId;
private IStatus errorStatus;
public EditorOpener(DBPDataSourceContainer dataSource, DBNModel navigatorModel, IProject project, String nodePath, String inputClass, String activePageId, String activeFolderId) {
this.dataSource = dataSource;
this.navigatorModel = navigatorModel;
this.project = project;
this.nodePath = nodePath;
this.inputClass = inputClass;
this.activePageId = activePageId;
this.activeFolderId = activeFolderId;
}
@Override
public void run(final DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException
{
DBNDataSource dsNode = null;
try {
if (!dataSource.isConnected()) {
dataSource.connect(monitor, true, true);
}
dsNode = (DBNDataSource) navigatorModel.getNodeByObject(monitor, dataSource, true);
if (dsNode != null) {
dsNode.initializeNode(monitor, new DBRProgressListener() {
@Override
public void onTaskFinished(IStatus status)
{
if (!status.isOK()) {
errorStatus = status;
return;
}
try {
final DBNNode node = navigatorModel.getNodeByPath(
monitor, project, nodePath);
if (node == null) {
throw new DBException("Node '" + nodePath + "' not found");
}
Class<?> aClass = Class.forName(inputClass);
if (aClass == ErrorEditorInput.class) {
aClass = EntityEditorInput.class;
}
Constructor<?> constructor = null;
for (Class nodeType = node.getClass(); nodeType != null; nodeType = nodeType.getSuperclass()) {
try {
constructor = aClass.getConstructor(nodeType);
break;
} catch (NoSuchMethodException e) {
// No such constructor
}
}
if (constructor != null) {
final DatabaseEditorInput input = DatabaseEditorInput.class.cast(constructor.newInstance(node));
input.setDefaultPageId(activePageId);
input.setDefaultFolderId(activeFolderId);
result = input;
} else {
throw new DBException("Can't create object instance [" + inputClass + "]");
}
} catch (Exception e) {
errorStatus = new Status(IStatus.ERROR, DBeaverCore.getCorePluginID(), e.getMessage(), e);
log.error(e);
}
}
});
}
} catch (Exception e) {
errorStatus = new Status(IStatus.ERROR, DBeaverCore.getCorePluginID(), e.getMessage(), e);
}
if (result == null && errorStatus != null) {
if (dsNode == null) {
log.error("Can't find navigator node for datasource '" + dataSource.getName() + "'");
} else {
result = new ErrorEditorInput(errorStatus, dsNode);
}
}
}
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或