starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-01-11 20:00:28 +01:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

[PR #2528] [MERGED] fix webauth + autoapprove routes #2705

New Issue
Closed
opened 2025-12-29 03:22:26 +01:00 by adam · 0 comments
adam commented 2025-12-29 03:22:26 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2528
Author: @kradalby
Created: 4/14/2025
Status: ✅ Merged
Merged: 4/30/2025
Merged by: @kradalby

Base: main ← Head: kradalby/test-web-auth-across

📝 Commits (10+)

  • 91d19cb types/node: add helper funcs for node tags
  • 7a93170 types/node: add DebugString method for node
  • 8768b48 policy/v2: add String func to AutoApprover interface
  • 3d7dfaf policy/v2: simplify, use slices.Contains
  • afab71c policy/v2: debug, use nodes.DebugString
  • 89c852b policy/v1: fix potential nil pointer in NodeCanApproveRoute
  • fdc0365 policy/v1: slices.Contains
  • a269e85 integration/tsic: fix diff in login commands
  • 66257b2 integration: fix webauth running with wrong scenario
  • c3f40d5 integration: move common oidc opts to func

📊 Changes

17 files changed (+793 additions, -462 deletions)

View changed files

📝 hscontrol/policy/v1/policy.go (+4 -8)
📝 hscontrol/policy/v2/policy.go (+11 -12)
📝 hscontrol/policy/v2/types.go (+9 -0)
📝 hscontrol/types/node.go (+36 -6)
📝 hscontrol/util/util.go (+13 -0)
📝 integration/acl_test.go (+1 -1)
📝 integration/auth_oidc_test.go (+1 -1)
📝 integration/auth_web_flow_test.go (+2 -2)
📝 integration/dockertestutil/network.go (+21 -0)
📝 integration/general_test.go (+2 -2)
📝 integration/route_test.go (+631 -379)
📝 integration/scenario.go (+20 -15)
📝 integration/scenario_test.go (+1 -1)
📝 integration/ssh_test.go (+1 -1)
📝 integration/tailscale.go (+3 -1)
📝 integration/tsic/tsic.go (+36 -19)
📝 integration/utils.go (+1 -14)

📄 Description

There is a bug with autoapproving routes if the user logs in over webauth and the node is tagged.

🔄 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/2528 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 4/14/2025 **Status:** ✅ Merged **Merged:** 4/30/2025 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `kradalby/test-web-auth-across` --- ### 📝 Commits (10+) - [`91d19cb`](https://github.com/juanfont/headscale/commit/91d19cb6d75d41b55722cbeea1ba93030a8a56df) types/node: add helper funcs for node tags - [`7a93170`](https://github.com/juanfont/headscale/commit/7a931703bd422a8fafe20e118e400bfd70d51abc) types/node: add DebugString method for node - [`8768b48`](https://github.com/juanfont/headscale/commit/8768b482b7866c9fea652a209079388d89157ab0) policy/v2: add String func to AutoApprover interface - [`3d7dfaf`](https://github.com/juanfont/headscale/commit/3d7dfafcf96f38cd6a44226fd8e637889bbfd0b1) policy/v2: simplify, use slices.Contains - [`afab71c`](https://github.com/juanfont/headscale/commit/afab71c441533136ebdd7298ddf532179ebeb8f9) policy/v2: debug, use nodes.DebugString - [`89c852b`](https://github.com/juanfont/headscale/commit/89c852bccc71518a1a0ee867a1c4c3b3d3b9bb33) policy/v1: fix potential nil pointer in NodeCanApproveRoute - [`fdc0365`](https://github.com/juanfont/headscale/commit/fdc03651b14b69e805688009b7ab02b376e71e50) policy/v1: slices.Contains - [`a269e85`](https://github.com/juanfont/headscale/commit/a269e8564d2609750fdd440c9075614e43df371e) integration/tsic: fix diff in login commands - [`66257b2`](https://github.com/juanfont/headscale/commit/66257b2fa264b9c51a825deba8faa2411ba008e6) integration: fix webauth running with wrong scenario - [`c3f40d5`](https://github.com/juanfont/headscale/commit/c3f40d5a8ecd43f314929ab9dc5fad1dfb36e130) integration: move common oidc opts to func ### 📊 Changes **17 files changed** (+793 additions, -462 deletions) <details> <summary>View changed files</summary> 📝 `hscontrol/policy/v1/policy.go` (+4 -8) 📝 `hscontrol/policy/v2/policy.go` (+11 -12) 📝 `hscontrol/policy/v2/types.go` (+9 -0) 📝 `hscontrol/types/node.go` (+36 -6) 📝 `hscontrol/util/util.go` (+13 -0) 📝 `integration/acl_test.go` (+1 -1) 📝 `integration/auth_oidc_test.go` (+1 -1) 📝 `integration/auth_web_flow_test.go` (+2 -2) 📝 `integration/dockertestutil/network.go` (+21 -0) 📝 `integration/general_test.go` (+2 -2) 📝 `integration/route_test.go` (+631 -379) 📝 `integration/scenario.go` (+20 -15) 📝 `integration/scenario_test.go` (+1 -1) 📝 `integration/ssh_test.go` (+1 -1) 📝 `integration/tailscale.go` (+3 -1) 📝 `integration/tsic/tsic.go` (+36 -19) 📝 `integration/utils.go` (+1 -14) </details> ### 📄 Description There is a bug with autoapproving routes if the user logs in over webauth and the node is tagged. --- <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:22:26 +01:00
adam closed this issue 2025-12-29 03:22:26 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
CLI
DERP
DNS
Nix
OIDC
SSH
bug
database
documentation
duplicate
enhancement
faq
good first issue
grants
help wanted
might-come
needs design doc
needs investigation
no-stale-bot
out of scope
performance
policy 📝
pull-request
Mirrored from GitHub Pull Request
 question
regression
routes
stale
tags
tailscale-feature-gap
well described ❤️
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2705
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?