fix(oci): harden endpoint and error validation

Author: BillLeoutsakosvl346

apps/sim/lib/internal/oci/client.server.test.ts

@@ -210,6 +210,34 @@ describe('OCI request client', () => {
     expect((failure as OciRequestError).opcRequestId).toBe('request-502')
   })
 
+  it('redacts authorization material embedded in a serialized JSON message', async () => {
+    const echoedAuthorization =
+      'Signature version="1",keyId="tenant/user/fingerprint",headers="(request-target) host x-date",signature="provider-echo"'
+    secureFetchMock.mockResolvedValueOnce(
+      secureResponse({
+        ok: false,
+        status: 401,
+        body: JSON.stringify({
+          code: 'NotAuthenticated',
+          message: JSON.stringify({ authorization: echoedAuthorization }),
+        }),
+      })
+    )
+    const failure = await sendOciRequest({
+      destination,
+      credentials,
+      method: 'GET',
+      encodedPath: '/n/',
+      timeout: 10_000,
+      maxResponseBytes: 65_536,
+    }).catch((error: unknown) => error)
+    expect(failure).toBeInstanceOf(OciRequestError)
+    expect((failure as Error).message).toContain('[redacted]')
+    expect((failure as Error).message).not.toContain('provider-echo')
+    expect((failure as Error).message).not.toContain('(request-target)')
+    expect((failure as Error).message).not.toContain('tenant/user/fingerprint')
+  })
+
   it.each([
     '//attacker.example/path',
     '/safe//attacker',

apps/sim/lib/internal/oci/endpoints.test.ts

@@ -6,6 +6,7 @@ import {
   getOciRegion,
   isObjectStorageOciHostname,
   OCI_REGION_IDS,
+  type OciServiceHostnamePredicate,
   objectStorageOciDestination,
   objectStorageOciHostname,
   resolveEffectiveOciRegion,
@@ -27,6 +28,7 @@ describe('OCI region registry', () => {
   it('normalizes known regions and fails closed for unknown regions', () => {
     expect(getOciRegion('  US-ASHBURN-1 ').id).toBe('us-ashburn-1')
     expect(() => getOciRegion('moon-base-1')).toThrow('not recognized')
+    expect(() => getOciRegion('constructor')).toThrow('not recognized')
   })
 
   it('allows only same-realm effective-region overrides', () => {
@@ -105,6 +107,19 @@ describe('validateOciDestination', () => {
     ).toThrow('not owned')
   })
 
+  it('rejects a bracketed IPv6 literal before applying the service predicate', () => {
+    const acceptsEveryHostname = (() => true) as OciServiceHostnamePredicate
+    expect(() =>
+      validateOciDestination({
+        origin: 'https://[2606:4700::1111]',
+        service: 'objectstorage',
+        region,
+        provenance: 'static',
+        isServiceHostname: acceptsEveryHostname,
+      })
+    ).toThrow('exact HTTPS origin')
+  })
+
   it('rejects a forged region-to-realm association', () => {
     expect(() =>
       validateOciDestination({

apps/sim/lib/internal/oci/endpoints.ts

@@ -1,4 +1,4 @@
-import { isIpLiteral } from '@sim/security/ssrf'
+import { isIpLiteral, unwrapIpv6Brackets } from '@sim/security/ssrf'
 
 export type OciDestinationProvenance = 'static' | 'authenticated-discovery'
 
@@ -160,7 +160,9 @@ function normalizeRegionId(regionId: string): string {
 
 export function getOciRegion(regionId: string): OciRegion {
   const normalized = normalizeRegionId(regionId)
-  const realmId = REGION_REALMS[normalized as keyof typeof REGION_REALMS]
+  const realmId = Object.hasOwn(REGION_REALMS, normalized)
+    ? REGION_REALMS[normalized as keyof typeof REGION_REALMS]
+    : undefined
   if (!realmId) throw new Error('OCI region is not recognized')
   return {
     id: normalized,
@@ -211,7 +213,7 @@ export function validateOciDestination(params: {
     url.pathname !== '/' ||
     url.search !== '' ||
     url.hash !== '' ||
-    isIpLiteral(url.hostname) ||
+    isIpLiteral(unwrapIpv6Brackets(url.hostname)) ||
     url.origin !== params.origin
   ) {
     throw new Error('OCI destination must be an exact HTTPS origin with the default port')

apps/sim/lib/internal/oci/errors.ts

@@ -1,11 +1,58 @@
 const MAX_OCI_ERROR_FIELD_LENGTH = 1024
+const MAX_OCI_ERROR_INPUT_LENGTH = 8192
+const MAX_NESTED_JSON_DEPTH = 3
+const SENSITIVE_JSON_FIELDS = new Set([
+  'authorization',
+  'passphrase',
+  'privatekey',
+  'proxyauthorization',
+  'signingstring',
+])
+
+function flattenJsonDiagnostic(value: unknown, depth = 0): string | undefined {
+  if (depth > MAX_NESTED_JSON_DEPTH || value === null) return undefined
+  if (typeof value === 'string') return value
+  if (typeof value === 'number' || typeof value === 'boolean') return String(value)
+  if (Array.isArray(value)) {
+    return value
+      .map((entry) => flattenJsonDiagnostic(entry, depth + 1))
+      .filter((entry): entry is string => entry !== undefined)
+      .join(' ')
+  }
+  if (typeof value !== 'object') return undefined
+  return Object.entries(value)
+    .map(([key, entry]) => {
+      const normalizedKey = key.replace(/[^a-z]/gi, '').toLowerCase()
+      if (SENSITIVE_JSON_FIELDS.has(normalizedKey)) return `${key}: [redacted]`
+      const flattened = flattenJsonDiagnostic(entry, depth + 1)
+      return flattened === undefined ? undefined : `${key}: ${flattened}`
+    })
+    .filter((entry): entry is string => entry !== undefined)
+    .join(' ')
+}
+
+function decodeNestedJsonDiagnostic(value: string): string {
+  let decoded = value.slice(0, MAX_OCI_ERROR_INPUT_LENGTH)
+  for (let depth = 0; depth < MAX_NESTED_JSON_DEPTH; depth += 1) {
+    let parsed: unknown
+    try {
+      parsed = JSON.parse(decoded)
+    } catch {
+      break
+    }
+    const flattened = flattenJsonDiagnostic(parsed)
+    if (flattened === undefined || flattened === decoded) break
+    decoded = flattened.slice(0, MAX_OCI_ERROR_INPUT_LENGTH)
+  }
+  return decoded
+}
 
 function sanitizeOciErrorField(
   value: unknown,
   sensitiveValues: readonly string[] = []
 ): string | undefined {
   if (typeof value !== 'string') return undefined
-  let sanitized = value
+  let sanitized = decodeNestedJsonDiagnostic(value)
     .replace(/-----BEGIN[\s\S]*/gi, '[redacted-key]')
     .replace(/https?:\/\/[^\s"']+/gi, '[redacted-url]')
     .replace(/Signature\s+version="1",[^\r\n]*/gi, '[redacted-authorization]')