[wrangler] Sanitize sensitive commands in telemetry to prevent capturing secrets #11856

MattieTK · 2026-01-10T00:21:04Z

Summary

Sanitizes sensitive commands in telemetry to prevent accidentally capturing secrets or credentials that users may have pasted as arguments.

Refactored wrangler login sanitization into a unified approach with other sensitive commands
Added protection for all secret-related commands: wrangler secret put, wrangler secret bulk, and their pages and versions equivalents
When these commands are detected, the command is sanitized to just the prefix and all arguments are cleared from telemetry

Tests
- Tests included/updated
- Automated tests not possible - manual testing has been completed as follows:
- Additional testing not necessary because:
Public documentation
- Cloudflare docs PR(s):
- Documentation not necessary because: Internal telemetry change with no user-facing documentation impact

…ing secrets

changeset-bot · 2026-01-10T00:21:10Z

🦋 Changeset detected

Latest commit: 9e51120

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

pkg-pr-new · 2026-01-10T00:24:52Z

create-cloudflare

npm i https://pkg.pr.new/create-cloudflare@11856

@cloudflare/kv-asset-handler

npm i https://pkg.pr.new/@cloudflare/kv-asset-handler@11856

miniflare

npm i https://pkg.pr.new/miniflare@11856

@cloudflare/pages-shared

npm i https://pkg.pr.new/@cloudflare/pages-shared@11856

@cloudflare/unenv-preset

npm i https://pkg.pr.new/@cloudflare/unenv-preset@11856

@cloudflare/vite-plugin

npm i https://pkg.pr.new/@cloudflare/vite-plugin@11856

@cloudflare/vitest-pool-workers

npm i https://pkg.pr.new/@cloudflare/vitest-pool-workers@11856

@cloudflare/workers-editor-shared

npm i https://pkg.pr.new/@cloudflare/workers-editor-shared@11856

@cloudflare/workers-utils

npm i https://pkg.pr.new/@cloudflare/workers-utils@11856

wrangler

npm i https://pkg.pr.new/wrangler@11856

commit: 93bd041

vicb · 2026-01-10T07:58:24Z

packages/wrangler/src/metrics/metrics-dispatcher.ts

+				// Sanitize sensitive commands to prevent accidentally capturing secrets
+				// or credentials that users may have pasted as arguments
+				const sensitiveCommandPrefixes = [
+					"wrangler login",


One problem with this implementation is that we duplicate the info in the command definition and here.

Meaning that if we tweak the command format or add a new command, we also have to update this code and there are chances we will miss that.

IMO a better implementation would be to move that to the command definition itself in some form.

Also we should probably remove "wrangler" from properties.command. Who knows, it might change some day ;)

Thanks Vic! That's a good point. So your idea would be that each command would have a property that marks the following args as potentially sensitive and skips them, and make the analytics aware of that?

Agree with ridding ourselves of wrangler in the properties.command, but the challenge with all logging data is that once it's there it's there and you kinda just have to move forward with your mistakes else you'll be forever adding additional filters to catch users on older versions, and then you'll forget a filter etc etc. Though I guess we're going to see that if the command changes anyway...

Instead of maintaining a hardcoded list of sensitive command prefixes in the metrics dispatcher, this adds a sensitiveArgs property to the command definition metadata. This ensures: - No duplication between command definitions and metrics code - New sensitive commands only need sensitiveArgs: true in their definition - The command registry is the single source of truth Changes: - Add sensitiveArgs to Metadata type in core/types.ts - Add findCommandDefinition() to CommandRegistry for looking up commands - Pass sensitiveArgs flag from command definition to sendCommandEvent() - Remove hardcoded prefix list from metrics-dispatcher.ts - Add sensitiveArgs: true to login, secret put/bulk, pages secret put/bulk, and versions secret put/bulk commands

packages/wrangler/src/core/types.ts

.changeset/sensitive-command-sanitization.md

emily-shen · 2026-01-19T17:52:36Z

packages/wrangler/src/__tests__/metrics.test.ts

+				expect(std.debug).toContain('"command":"wrangler secret put');
+				expect(std.debug).toContain('"sensitiveArgs":true');
+				// Ensure the accidentally pasted secret is not in the debug output
+				expect(std.debug).not.toContain("accidentallyPastedSecret");


just to make sure i'm clear on what is an arg and what is a flag and what is a value

what would happen in the test case npx wrangler secret put ACTUAL_SECRET RANDOM_POSITIONAL --foo=bar? do we still get --foo=bar somehow in telemetry or is that dropped too?

No we drop everything in this case. I will live to regret this but I think it's more important that we drop possibly useful data than capture something that we shouldn't capture. In the future if we want to add explicit checks for specific arguments in we can do that.

…nsitivity default - Renamed 'command' to 'safe_command' and 'args' to 'safe_args' to allow server-side differentiation from historical potentially-leaked data - Changed sensitiveArgs default from false to true (opt-in for sending args) - Fixed CommandRegistry.findCommandDefinition() to follow command aliases - Marked ~80 safe commands with sensitiveArgs: false (list, info, get, etc.) - Commands handling secrets remain sensitive by default (secret put, etc.)

tmp/command-sensitivity-audit.md

- Strip 'wrangler' prefix from safe_command for future-proofing (e.g., 'secret put' instead of 'wrangler secret put') - Update COMMAND_ARG_ALLOW_LIST keys accordingly - Remove temporary audit document

.changeset/sensitive-command-sanitization.md

emily-shen · 2026-01-19T21:20:27Z

.changeset/sensitive-command-sanitization.md

+- Commands with file paths that could reveal sensitive structure
+- Any command not explicitly marked as safe


pretty sure it hasn't because -c (config file path) is a global flag

.changeset/sensitive-command-sanitization.md

Co-authored-by: emily-shen <69125074+emily-shen@users.noreply.github.com>

MattieTK · 2026-01-19T21:35:39Z

packages/wrangler/src/metrics/metrics-dispatcher.ts

+				// or credentials that users may have pasted as arguments.
+				// The sensitiveArgs flag is set from the command definition's metadata.
+				if (properties.sensitiveArgs) {
+					argv = [];


@emily-shen I think this is the line that should remove global flags also if the sensitiveArgs property is false

soz what i meant is that every command is a command that could have file paths, given -c is a global arg. so we shouldn't include that in the changeset list (also, i think its an llm implementation detail, what we should include is the actual commands affected)

Claude went a bit over the top here and committed classically hyperbolic language, so I'm toning it down.

vicb

See my inline comments.

I'm pretty sure there is better way that findCommandDefinition, let me know if you want me to look at it.

packages/wrangler/src/__tests__/metrics.test.ts

vicb · 2026-01-20T10:20:39Z

packages/wrangler/src/core/CommandRegistry.ts

+	 * Returns the command definition and the number of args segments that form the command
+	 * (excluding positional args), or undefined if no command is found.
+	 */
+	findCommandDefinition(


AIS?

How are other Metadata retrieved?

vicb · 2026-01-20T10:25:09Z

packages/wrangler/src/core/types.ts

+	 * @default true - Commands are treated as sensitive by default (args stripped).
+	 * Set to `false` to explicitly mark a command as safe and include its args in telemetry.
+	 */
+	sensitiveArgs?: boolean;


logArgs might be easier to understand?

agreed, I've got a new version that swaps to logArgs with false being the default

.changeset/sensitive-command-sanitization.md

Co-authored-by: lrapoport-cf <107272160+lrapoport-cf@users.noreply.github.com>

[wrangler] Sanitize sensitive commands in telemetry to prevent captur…

3e49eaf

…ing secrets

MattieTK requested a review from a team as a code owner January 10, 2026 00:21

workers-devprod added this to workers-sdk Jan 10, 2026

github-project-automation bot moved this to Untriaged in workers-sdk Jan 10, 2026

vicb reviewed Jan 10, 2026

View reviewed changes

MattieTK requested a review from a team as a code owner January 12, 2026 16:42

vicb reviewed Jan 19, 2026

View reviewed changes

packages/wrangler/src/core/types.ts Outdated Show resolved Hide resolved

emily-shen reviewed Jan 19, 2026

View reviewed changes

MattieTK requested review from a team as code owners January 19, 2026 19:13

MattieTK and others added 2 commits January 19, 2026 20:57

chore: address PR feedback - change to minor and document default value

8a6108d

Merge branch 'main' into mattietk/sensitive-command-sanitization

4d62156

emily-shen reviewed Jan 19, 2026

View reviewed changes

tmp/command-sensitivity-audit.md Outdated Show resolved Hide resolved

refactor: remove 'wrangler' prefix from safe_command field

6f39df7

- Strip 'wrangler' prefix from safe_command for future-proofing (e.g., 'secret put' instead of 'wrangler secret put') - Update COMMAND_ARG_ALLOW_LIST keys accordingly - Remove temporary audit document

emily-shen reviewed Jan 19, 2026

View reviewed changes

Update .changeset/sensitive-command-sanitization.md

45d3e4f

Co-authored-by: emily-shen <69125074+emily-shen@users.noreply.github.com>

MattieTK commented Jan 19, 2026

View reviewed changes

MattieTK added 2 commits January 19, 2026 21:43

update language in changelog

be69ed4

Claude went a bit over the top here and committed classically hyperbolic language, so I'm toning it down.

test: add agent field to metrics test expectations

c5065c7

vicb requested changes Jan 20, 2026

View reviewed changes

github-project-automation bot moved this from Untriaged to In Review in workers-sdk Jan 20, 2026

vicb reviewed Jan 20, 2026

View reviewed changes

lrapoport-cf reviewed Jan 20, 2026

View reviewed changes

.changeset/sensitive-command-sanitization.md Outdated Show resolved Hide resolved

lrapoport-cf reviewed Jan 20, 2026

View reviewed changes

.changeset/sensitive-command-sanitization.md Outdated Show resolved Hide resolved

MattieTK and others added 2 commits January 20, 2026 15:27

Apply suggestion from @lrapoport-cf

93bd041

Co-authored-by: lrapoport-cf <107272160+lrapoport-cf@users.noreply.github.com>

fix: replace command casing

0c070af

MattieTK added 2 commits January 20, 2026 16:03

switch from sensitiveArgs: true defaults to logArgs: false

d78ebc5

update changeset to patch

9e51120

		- Commands with file paths that could reveal sensitive structure
		- Any command not explicitly marked as safe

[wrangler] Sanitize sensitive commands in telemetry to prevent capturing secrets #11856

Are you sure you want to change the base?

[wrangler] Sanitize sensitive commands in telemetry to prevent capturing secrets #11856

Uh oh!

Conversation

MattieTK commented Jan 10, 2026

Summary

Uh oh!

changeset-bot bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

pkg-pr-new bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MattieTK Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vicb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vicb Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

changeset-bot bot commented Jan 10, 2026 •

edited

Loading

pkg-pr-new bot commented Jan 10, 2026 •

edited

Loading

MattieTK Jan 10, 2026 •

edited

Loading

vicb Jan 20, 2026 •

edited

Loading