Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix: pre-landing review fixes
garrytanbbdf4706f732
diff --git a/src/core/pg-tls.ts b/src/core/pg-tls.tsindex 2dcb55cdbf..434053c1ad 100644--- a/src/core/pg-tls.ts+++ b/src/core/pg-tls.ts@@ -83,8 +83,8 @@ function urlParams(url: string): URLSearchParams {export function resolvePgTls(url: string, opts: Record<string, unknown> = {}, env: Env = processEnv()): PgTlsResolution {if ('ssl' in opts && opts.ssl !== undefined) return { source: 'option', mode: typeof opts.ssl === 'string' ? opts.ssl : String(opts.ssl === false ? 'disable' : 'custom') };const params = urlParams(url);- const explicit = params.get('sslmode') ?? params.get('ssl') ?? (params.get('sslrootcert') === 'system' ? 'verify-full' : null);- if (explicit !== null) return { source: 'url', mode: explicit === 'false' ? 'disable' : explicit };+ const explicit = params.get('sslmode') || params.get('ssl') || (params.get('sslrootcert') === 'system' ? 'verify-full' : '');+ if (explicit) return { source: 'url', mode: explicit === 'false' ? 'disable' : explicit };if (env.PGSSL) return { source: 'env', mode: env.PGSSL };const hosts = pgConnectHosts(url, opts, env);if (hosts.length > 0 && hosts.every(isLoopbackPgHost)) return { source: 'loopback', mode: 'driver-default' };diff --git a/test/pg-tls.test.ts b/test/pg-tls.test.tsindex fdb1f54c79..43ae212477 100644--- a/test/pg-tls.test.ts+++ b/test/pg-tls.test.ts@@ -92,6 +92,13 @@ describe('resolvePgTls', () => {expect(driverSsl(base + '?sslrootcert=system')).toBe('verify-full');});+ test('an empty ssl or sslmode value is no choice: the TLS default still applies', () => {+ const base = 'postgres://u:[email protected]:5432/x';+ expect(resolvePgTls(base + '?ssl=', {}, NO_ENV).source).toBe('default');+ expect(driverSsl(base + '?ssl=')).toBe('require');+ expect(resolvePgTls(base + '?sslmode=', {}, NO_ENV).source).toBe('default');+ });+test('an explicit mode on a loopback URL is never weakened', () => {expect(driverSsl('postgres://u:p@localhost:5432/x?sslmode=verify-full')).toBe('verify-full');});