diff --git a/internal/core/contribute.go b/internal/core/contribute.go index bc3af34..ef8b381 100644 --- a/internal/core/contribute.go +++ b/internal/core/contribute.go @@ -56,26 +56,11 @@ func (s *Handlers) pageContribute(w http.ResponseWriter, r *http.Request) { http.Error(w, "could not load commands", http.StatusInternalServerError) return } - // Reuse the per-tier grouping; only commands in at least one tier are shown. - groups := groupPermissions(catalog, idSet(adminIDs), idSet(memberIDs)) - var envelope []permGroup - for _, g := range groups { - var cmds []permChoice - for _, c := range g.Commands { - if c.AdminChecked || c.MemberChecked { - cmds = append(cmds, c) - } - } - if len(cmds) > 0 { - envelope = append(envelope, permGroup{Name: g.Name, Commands: cmds}) - } - } - data := map[string]any{ "Repeater": rep, "Org": org, "Version": version, - "Envelope": envelope, + "Envelope": permEnvelope(catalog, idSet(adminIDs), idSet(memberIDs)), } // If already contributed and behind the current version, show what changed @@ -104,6 +89,72 @@ func (s *Handlers) pageContribute(w http.ResponseWriter, r *http.Request) { s.Render(w, r, "contribute.html", data) } +// permEnvelope groups the catalog by category, keeping only commands granted to +// at least one tier in the given admin/member id sets — the set of commands a +// permission version actually allows. +func permEnvelope(catalog []*store.Command, adminSet, memberSet map[int64]bool) []permGroup { + var envelope []permGroup + for _, g := range groupPermissions(catalog, adminSet, memberSet) { + var cmds []permChoice + for _, c := range g.Commands { + if c.AdminChecked || c.MemberChecked { + cmds = append(cmds, c) + } + } + if len(cmds) > 0 { + envelope = append(envelope, permGroup{Name: g.Name, Commands: cmds}) + } + } + return envelope +} + +// pageConsented shows, read-only, the exact commands this repeater is currently +// consented to grant the org — the detail behind "consented to vN" on the +// sharing page. It renders the consented version, which may lag the org's +// current one. +func (s *Handlers) pageConsented(w http.ResponseWriter, r *http.Request) { + rep, orgID, ok := s.orgContext(w, r) + if !ok { + return + } + org, err := s.Store.GetOrg(r.Context(), orgID) + if err != nil { + http.NotFound(w, r) + return + } + cvID, contributed, err := s.Store.ConsentedVersionID(r.Context(), orgID, rep.ID) + if err != nil || !contributed { + http.NotFound(w, r) // not contributed → nothing consented to view + return + } + version, err := s.Store.VersionNumber(r.Context(), cvID) + if err != nil { + http.Error(w, "could not load policy", http.StatusInternalServerError) + return + } + adminIDs, memberIDs, err := s.Store.VersionCommandIDs(r.Context(), cvID) + if err != nil { + http.Error(w, "could not load policy", http.StatusInternalServerError) + return + } + catalog, err := s.Store.ListCommands(r.Context()) + if err != nil { + http.Error(w, "could not load commands", http.StatusInternalServerError) + return + } + data := map[string]any{ + "Repeater": rep, + "Org": org, + "Version": version, + "Envelope": permEnvelope(catalog, idSet(adminIDs), idSet(memberIDs)), + } + // Note (with a re-consent link) when the org has moved past this version. + if _, current, err := s.Store.CurrentVersion(r.Context(), orgID); err == nil && current > version { + data["CurrentVersion"] = current + } + s.Render(w, r, "consented.html", data) +} + // union returns the set union of two id sets. func union(a, b map[int64]bool) map[int64]bool { out := make(map[int64]bool, len(a)+len(b)) diff --git a/internal/core/templates/consented.html b/internal/core/templates/consented.html new file mode 100644 index 0000000..fbb5a72 --- /dev/null +++ b/internal/core/templates/consented.html @@ -0,0 +1,45 @@ +{{define "title"}}{{.Repeater.Name}} · {{.Org.Name}} commands · MeshTender{{end}} +{{define "header"}} +
+
+
Consented to {{.Org.Name}} · v{{.Version}}
+

{{.Repeater.Name}}

+
+
+{{end}} +{{define "content"}} +
+
+

+ These are the commands {{.Org.Name}}'s admins and members can run on this repeater over the mesh — the + policy you consented to (v{{.Version}}). Org-admins also get everything members get. +

+ + {{if .CurrentVersion}} +
+ {{.Org.Name}} has since published v{{.CurrentVersion}}. This repeater stays on v{{.Version}} until you + review the changes and re-consent. +
+ {{end}} + + {{if .Envelope}} + {{range .Envelope}} +
+
{{.Name}}
+ {{range .Commands}} +
+ {{.Template}}{{if .Risky}} risky{{end}} + {{if .AdminChecked}}admin{{end}} + {{if .MemberChecked}}member{{end}} +
+ {{end}} +
+ {{end}} + {{else}} +

This version grants no commands.

+ {{end}} + + {{template "icon-arrow-left" "me-1"}}Back to sharing +
+
+{{end}} diff --git a/internal/core/templates/share.html b/internal/core/templates/share.html index 9919ad0..f666cc3 100644 --- a/internal/core/templates/share.html +++ b/internal/core/templates/share.html @@ -34,7 +34,7 @@ {{range .Contributed}}
{{.OrgName}} - consented to v{{.ConsentedVersion}}{{if .NeedsReconsent}} · org is now on v{{.CurrentVersion}}{{end}} + consented to v{{.ConsentedVersion}}{{if .NeedsReconsent}} · org is now on v{{.CurrentVersion}}{{end}} {{if .NeedsReconsent}} Review changes {{end}} diff --git a/internal/core/web.go b/internal/core/web.go index 05db28b..12f77b6 100644 --- a/internal/core/web.go +++ b/internal/core/web.go @@ -140,6 +140,7 @@ func (s *Handlers) appRouter() chi.Router { r.Post("/repeaters/{id}/unshare", s.handleUnshare) r.Get("/repeaters/{id}/share/{userID}/commands", s.pageShareCommands) r.Post("/repeaters/{id}/share/{userID}/commands", s.handleSetShareCommands) + r.Get("/repeaters/{id}/orgs/{orgID}/consented", s.pageConsented) r.Get("/repeaters/{id}/orgs/{orgID}/contribute", s.pageContribute) r.Post("/repeaters/{id}/orgs/{orgID}/contribute", s.handleContribute) r.Post("/repeaters/{id}/orgs/{orgID}/withdraw", s.handleWithdraw)