[PR #2309] [MERGED] fix tags not resolving to username if email is present #2599

Closed
opened 2025-12-29 03:21:58 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2309
Author: @kradalby
Created: 12/17/2024
Status: Merged
Merged: 12/19/2024
Merged by: @kradalby

Base: mainHead: kradalby/tags-missing


📝 Commits (10+)

  • e6fc785 ensure valid tags is populated on user gets too
  • 1ade2ad ensure forced tags are added
  • 9dfab0e remove unused envvar in test
  • aa44f96 debug log auth/unauth tags in policy man
  • f2b97a1 defer shutdown in tags test
  • 8398797 add tag test with groups
  • c4157f5 add email, display name, picture to create user
  • 9440988 add ability to set display and email to cli
  • 4139821 add email to test users in integration
  • 2ac4d3f fix issue where tags were only assigned to email, not username

📊 Changes

28 files changed (+399 additions, -220 deletions)

View changed files

📝 cmd/headscale/cli/nodes.go (+8 -8)
📝 cmd/headscale/cli/routes.go (+3 -3)
📝 cmd/headscale/cli/users.go (+26 -0)
📝 gen/go/headscale/v1/apikey.pb.go (+1 -1)
📝 gen/go/headscale/v1/device.pb.go (+1 -1)
📝 gen/go/headscale/v1/headscale.pb.go (+1 -1)
📝 gen/go/headscale/v1/node.pb.go (+1 -1)
📝 gen/go/headscale/v1/policy.pb.go (+1 -1)
📝 gen/go/headscale/v1/preauthkey.pb.go (+1 -1)
📝 gen/go/headscale/v1/routes.pb.go (+1 -1)
📝 gen/go/headscale/v1/user.pb.go (+60 -31)
📝 gen/openapiv2/headscale/v1/headscale.swagger.json (+9 -0)
📝 hscontrol/db/db_test.go (+4 -4)
📝 hscontrol/db/node_test.go (+12 -12)
📝 hscontrol/db/preauth_keys_test.go (+9 -9)
📝 hscontrol/db/routes_test.go (+4 -4)
📝 hscontrol/db/users.go (+4 -7)
📝 hscontrol/db/users_test.go (+7 -7)
📝 hscontrol/grpcv1.go (+19 -17)
📝 hscontrol/policy/acls.go (+106 -36)

...and 8 more files

📄 Description

Fixes #2307


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/2309 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 12/17/2024 **Status:** ✅ Merged **Merged:** 12/19/2024 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `kradalby/tags-missing` --- ### 📝 Commits (10+) - [`e6fc785`](https://github.com/juanfont/headscale/commit/e6fc7851e7e8672e47efd50bc0b648557e995f03) ensure valid tags is populated on user gets too - [`1ade2ad`](https://github.com/juanfont/headscale/commit/1ade2ad80fa0acc770a2b738c291c35bd22a7201) ensure forced tags are added - [`9dfab0e`](https://github.com/juanfont/headscale/commit/9dfab0ec1a4dcdbc23482304c1f359518440dd48) remove unused envvar in test - [`aa44f96`](https://github.com/juanfont/headscale/commit/aa44f966e35eeb148c32ac76f117ce3be7a7a70e) debug log auth/unauth tags in policy man - [`f2b97a1`](https://github.com/juanfont/headscale/commit/f2b97a1087b50682c63b57b7a52bc207066f8920) defer shutdown in tags test - [`8398797`](https://github.com/juanfont/headscale/commit/839879702465fa8fbd345ecc2049b95f9af0c14c) add tag test with groups - [`c4157f5`](https://github.com/juanfont/headscale/commit/c4157f5675fba32904f8205aa7a2fae21f936623) add email, display name, picture to create user - [`9440988`](https://github.com/juanfont/headscale/commit/9440988106544a947edda1fdbc6b6ba740d3b641) add ability to set display and email to cli - [`4139821`](https://github.com/juanfont/headscale/commit/41398219c27e4e99f023a76b28122d1088e38011) add email to test users in integration - [`2ac4d3f`](https://github.com/juanfont/headscale/commit/2ac4d3fbe56a8c06e4e7431fd4cf635ee7577718) fix issue where tags were only assigned to email, not username ### 📊 Changes **28 files changed** (+399 additions, -220 deletions) <details> <summary>View changed files</summary> 📝 `cmd/headscale/cli/nodes.go` (+8 -8) 📝 `cmd/headscale/cli/routes.go` (+3 -3) 📝 `cmd/headscale/cli/users.go` (+26 -0) 📝 `gen/go/headscale/v1/apikey.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/device.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/headscale.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/node.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/policy.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/preauthkey.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/routes.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/user.pb.go` (+60 -31) 📝 `gen/openapiv2/headscale/v1/headscale.swagger.json` (+9 -0) 📝 `hscontrol/db/db_test.go` (+4 -4) 📝 `hscontrol/db/node_test.go` (+12 -12) 📝 `hscontrol/db/preauth_keys_test.go` (+9 -9) 📝 `hscontrol/db/routes_test.go` (+4 -4) 📝 `hscontrol/db/users.go` (+4 -7) 📝 `hscontrol/db/users_test.go` (+7 -7) 📝 `hscontrol/grpcv1.go` (+19 -17) 📝 `hscontrol/policy/acls.go` (+106 -36) _...and 8 more files_ </details> ### 📄 Description Fixes #2307 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 03:21:58 +01:00
adam closed this issue 2025-12-29 03:21:58 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2599