Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-4162 init connection check username network handler param only for… #2293

Merged
merged 3 commits into from
Jan 12, 2024
+10 −2
Merged

CB-4162 init connection check username network handler param only for… #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d2e04c
CB-4162 init connection check username network handler param only for…
yagudin10 Jan 11, 2024
74666ad
Merge branch 'devel' into CB-4162-cant-save-ssl-certificates-on-the-c…
EvgeniaBzzz Jan 12, 2024
1e4f460
CB-4162 SSL secureProperties are not trimmed if is undefined
Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.jkiss.dbeaver.model.connection.DBPDriver;
import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
import org.jkiss.dbeaver.model.net.DBWHandlerType;
import org.jkiss.dbeaver.model.net.DBWNetworkHandler;
import org.jkiss.dbeaver.model.net.DBWTunnel;
import org.jkiss.dbeaver.model.net.ssh.SSHImplementation;
Expand Down Expand Up @@ -341,9 +342,12 @@ public WebConnectionInfo initConnection(

if (networkCredentials != null) {
networkCredentials.forEach(c -> {
if (CommonUtils.toBoolean(c.isSavePassword()) && !CommonUtils.isEmpty(c.getUserName())) {
if (CommonUtils.toBoolean(c.isSavePassword())) {
DBWHandlerConfiguration handlerCfg = dataSourceContainer.getConnectionConfiguration().getHandler(c.getId());
if (handlerCfg != null) {
if (handlerCfg != null &&
// check username param only for ssh config
!(CommonUtils.isEmpty(c.getUserName()) && CommonUtils.equalObjects(handlerCfg.getType(), DBWHandlerType.TUNNEL))
) {
WebDataSourceUtils.updateHandlerCredentials(handlerCfg, c);
handlerCfg.setSavePassword(true);
saveConfig[0] = true;
Expand Down
4 changes: 4 additions & 0 deletions webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ export class ConnectionSSLTabService extends Bootstrap {
private trimSSLConfig(input: NetworkHandlerConfigInput) {
const { secureProperties } = input;

if (!secureProperties) {
return;
}

if (!Object.keys(secureProperties).length) {
return;
}
Expand Down
Loading