diff --git a/appview/db/db.go b/appview/db/db.go index b3504a6f..86dfc33b 100644 --- a/appview/db/db.go +++ b/appview/db/db.go @@ -189,9 +189,5 @@ func (d *DB) Register(domain string) error { where domain = ?; `, domain) - if err != nil { - return err - } - - return nil + return err } diff --git a/appview/pages/knot.html b/appview/pages/knot.html new file mode 100644 index 00000000..b57a103e --- /dev/null +++ b/appview/pages/knot.html @@ -0,0 +1,37 @@ +{{define "title"}}knot{{end}} + +{{define "content"}} + back to timeline + back to all knots +
+
+ opened by: {{.Registration.ByDid}}
+ {{ if $.IsOwner }}
+ (you)
+ {{ end }}
+
+ on: {{.Registration.Created}}
+ {{ if .Registration.Registered }}
+ registered on: {{.Registration.Registered}}
+ {{ else }}
+ pending registration
+
+ {{ end }}
+
no members
+ {{ end }} + {{ end }} + + {{ if $.IsOwner }} + add member + {{ end }} +{{end}} diff --git a/appview/pages/knots.html b/appview/pages/knots.html index 1a27112c..b76a8883 100644 --- a/appview/pages/knots.html +++ b/appview/pages/knots.html @@ -13,20 +13,33 @@ -domain: {{.Domain}}domain: {{.Domain}}
opened by: {{.ByDid}}on: {{.Created}}registered on: {{.Registered}}
- {{else}}
+ you don't have any knots yet
+ {{end}} +domain: {{.Domain}}opened by: {{.ByDid}}on: {{.Created}}pending registration
-
- {{end}}
+
no registrations yet
{{end}} diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 15d039e3..90076232 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -66,3 +66,14 @@ type KnotsParams struct { func Knots(w io.Writer, p KnotsParams) error { return parse("knots.html").Execute(w, p) } + +type KnotParams struct { + User *auth.User + Registration *db.Registration + Members []string + IsOwner bool +} + +func Knot(w io.Writer, p KnotParams) error { + return parse("knot.html").Execute(w, p) +} diff --git a/appview/state/middleware.go b/appview/state/middleware.go index c7b0b62c..ddfe981a 100644 --- a/appview/state/middleware.go +++ b/appview/state/middleware.go @@ -7,6 +7,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/xrpc" + "github.com/go-chi/chi/v5" "github.com/sotangled/tangled/appview" "github.com/sotangled/tangled/appview/auth" ) @@ -68,3 +69,33 @@ func AuthMiddleware(s *State) Middleware { }) } } + +func RoleMiddleware(s *State, group string) Middleware { + return func(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // requires auth also + actor := s.auth.GetUser(r) + if actor == nil { + // we need a logged in user + log.Printf("not logged in, redirecting") + http.Error(w, "Forbiden", http.StatusUnauthorized) + return + } + domain := chi.URLParam(r, "domain") + if domain == "" { + http.Error(w, "malformed url", http.StatusBadRequest) + return + } + + ok, err := s.enforcer.E.HasGroupingPolicy(actor.Did, group, domain) + if err != nil || !ok { + // we need a logged in user + log.Printf("%s does not have perms of a %s in domain %s", actor.Did, group, domain) + http.Error(w, "Forbiden", http.StatusUnauthorized) + return + } + + next.ServeHTTP(w, r) + }) + } +} diff --git a/appview/state/state.go b/appview/state/state.go index 1641c2f9..b42ca563 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -7,6 +7,7 @@ import ( "fmt" "log" "net/http" + "strings" "time" comatproto "github.com/bluesky-social/indigo/api/atproto" @@ -283,6 +284,42 @@ func (s *State) InitKnotServer(w http.ResponseWriter, r *http.Request) { w.Write([]byte("check success")) } +func (s *State) KnotServerInfo(w http.ResponseWriter, r *http.Request) { + domain := chi.URLParam(r, "domain") + if domain == "" { + http.Error(w, "malformed url", http.StatusBadRequest) + return + } + + user := s.auth.GetUser(r) + reg, err := s.db.RegistrationByDomain(domain) + if err != nil { + w.Write([]byte("failed to pull up registration info")) + return + } + + var members []string + if reg.Registered != nil { + members, err = s.enforcer.E.GetUsersForRole("server:member", domain) + if err != nil { + w.Write([]byte("failed to fetch member list")) + return + } + } + + ok, err := s.enforcer.E.HasGroupingPolicy(user.Did, "server:owner", domain) + isOwner := err == nil && ok + + p := pages.KnotParams{ + User: user, + Registration: reg, + Members: members, + IsOwner: isOwner, + } + + pages.Knot(w, p) +} + // get knots registered by this user func (s *State) Knots(w http.ResponseWriter, r *http.Request) { // for now, this is just pubkeys @@ -298,6 +335,61 @@ func (s *State) Knots(w http.ResponseWriter, r *http.Request) { }) } +// list members of domain, requires auth and requires owner status +func (s *State) ListMembers(w http.ResponseWriter, r *http.Request) { + domain := chi.URLParam(r, "domain") + if domain == "" { + http.Error(w, "malformed url", http.StatusBadRequest) + return + } + + // list all members for this domain + memberDids, err := s.enforcer.E.GetUsersForRole("server:member", domain) + if err != nil { + w.Write([]byte("failed to fetch member list")) + return + } + + w.Write([]byte(strings.Join(memberDids, "\n"))) + return +} + +// add member to domain, requires auth and requires invite access +func (s *State) AddMember(w http.ResponseWriter, r *http.Request) { + domain := chi.URLParam(r, "domain") + if domain == "" { + http.Error(w, "malformed url", http.StatusBadRequest) + return + } + + memberDid := r.FormValue("member") + if memberDid == "" { + http.Error(w, "malformed form", http.StatusBadRequest) + return + } + + // TODO: validate member did? + memberIdent, err := auth.ResolveIdent(r.Context(), memberDid) + if err != nil { + w.Write([]byte("failed to resolve member did to a handle")) + return + } + + log.Printf("adding %s to %s\n", memberIdent.Handle.String(), domain) + + err = s.enforcer.AddMember(domain, memberDid) + if err != nil { + w.Write([]byte(fmt.Sprint("failed to add member: ", err))) + return + } + + w.Write([]byte(fmt.Sprint("added member: ", memberIdent.Handle.String()))) +} + +// list members of domain, requires auth and requires owner status +func (s *State) RemoveMember(w http.ResponseWriter, r *http.Request) { +} + func buildPingRequest(url, secret string) (*http.Request, error) { pingRequest, err := http.NewRequest("GET", url, nil) if err != nil { @@ -327,8 +419,18 @@ func (s *State) Router() http.Handler { r.Route("/knots", func(r chi.Router) { r.Use(AuthMiddleware(s)) r.Get("/", s.Knots) - r.Post("/init/{domain}", s.InitKnotServer) r.Post("/key", s.RegistrationKey) + + r.Route("/{domain}", func(r chi.Router) { + r.Get("/", s.KnotServerInfo) + r.Post("/init", s.InitKnotServer) + r.Route("/member", func(r chi.Router) { + r.Use(RoleMiddleware(s, "server:owner")) + r.Get("/", s.ListMembers) + r.Put("/", s.AddMember) + r.Delete("/", s.RemoveMember) + }) + }) }) r.Group(func(r chi.Router) {