Attach guard policies to scopes: store, admin API and ctl guard; run the gate when server.yaml defines policies
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b4bdd250af
commit
13e6f19301
13 files changed
+412
No files matched your search
@@ -48,6 +48,8 @@ type API struct {
|
||||
serve *modelserve.Server
|
||||
// history is the Prometheus the console's charts read from.
|
||||
history History
|
||||
// guard is the guardrail policies' library and attachments.
|
||||
guard *GuardAdmin
|
||||
// revoke records a removed node, so its certificate is refused.
|
||||
revoke func(ctx context.Context, nodeID string, at time.Time) error
|
||||
|
||||
@@ -77,6 +79,7 @@ func (a *API) Register(mux *http.ServeMux) {
|
||||
mux.HandleFunc("POST /api/v1/models/{name}/scale", a.scaleModel)
|
||||
mux.HandleFunc("POST /api/v1/models/{name}/resources", a.setResources)
|
||||
a.registerQuotas(mux)
|
||||
a.registerGuard(mux)
|
||||
mux.HandleFunc("POST /api/v1/models/{name}/adapters", a.setAdapters)
|
||||
mux.HandleFunc("GET /api/v1/models/{name}/target", a.target)
|
||||
mux.HandleFunc("POST /api/v1/models/{name}/class", func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
package adminapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/guard"
|
||||
)
|
||||
|
||||
// GuardStore is where policy attachments are kept.
|
||||
type GuardStore interface {
|
||||
GuardAttachments(ctx context.Context) ([]guard.Attachment, error)
|
||||
AttachGuard(ctx context.Context, a guard.Attachment, by string) error
|
||||
DetachGuard(ctx context.Context, a guard.Attachment) (bool, error)
|
||||
}
|
||||
|
||||
// GuardAdmin is what the guard endpoints need: the library from server.yaml,
|
||||
// the store, and a way to have the gate read attachments again at once.
|
||||
type GuardAdmin struct {
|
||||
Library guard.Config
|
||||
Store GuardStore
|
||||
Invalidate func()
|
||||
}
|
||||
|
||||
// SetGuard enables the guard endpoints.
|
||||
func (a *API) SetGuard(g *GuardAdmin) { a.guard = g }
|
||||
|
||||
// GuardView is the library and where its policies are attached.
|
||||
type GuardView struct {
|
||||
Policies []string `json:"policies"`
|
||||
Default []string `json:"default"`
|
||||
Attachments []GuardAttachmentView `json:"attachments"`
|
||||
}
|
||||
|
||||
// GuardAttachmentView is one attachment, with the name people know its
|
||||
// scope by.
|
||||
type GuardAttachmentView struct {
|
||||
guard.Attachment
|
||||
Name string `json:"name,omitempty"`
|
||||
}
|
||||
|
||||
// guardTarget reads where a policy is to be attached.
|
||||
func (a *API) guardTarget(ctx context.Context, target string) (guard.Attachment, error) {
|
||||
kind, what, ok := strings.Cut(strings.TrimSpace(target), ":")
|
||||
what = strings.TrimSpace(what)
|
||||
if !ok || what == "" {
|
||||
return guard.Attachment{}, fmt.Errorf("%q is not org:, team:, project:, key: or user: and what", target)
|
||||
}
|
||||
switch kind {
|
||||
case "key", "user":
|
||||
return guard.Attachment{Scope: kind, ScopeID: what}, nil
|
||||
case "org", "team", "project":
|
||||
if a.quotas == nil {
|
||||
return guard.Attachment{Scope: kind, ScopeID: what}, nil
|
||||
}
|
||||
_, id, _, err := a.resolveScope(ctx, target)
|
||||
if err != nil {
|
||||
return guard.Attachment{}, err
|
||||
}
|
||||
return guard.Attachment{Scope: kind, ScopeID: id}, nil
|
||||
}
|
||||
return guard.Attachment{}, fmt.Errorf("%q: attach to org, team, project, key or user", kind)
|
||||
}
|
||||
|
||||
func (a *API) registerGuard(mux *http.ServeMux) {
|
||||
mux.HandleFunc("GET /api/v1/guard", func(w http.ResponseWriter, r *http.Request) {
|
||||
if a.guard == nil {
|
||||
writeError(w, http.StatusNotImplemented, "no guard policies: define them under guard: in server.yaml")
|
||||
return
|
||||
}
|
||||
att, err := a.guard.Store.GuardAttachments(r.Context())
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
v := GuardView{Default: a.guard.Library.Default, Attachments: []GuardAttachmentView{}}
|
||||
var names map[string]string
|
||||
if a.quotas != nil {
|
||||
names, _ = a.scopeNames(r.Context())
|
||||
}
|
||||
for _, at := range att {
|
||||
v.Attachments = append(v.Attachments, GuardAttachmentView{Attachment: at, Name: names[at.Scope+":"+at.ScopeID]})
|
||||
}
|
||||
for name := range a.guard.Library.Policies {
|
||||
v.Policies = append(v.Policies, name)
|
||||
}
|
||||
slices.Sort(v.Policies)
|
||||
writeJSON(w, http.StatusOK, v)
|
||||
})
|
||||
change := func(attach bool) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if a.guard == nil {
|
||||
writeError(w, http.StatusNotImplemented, "no guard policies: define them under guard: in server.yaml")
|
||||
return
|
||||
}
|
||||
var at struct {
|
||||
// Target is org:NAME, team:ORG/TEAM, project:ORG/TEAM/PROJECT
|
||||
// (or the ID after the colon), key:KEY-ID or user:USER-ID.
|
||||
Target string `json:"target"`
|
||||
Policy string `json:"policy"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&at); err != nil {
|
||||
writeError(w, http.StatusBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
att, err := a.guardTarget(r.Context(), at.Target)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
att.Policy = at.Policy
|
||||
if _, ok := a.guard.Library.Policies[att.Policy]; !ok && attach {
|
||||
writeError(w, http.StatusBadRequest, fmt.Sprintf("no policy %q in server.yaml's guard.policies", att.Policy))
|
||||
return
|
||||
}
|
||||
changed := true
|
||||
if attach {
|
||||
err = a.guard.Store.AttachGuard(r.Context(), att, actorOf(r))
|
||||
} else {
|
||||
changed, err = a.guard.Store.DetachGuard(r.Context(), att)
|
||||
}
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if !changed {
|
||||
writeError(w, http.StatusNotFound, "no such attachment")
|
||||
return
|
||||
}
|
||||
if a.guard.Invalidate != nil {
|
||||
a.guard.Invalidate()
|
||||
}
|
||||
writeJSON(w, http.StatusOK, att)
|
||||
}
|
||||
}
|
||||
mux.HandleFunc("POST /api/v1/guard/attachments", change(true))
|
||||
mux.HandleFunc("DELETE /api/v1/guard/attachments", change(false))
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package adminapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/guard"
|
||||
)
|
||||
|
||||
type memGuard struct{ att []guard.Attachment }
|
||||
|
||||
func (m *memGuard) GuardAttachments(context.Context) ([]guard.Attachment, error) { return m.att, nil }
|
||||
func (m *memGuard) AttachGuard(_ context.Context, a guard.Attachment, _ string) error {
|
||||
if !slices.Contains(m.att, a) {
|
||||
m.att = append(m.att, a)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (m *memGuard) DetachGuard(_ context.Context, a guard.Attachment) (bool, error) {
|
||||
n := len(m.att)
|
||||
m.att = slices.DeleteFunc(m.att, func(x guard.Attachment) bool { return x == a })
|
||||
return len(m.att) < n, nil
|
||||
}
|
||||
|
||||
func TestGuardPoliciesAreAttachedByTarget(t *testing.T) {
|
||||
a, _ := setup(t, testModels())
|
||||
if code := call(t, a, "GET", "/api/v1/guard", "", nil); code != 501 {
|
||||
t.Errorf("without policies: %d", code)
|
||||
}
|
||||
st := &memGuard{}
|
||||
invalidated := 0
|
||||
a.SetGuard(&GuardAdmin{
|
||||
Library: guard.Config{Default: []string{"base"}, Policies: map[string]guard.Policy{"base": {}, "finance": {}}},
|
||||
Store: st, Invalidate: func() { invalidated++ },
|
||||
})
|
||||
if code := call(t, a, "POST", "/api/v1/guard/attachments", `{"target":"key:k1","policy":"finance"}`, nil); code != 200 {
|
||||
t.Fatalf("attach: %d", code)
|
||||
}
|
||||
if invalidated != 1 || len(st.att) != 1 || st.att[0] != (guard.Attachment{Scope: "key", ScopeID: "k1", Policy: "finance"}) {
|
||||
t.Errorf("stored %v, invalidated %d", st.att, invalidated)
|
||||
}
|
||||
for _, bad := range []string{`{"target":"key:k1","policy":"nope"}`, `{"target":"galaxy:x","policy":"finance"}`, `{"target":"key:","policy":"finance"}`} {
|
||||
if code := call(t, a, "POST", "/api/v1/guard/attachments", bad, nil); code != 400 {
|
||||
t.Errorf("%s: %d", bad, code)
|
||||
}
|
||||
}
|
||||
var v GuardView
|
||||
if code := call(t, a, "GET", "/api/v1/guard", "", &v); code != 200 || len(v.Attachments) != 1 ||
|
||||
!slices.Equal(v.Policies, []string{"base", "finance"}) || !slices.Equal(v.Default, []string{"base"}) {
|
||||
t.Errorf("%d %+v", code, v)
|
||||
}
|
||||
if code := call(t, a, "DELETE", "/api/v1/guard/attachments", `{"target":"key:k1","policy":"finance"}`, nil); code != 200 || len(st.att) != 0 {
|
||||
t.Errorf("detach: %d %v", code, st.att)
|
||||
}
|
||||
if code := call(t, a, "DELETE", "/api/v1/guard/attachments", `{"target":"key:k1","policy":"finance"}`, nil); code != 404 {
|
||||
t.Errorf("detach again: %d", code)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user