Commit Graph
4972 Commits
Author SHA1 Message Date
github-actions[bot] 5636c1416b Update VOUCHED list
https://github.com/juanfont/headscale/issues/3650#issuecomment-6601738938
2026-11-03 10:51:53 +00:00
Igor Serganov d0e10f2d46 util: read .json files as HuJSON in UnmarshalByExt (#3634)
dns.extra_records_path and derp.paths files ending in .json were decoded
with encoding/json, so a comment or trailing comma in otherwise valid
JSON made headscale refuse to load the file. Policy files already accept
HuJSON regardless of extension. HuJSON is a superset of JSON, so
standardizing .json input the same way as .hujson keeps every valid JSON
file decoding exactly as before.

Add tests for comments and trailing commas in extra records, in generic
.json decoding and in ACL policies, and for comment markers inside
string values.

Fixes #3627
2026-11-02 20:35:24 +01:00
Igor Serganov c6723fa103 state: keep collision-bumped GivenName within the DNS label limit (#3635)
`dnsname.SanitizeHostname` truncates a hostname to 63 characters. When
that label was already taken, resolveGivenName appended "-N" to the
full base, producing a 65+ character GivenName. Such a name is not a
valid DNS label, so the node cannot be rendered into its own netmap
or any peer's, and on PostgreSQL the varchar(63) given_name column
rejects the write.

Trim the base so base plus suffix fits in a DNS label and strip a
hyphen left at the cut. isAutoDerivedGivenName now compares against
the same bump, so a trimmed name still follows hostname changes
instead of being treated as an admin rename.
2026-11-02 20:28:28 +01:00
Michael Lopez 42a97be25f state: validate the new name and refuse OIDC users in RenameUser (#3642)
State.RenameUser went through UpdateUser and skipped the checks
db.RenameUser applies, so the API could rename an OIDC user, whose
name the identity provider owns, or rename any user to an invalid
name. Apply both checks in the update function and map the username
validation errors to 400.
2026-11-02 20:22:23 +01:00
Kristoffer Dalby 697eff7474 CHANGELOG: enumerate policy, lifetime and API compatibility breaks 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 4cb74dfe04 policy, servertest: derive exit routes from allowed public destinations
A public IP permits exit defaults; private-only rules do not. Replay six
accepted and two refused SaaS captures with range-equivalence checks,
preserving provenance and the literal-default-route ACL validation gap.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby f453502ef1 hscontrol: name policy, registration and map delivery decisions 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 9cc0d01026 hscontrol: preserve stale GC timer coverage after ephemeral ownership changes 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 4a00488869 mapper: read tracked peers under workMu in batcher tests
A full map replaces the set with Clear then Store; an unlocked read
between them failed TestOlderInitialMapLeavesNewerStreamsPeers.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 4e946edb08 api/v2: enforce and document OAuth tag permissions
Retagging requires all current and requested tags; disallowed tags return
400. Token responses list tags only when the token may assign them.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 7d94d189fa api/v2: send empty route lists under fields=all 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 1c65b9f162 gen/client/v2: regenerate for the device's join key 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 66db32dde0 api/v2: report tagged device creators and join keys
Use the join-key creator as the device's user without changing ownership.
Omit oauthClientId when an OAuth token's source client is not recorded.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby e4396e9f9d gen/client/v2: regenerate for the key list without all=true 2026-11-02 19:15:40 +01:00
Kristoffer Dalby a08daa91fe api/v2: list token-made auth keys to a token without all=true
Keys an OAuth token makes are marked so. No listing holds an invalid
key.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 060f145ac6 db, types: add a credentials column for keys a token made
No released version made keys from tokens, so existing rows stay false.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby fe260f5adf api/v2: show userId on admin-made tagged keys
An admin key's user is recorded as the creator of the tagged keys it
makes. A tagged key re-registers a machine by its tags, whoever made it.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 6474ac6dd3 api/v2: return a device name as its FQDN 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 17cbea0f6a api/v2: ignore unknown fields and reject unknown key types
Match SaaS request decoding while refusing unsupported keyType values.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 9979be140e db: keep at most 1000 access tokens per OAuth client
Minting needs only the client secret, whatever its scopes, and
added one row per mint. Each mint now ends tokens past the newest 1000.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 408b9b7797 api/v2: check the createKey scope before reading the body
createKey has no static scope, so any token got its body parsed
and validated before the handler's scope check.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 0bf5b0f0af api/v2: limit request bodies and redact schema-validation details
Bound schema, raw, and token-form bodies before parsing. Omit submitted
values from schema errors while preserving policy reasons and test labels.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 77005fac35 api/v2: keep a tagged all-scope client's tokens inside its tags
Only an untagged all-scope client may mint tokens for any tag, so a
tagged token may not create one.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 75e2377f25 debug: refuse requests addressed to unknown host names 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 87c9659b20 types: accept only lowercase hex in auth IDs 2026-11-02 19:15:40 +01:00
Kristoffer Dalby c8e97384d7 oidc: confirm SSH checks and display registration details
Approve SSH checks only after a click and recheck source ownership.
Show registration state and requested tags on the confirmation page.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 5dff6ca432 policy/v2: resolve user references consistently across updates
Prefer email owners over usernames and validate grants and nodeAttrs on
write. Reject ambiguous writes; log and match nobody on reload. Bare @
matches nobody.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby bdc005e518 cli: validate offline policy set like policy check 2026-11-02 19:15:40 +01:00
Kristoffer Dalby f2ecf949a7 types: reject non-boolean values for boolean settings 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 14baf55421 state, oidc: persist user changes and refresh nodes and clients
Write cleared user columns, discard OIDC email the provider no longer
vouches for, refresh NodeStore users, and notify clients from the callback.

Fixes #3471
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 499b58e77c oidc: refuse logins whose subject the provider identifier would alter 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 65a4f0d6fc state, change: notify clients only of effective node changes
Send endpoint and DERP reports only to peers. Suppress redundant online,
policy, and key updates on reconnect or unchanged-key login.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby cb47fdff36 policy/v2, mapper: align NextDNS warnings and device metadata
Warn about malformed attributes once at policy load, not on each map.
Include the node's stable ID as device_id in resolver queries.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby ab7a0f615c mapper: test that a hidden peer's policy change still sends filters 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 27bed8f612 state, change: send a deleted node's removal only to its peers
The removal went to every node, also those the policy hid the node from.
The delete now returns the node's peers from the snapshot it replaces.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 91168cc41f mapper: stop an older initial map removing peers newer streams hold
AddNode diffed its map against tracking after sending it, when a newer
stream may have recorded its own; it now sends the node a full instead.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby a886c717e3 mapper: bound how long one node can block a batcher worker
A node that drained slower than it was sent to held the worker for its
whole bundle; once its sends have waited 50ms, the rest waits a tick.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby f37c6a69bc mapper: bound concurrent streams and wait for their initial maps
The fifth stream replaces the oldest. Retry changes while any stream
awaits its initial map so ready streams cannot consume another's update.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 14d752cf04 change: coalesce policy recomputes that carry an origin node
The recompute render ignores the origin and always carries the node's
own entry, so a burst of tag writes cost every node one per write.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby ba0ad18e83 state: say a taken name is already taken 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 8073a2fbd0 db: succeed on a repeated revoke of an auth key
A repeated v2 DELETE of an auth key now answers 200, as Tailscale does.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby e1f84dd214 auth: answer a logout that deletes an ephemeral node as authorised 2026-11-02 19:15:40 +01:00
Kristoffer Dalby 8550812eaf cli: show a node's own ephemeral flag instead of its key's 2026-11-02 19:15:40 +01:00
Kristoffer Dalby c24b65eeca gen/client/v1: regenerate for the node ephemeral flag 2026-11-02 19:15:40 +01:00
Kristoffer Dalby e99ad44064 db, state: keep the ephemeral flag a node was created with
The flag moves from the key to the node, so a login with another key no
longer changes it. A user claiming a tagged node still clears it. v1
nodes carry the flag.

Fixes #3640
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 59f9f78bdd db, types: add a nodes column for the ephemeral flag
The migration fills it from the key each node references.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 8b93e6a074 state: assign and persist unique node names in the NodeStore
Reserve extra DNS names, fit collision suffixes within 63 bytes, and repair
duplicate startup names in memory. Persist registration names without
losing a created node on rename failure; remove unused DB renaming.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby d8c482e4b3 db, api/v1: revoke rather than delete an ephemeral pre-auth key in use
The v1 list now hides revoked keys, so keys revoked through v2 also drop
out of `headscale preauthkeys list`.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 0ecbeafb79 hscontrol: track ephemeral cleanup from registration to ownership changes
Arm cleanup at pre-auth registration, even if later work fails or the node
never connects. Skip deletion when the node is no longer ephemeral.
2026-11-02 19:15:40 +01:00
Kristoffer Dalby 6ad638da8e db: wrap the sequential IP allocator so freed addresses are reused 2026-11-02 19:15:40 +01:00