Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix: pre-landing review fixes
garrytanf464b06566d5
diff --git a/src/commands/doctor/checks/postgres-tls.ts b/src/commands/doctor/checks/postgres-tls.tsindex f371abb24c..101cbd7cde 100644--- a/src/commands/doctor/checks/postgres-tls.ts+++ b/src/commands/doctor/checks/postgres-tls.ts@@ -36,9 +36,10 @@ export function postgresTlsCheck(url: string, session: SessionTls | null, env: Rif (hosts.length > 0 && hosts.every(isLoopbackPgHost)) {return { name: 'postgres_tls', status: 'ok', message: 'The Postgres host is on this machine; TLS is not required.' };}- if (!session) return null;const tls = resolvePgTls(url, {}, env);- if (session.ssl) {+ const optedOut = tls.mode === 'disable';+ if (!session && !optedOut) return null;+ if (session?.ssl && !optedOut) {const unverified = tls.mode === 'require' || tls.mode === 'prefer' || tls.mode === 'allow';return {name: 'postgres_tls', status: 'ok',@@ -46,7 +47,6 @@ export function postgresTlsCheck(url: string, session: SessionTls | null, env: Rdetails: { ssl: true, version: session.version, sslmode: tls.mode },};}- const optedOut = tls.mode === 'disable';return {name: 'postgres_tls', status: 'warn',message: optedOutdiff --git a/src/core/pg-tls.ts b/src/core/pg-tls.tsindex 434053c1ad..858163e9ff 100644--- a/src/core/pg-tls.ts+++ b/src/core/pg-tls.ts@@ -75,17 +75,19 @@ export function pgConnectHosts(url: string, opts: Record<string, unknown> = {},return raw.split(',').map(stripPort).filter(Boolean);}-function urlParams(url: string): URLSearchParams {- const q = url.indexOf('?');- return new URLSearchParams(q >= 0 ? url.slice(q + 1).split('#')[0] : '');+/** The URL query as the driver reads it: the fragment dropped, and a repeated key's last value wins. */+function urlQuery(url: string): Record<string, string> {+ const withoutFragment = url.split('#')[0] ?? '';+ const q = withoutFragment.indexOf('?');+ return Object.fromEntries(new URLSearchParams(q >= 0 ? withoutFragment.slice(q + 1) : ''));}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' : '');+ const query = urlQuery(url);+ const explicit = query.sslrootcert === 'system' ? 'verify-full' : query.sslmode || query.ssl;if (explicit) return { source: 'url', mode: explicit === 'false' ? 'disable' : explicit };- if (env.PGSSL) return { source: 'env', mode: env.PGSSL };+ if (!('ssl' in query) && 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' };return { source: 'default', mode: 'require' };diff --git a/test/doctor-postgres-tls.test.ts b/test/doctor-postgres-tls.test.tsindex ae79000bd2..b2d0d0e6d6 100644--- a/test/doctor-postgres-tls.test.ts+++ b/test/doctor-postgres-tls.test.ts@@ -34,6 +34,12 @@ describe('postgres_tls doctor check', () => {expect(categorizeCheck('postgres_tls')).toBe('ops');});+ test('sslmode=disable warns even when the server reports the session encrypted (a pooler with TLS upstream)', () => {+ const c = postgresTlsCheck(REMOTE + '?sslmode=disable', { ssl: true, version: 'TLSv1.3' }, {})!;+ expect(c.status).toBe('warn');+ expect(c.message).toContain('sslmode=disable');+ });+test('a session the server reports unencrypted warns even when the URL asked for TLS (a pooler hop)', () => {const c = postgresTlsCheck(REMOTE, { ssl: false, version: null }, {})!;expect(c.status).toBe('warn');diff --git a/test/pg-tls.test.ts b/test/pg-tls.test.tsindex 43ae212477..d2097e2233 100644--- a/test/pg-tls.test.ts+++ b/test/pg-tls.test.ts@@ -99,6 +99,20 @@ describe('resolvePgTls', () => {expect(resolvePgTls(base + '?sslmode=', {}, NO_ENV).source).toBe('default');});+ test('a repeated parameter is read the way the driver reads it: the last value wins', () => {+ const base = 'postgres://u:[email protected]:5432/x';+ expect(resolvePgTls(base + '?sslmode=&sslmode=verify-full', {}, NO_ENV)).toEqual({ source: 'url', mode: 'verify-full' });+ expect(driverSsl(base + '?sslmode=&sslmode=verify-full')).toBe('verify-full');+ expect(resolvePgTls(base + '?ssl=require&ssl=', {}, NO_ENV).source).toBe('default');+ expect(driverSsl(base + '?ssl=', {}, { PGSSL: 'verify-full' })).toBe('require');+ });++ test('a query string inside the URL fragment is not a choice the driver sees', () => {+ const url = 'postgres://u:[email protected]:5432/x#?sslmode=require';+ expect(resolvePgTls(url, {}, NO_ENV).source).toBe('default');+ expect(driverSsl(url)).toBe('require');+ });+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');});