@voxgig/sdkgen 4.32.1 → 4.34.0

package/project/.sdk/tm/php/feature/CostFeature.php

@@ -280,7 +280,7 @@ class ProjectNameCostFeature extends ProjectNameBaseFeature
         $cost['actors'] = $this->_bump($cost['actors'], $actor, $amount);
 
         $this->seq++;
-        $record = [
+        $record = ($ctx->utility->clean)($ctx, [
             'seq' => $this->seq,
             'entity' => $entity,
             'op' => $opname,
@@ -289,7 +289,7 @@ class ProjectNameCostFeature extends ProjectNameBaseFeature
             'currency' => $cost['currency'],
             'source' => $source,
             'attempts' => $entry['attempts'],
-        ];
+        ]);
         $cost['last'] = $record;
         $client->_cost = $cost;
 

package/project/.sdk/tm/php/feature/DebugFeature.php

@@ -7,9 +7,9 @@ require_once __DIR__ . '/BaseFeature.php';
 
 // Request/response capture for debugging. Records a bounded ring buffer of
 // per-operation traces — method, URL, redacted headers, response status and
-// timing — on `client->_debug['entries']`. Sensitive header values
-// (matching `redact`, default authorization/cookie/api-key style names) are
-// masked. An optional `onEntry` callback receives each finished entry (e.g.
+// timing — on `client->_debug['entries']`. The SDK's own clean rules apply
+// to the whole entry, and header names in `redact` are masked on top of
+// them. An optional `onEntry` callback receives each finished entry (e.g.
 // to stream to a console). `max` caps the buffer (default 100). Mirrors
 // ts/src/feature/debug/DebugFeature.ts.
 class ProjectNameDebugFeature extends ProjectNameBaseFeature
@@ -57,7 +57,7 @@ class ProjectNameDebugFeature extends ProjectNameBaseFeature
                 . '.' . ($ctx->op->name !== '' ? $ctx->op->name : '_'),
             'method' => $spec !== null ? $spec->method : null,
             'url' => $spec !== null ? ($spec->url !== '' ? $spec->url : $spec->path) : null,
-            'headers' => $this->_redact($spec !== null ? $spec->headers : null),
+            'headers' => $this->_redact($ctx, $spec !== null ? $spec->headers : null),
             'start' => $this->_now(),
             'status' => null,
             'ok' => null,
@@ -122,6 +122,11 @@ class ProjectNameDebugFeature extends ProjectNameBaseFeature
             $entry['status'] = $ctx->result->status;
         }
 
+        // The whole entry leaves through the buffer and the callback: the url
+        // and the error message can carry a query credential the header mask
+        // above never saw.
+        $entry = ($ctx->utility->clean)($ctx, $entry);
+
         $client = $this->client;
         $client->_debug['entries'][] = $entry;
         $max = is_numeric($this->options['max'] ?? null) ? (int)$this->options['max'] : 100;
@@ -139,21 +144,25 @@ class ProjectNameDebugFeature extends ProjectNameBaseFeature
         }
     }
 
-    private function _redact(mixed $headers): array
+    // The core clean rules apply (clean.keys, every registered value); the
+    // feature's own `redact` list ADDS header names on top of them.
+    private function _redact(ProjectNameContext $ctx, mixed $headers): array
     {
         if (!is_array($headers)) {
             return [];
         }
-        $patterns = $this->options['redact'] ??
-            ['authorization', 'cookie', 'set-cookie', 'api-key', 'apikey', 'x-api-key', 'idempotency-key'];
+        $patterns = $this->options['redact'] ?? [];
         if (!is_array($patterns)) {
             $patterns = [];
         }
+        $patterns = array_map(function (mixed $n): string {
+            return strtolower((string)$n);
+        }, $patterns);
         $out = [];
         foreach ($headers as $k => $v) {
-            $out[$k] = in_array(strtolower((string)$k), $patterns, true) ? '<redacted>' : $v;
+            $out[$k] = in_array(strtolower((string)$k), $patterns, true) ? '[redacted]' : $v;
         }
-        return $out;
+        return ($ctx->utility->clean)($ctx, $out);
     }
 
     private function _now(): float

package/project/.sdk/tm/php/feature/LogFeature.php

@@ -37,6 +37,8 @@ class ProjectNameLogFeature extends ProjectNameBaseFeature
         }
     }
 
+    // A log line leaves the pipeline, so it is cleaned before the logger
+    // sees it.
     private function _loghook(string $hook, ProjectNameContext $ctx, string $level = 'info'): void
     {
         if (!$this->logger) {
@@ -44,10 +46,11 @@ class ProjectNameLogFeature extends ProjectNameBaseFeature
         }
         $opname = $ctx->op ? $ctx->op->name : '';
         $msg = "hook={$hook} op={$opname}";
+        $line = ($ctx->utility->clean)($ctx, "[" . strtoupper($level) . "] {$msg}");
         if (is_resource($this->logger)) {
-            fwrite($this->logger, "[" . strtoupper($level) . "] {$msg}\n");
+            fwrite($this->logger, $line . "\n");
         } elseif (is_callable($this->logger)) {
-            ($this->logger)("[" . strtoupper($level) . "] {$msg}");
+            ($this->logger)($line);
         }
     }
 

package/project/.sdk/tm/php/feature/ProxyFeature.php

@@ -20,6 +20,7 @@ class ProjectNameProxyFeature extends ProjectNameBaseFeature
     private ?array $options;
     private ?string $url;
     private array $no_proxy;
+    private ?ProjectNameContext $ctx;
 
     public function __construct()
     {
@@ -31,6 +32,7 @@ class ProjectNameProxyFeature extends ProjectNameBaseFeature
         $this->options = null;
         $this->url = null;
         $this->no_proxy = [];
+        $this->ctx = null;
     }
 
     public function init(ProjectNameContext $ctx, array $options): void
@@ -68,6 +70,19 @@ class ProjectNameProxyFeature extends ProjectNameBaseFeature
             }
         }
 
+        // A proxy URL may carry credentials as userinfo, from the option or
+        // the environment, and neither is under a sensitive key name.
+        $this->ctx = $ctx;
+        $parsed = is_string($this->url) ? parse_url($this->url) : null;
+        if (is_array($parsed)) {
+            foreach ([$parsed['user'] ?? '', $parsed['pass'] ?? ''] as $part) {
+                if (is_string($part) && '' !== $part) {
+                    ($ctx->utility->clean_add)($ctx, $part);
+                    ($ctx->utility->clean_add)($ctx, rawurldecode($part));
+                }
+            }
+        }
+
         $utility = $ctx->utility;
         $inner = $utility->fetcher;
 
@@ -129,7 +144,11 @@ class ProjectNameProxyFeature extends ProjectNameBaseFeature
     {
         $client = $this->client;
         if (!isset($client->_proxy)) {
-            $client->_proxy = ['routed' => 0, 'url' => $this->url];
+            $ctx = $this->ctx;
+            $client->_proxy = [
+                'routed' => 0,
+                'url' => null === $ctx ? $this->url : ($ctx->utility->clean)($ctx, $this->url),
+            ];
         }
         $client->_proxy['routed']++;
     }

package/project/.sdk/tm/php/feature/SecretsFeature.php

@@ -138,6 +138,10 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
     private string $cred = '';
     private bool $resolved = false;
 
+    // The root context, whose secret registry every value this feature
+    // resolves or buys goes into.
+    private ?ProjectNameContext $rootctx = null;
+
     public function __construct()
     {
         parent::__construct();
@@ -155,6 +159,7 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
         $this->options = $options;
         $this->liveopts = is_array($ctx->options) ? $ctx->options : [];
         $this->active = ($options['active'] ?? null) === true;
+        $this->rootctx = $ctx;
 
         if (!$this->active) {
             return;
@@ -207,6 +212,7 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
             $specs = [];
 
             if (is_string($explicit) && '' !== $explicit) {
+                $this->_register($explicit);
                 $specs[] = [
                     'kind' => 'memory',
                     'name' => 'options',
@@ -275,6 +281,16 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
         return $this->cred;
     }
 
+    // Every value this feature resolves or buys is a secret the SDK handles,
+    // and none arrives under an option key the intake registration saw.
+    private function _register(mixed $value): void
+    {
+        $ctx = $this->rootctx;
+        if (null !== $ctx && null !== $ctx->utility && is_callable($ctx->utility->clean_add)) {
+            ($ctx->utility->clean_add)($ctx, $value);
+        }
+    }
+
     // transport wraps whatever transport was current at init.
     public function transport(ProjectNameContext $ctx, string $url, array $fetchdef, mixed $inner): array
     {
@@ -357,6 +373,7 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
         if (!is_string($found)) {
             $found = null;
         }
+        $this->_register($found);
 
         if (null === $this->exchange) {
             // An UNCACHED miss after an earlier hit is a revocation: the
@@ -496,6 +513,7 @@ class ProjectNameSecretsFeature extends ProjectNameBaseFeature
         }
 
         $token = $this->buy_once();
+        $this->_register($token);
         $this->setcred($token);
         return $token;
     }

package/project/.sdk/tm/php/feature/TelemetryFeature.php

@@ -119,14 +119,16 @@ class ProjectNameTelemetryFeature extends ProjectNameBaseFeature
         $span['durationMs'] = max(0.0, (float)$span['end'] - (float)$span['start']);
         $span['ok'] = $ok;
 
+        $out = ($ctx->utility->clean)($ctx, $span);
+
         $client = $this->client;
         $client->_telemetry['active']--;
-        $client->_telemetry['spans'][] = $span;
+        $client->_telemetry['spans'][] = $out;
 
         $exporter = $this->options['exporter'] ?? null;
         if (is_callable($exporter)) {
             try {
-                $exporter($span);
+                $exporter($out);
             } catch (\Throwable $_e) {
                 // Exporter failures must never break the pipeline.
             }

package/project/.sdk/tm/php/test/FeatureTest.php

@@ -950,7 +950,7 @@ class FeatureTest extends TestCase
         $h->op(['op' => 'list']);
         $this->assertCount(1, $h->client->_debug['entries']); // ring buffer capped at max
         $this->assertCount(2, $seen);
-        $this->assertSame('<redacted>', $seen[0]['headers']['authorization']);
+        $this->assertSame('[redacted]', $seen[0]['headers']['authorization']);
     }
 
     public function test_debug_captures_failures(): void
@@ -975,7 +975,7 @@ class FeatureTest extends TestCase
         ]);
         $h->op(['op' => 'load', 'headers' => ['x-secret' => 'hide', 'x-ok' => 'show']]);
         $e = $h->client->_debug['entries'][0];
-        $this->assertSame('<redacted>', $e['headers']['x-secret']);
+        $this->assertSame('[redacted]', $e['headers']['x-secret']);
         $this->assertSame('show', $e['headers']['x-ok']);
     }