mirror of
https://github.com/tailscale/tailscale.git
synced 2026-11-21 20:22:41 +09:00
ipn/localapi: use caller scope for syspolicy requests (#21701)
This resolves unscoped policy requests to the connected user's effective policy instead of the default scope. Tested by changing the device-scoped AlwaysOn policy at runtime and running tailscale syspolicy reload. Cofnirmed tailscaled immediately enforced the updated policy with tailscale down Updates tailscale/corp#41463 Signed-off-by: kari <kari@tailscale.com>
This commit is contained in:
1 parent
156ff9e439
commit
a89b32904f
2 files changed
+106
-1
No files matched your search
@@ -34,7 +34,12 @@ func (h *Handler) servePolicy(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
var scope setting.PolicyScope
|
var scope setting.PolicyScope
|
||||||
if suffix == "" {
|
if suffix == "" {
|
||||||
scope = setting.DefaultScope()
|
policyUID := string(h.Actor.UserID())
|
||||||
|
if policyUID == "" {
|
||||||
|
scope = setting.DefaultScope()
|
||||||
|
} else {
|
||||||
|
scope = setting.UserScopeOf(policyUID)
|
||||||
|
}
|
||||||
} else if err := scope.UnmarshalText([]byte(suffix)); err != nil {
|
} else if err := scope.UnmarshalText([]byte(suffix)); err != nil {
|
||||||
http.Error(w, fmt.Sprintf("%q is not a valid scope", suffix), http.StatusBadRequest)
|
http.Error(w, fmt.Sprintf("%q is not a valid scope", suffix), http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
// Copyright (c) Tailscale Inc & contributors
|
||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
|
//go:build !ts_omit_syspolicy
|
||||||
|
|
||||||
|
package localapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"tailscale.com/ipn/ipnauth"
|
||||||
|
"tailscale.com/util/httpm"
|
||||||
|
"tailscale.com/util/syspolicy/pkey"
|
||||||
|
"tailscale.com/util/syspolicy/rsop"
|
||||||
|
"tailscale.com/util/syspolicy/setting"
|
||||||
|
"tailscale.com/util/syspolicy/source"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestPolicyUsesCallerUserScope(t *testing.T) {
|
||||||
|
setting.SetDefinitionsForTest(t,
|
||||||
|
setting.NewDefinition(
|
||||||
|
pkey.ManagedByOrganizationName,
|
||||||
|
setting.UserSetting,
|
||||||
|
setting.StringValue,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
const uid = "S-1-5-21-1001"
|
||||||
|
|
||||||
|
store := source.NewTestStore(t)
|
||||||
|
store.SetStrings(
|
||||||
|
source.TestSettingOf(pkey.ManagedByOrganizationName, "UserCorp"),
|
||||||
|
)
|
||||||
|
rsop.RegisterStoreForTest(t, "UserStore", setting.UserScopeOf(uid), store)
|
||||||
|
|
||||||
|
h := &Handler{
|
||||||
|
PermitRead: true,
|
||||||
|
Actor: &ipnauth.TestActor{UID: uid},
|
||||||
|
}
|
||||||
|
|
||||||
|
req := httptest.NewRequest(httpm.GET, "/localapi/v0/policy/", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.servePolicy(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf(
|
||||||
|
"status = %d; want %d; body = %s",
|
||||||
|
rec.Code,
|
||||||
|
http.StatusOK,
|
||||||
|
rec.Body.String(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := rec.Body.String(); !strings.Contains(got, "UserCorp") {
|
||||||
|
t.Fatalf("response does not contain user-scoped policy: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPolicyUsesDefaultScopeForEmptyUserID(t *testing.T) {
|
||||||
|
setting.SetDefinitionsForTest(t,
|
||||||
|
setting.NewDefinition(
|
||||||
|
pkey.ManagedByOrganizationName,
|
||||||
|
setting.DeviceSetting,
|
||||||
|
setting.StringValue,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
store := source.NewTestStore(t)
|
||||||
|
store.SetStrings(
|
||||||
|
source.TestSettingOf(pkey.ManagedByOrganizationName, "DeviceCorp"),
|
||||||
|
)
|
||||||
|
rsop.RegisterStoreForTest(t, "DeviceStore", setting.DefaultScope(), store)
|
||||||
|
|
||||||
|
h := &Handler{
|
||||||
|
PermitRead: true,
|
||||||
|
Actor: &ipnauth.TestActor{},
|
||||||
|
}
|
||||||
|
|
||||||
|
req := httptest.NewRequest(httpm.GET, "/localapi/v0/policy/", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.servePolicy(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf(
|
||||||
|
"status = %d; want %d; body = %s",
|
||||||
|
rec.Code,
|
||||||
|
http.StatusOK,
|
||||||
|
rec.Body.String(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := rec.Body.String(); !strings.Contains(got, "DeviceCorp") {
|
||||||
|
t.Fatalf("response does not contain default-scope policy: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user