Skip to content

fix(postgres): read SSL config from nested DBeaver JSON properties #21

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

Open
hongweihao wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(postgres): read SSL config from nested DBeaver JSON properties #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/dbeaver-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,17 @@ export class DBeaverClient {
const password = connection.properties?.password || process.env.PGPASSWORD;

// SSL handling
// DBeaver's JSON config format stores driver properties under a nested `properties` key,
// and SSL handler config under `handlers.postgre_ssl`. Check all locations.
const nestedProps = (connection.properties?.['properties'] as unknown as Record<string, unknown>) || {};
const sslHandler = (connection.properties?.['handlers'] as unknown as Record<string, unknown> | undefined)?.['postgre_ssl'] as Record<string, unknown> | undefined;
const sslModeRaw =
connection.properties?.['ssl.mode'] ||
connection.properties?.['sslmode'] ||
connection.properties?.['ssl'];
connection.properties?.['ssl'] ||
nestedProps['sslmode'] ||
nestedProps['ssl'] ||
(sslHandler?.enabled ? ((sslHandler?.properties as Record<string, unknown>)?.['sslMode'] || 'require') : undefined);
const sslMode = String(sslModeRaw ?? '').toLowerCase();
const sslRootCert =
connection.properties?.['sslrootcert'] ||
Expand Down
11 changes: 10 additions & 1 deletion src/pools/connection-pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,16 @@ export class ConnectionPoolManager {

private getPostgresSslConfig(connection: DBeaverConnection): object {
const props = connection.properties || {};
const sslMode = props.sslmode || props.ssl;
// DBeaver's JSON config format stores driver properties under a nested `properties` key,
// and SSL handler config under `handlers.postgre_ssl`. Check all locations.
const nestedProps = (props.properties as unknown as Record<string, unknown>) || {};
const sslHandler = (props.handlers as unknown as Record<string, unknown> | undefined)?.['postgre_ssl'] as Record<string, unknown> | undefined;
const sslMode =
props.sslmode ||
props.ssl ||
nestedProps['sslmode'] ||
nestedProps['ssl'] ||
(sslHandler?.enabled ? ((sslHandler?.properties as Record<string, unknown>)?.['sslMode'] || 'require') : undefined);

if (sslMode === 'disable' || sslMode === 'false') {
return { ssl: false };
Expand Down