Skip to content

cmd/tailscale/cli: fix plain TCP serve status#20451

Merged
hwh33 merged 1 commit into
tailscale:mainfrom
coyaSONG:fix/serve-plain-tcp-status
Jul 15, 2026
Merged

cmd/tailscale/cli: fix plain TCP serve status#20451
hwh33 merged 1 commit into
tailscale:mainfrom
coyaSONG:fix/serve-plain-tcp-status

Conversation

@coyaSONG

Copy link
Copy Markdown
Contributor

Fixes #20367

Plain TCP forwarding currently initializes its output annotation as "TLS over TCP". Build annotations only from configured behavior so plain TCP has no TLS label, while TLS termination and PROXY protocol remain clearly identified.

The existing service TCP output test now covers the reported plain-TCP case.

Testing:

  • ./tool/go test ./cmd/tailscale/cli -count=1
  • ./tool/go vet ./cmd/tailscale/cli

@hwh33 hwh33 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great @coyaSONG, thank you!

Could you wrap the body of the commit message to 76 characters?

Do not label plain TCP forwarding as TLS over TCP. Render status
annotations only when TLS termination or PROXY protocol is configured.

Fixes tailscale#20367

Change-Id: I3f6507365ceedc2950451810e9715afb85176fc5
Signed-off-by: coyaSONG <66289470+coyaSONG@users.noreply.github.com>
@coyaSONG
coyaSONG force-pushed the fix/serve-plain-tcp-status branch from 31cd027 to def1758 Compare July 14, 2026 16:09
@andrezani

This comment was marked as spam.

@hwh33

hwh33 commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Great work @coyaSONG!

@hwh33
hwh33 merged commit f68e4d9 into tailscale:main Jul 15, 2026
62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cmd/tailscale/cli: serve incorrectly identifies plain TCP as TLS-over-TCP

3 participants