Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions src/config/__tests__/toml-loader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ describe('TOML Configuration Tests', () => {
// Ignore cleanup errors
}
process.argv = originalArgv;
vi.unstubAllEnvs();
});

describe('loadTomlConfig', () => {
Expand Down Expand Up @@ -562,6 +563,22 @@ sslmode = "invalid"
expect(() => loadTomlConfig()).toThrow("invalid sslmode 'invalid'");
});

it.each([
['literal', '', 'disable'],
['environment', '${TEST_SSLMODE}', 'require'],
])('should reject an empty %s sslmode before DSN fallback', (_name, sslmode, dsnSslmode) => {
vi.stubEnv('TEST_SSLMODE', '');
const tomlContent = `
[[sources]]
id = "test_db"
dsn = "postgres://fakeuser:fakepass@localhost:5432/testdb?sslmode=${dsnSslmode}"
sslmode = "${sslmode}"
`;
fs.writeFileSync(path.join(tempDir, 'dbhub.toml'), tomlContent);

expect(() => loadTomlConfig()).toThrow("invalid sslmode ''");
});

it('should throw error when DSN sslmode conflicts with sslmode field', () => {
const tomlContent = `
[[sources]]
Expand Down
2 changes: 1 addition & 1 deletion src/config/toml-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ function processSourceConfigs(
try {
const url = new SafeURL(processed.dsn);
const dsnSslmode = url.getSearchParam("sslmode");
if (!processed.sslmode && dsnSslmode) {
if (processed.sslmode === undefined && dsnSslmode) {
processed.sslmode = dsnSslmode as SourceConfig["sslmode"];
}
for (const field of ["sslrootcert", "sslcert", "sslkey"] as const) {
Expand Down
Loading