oficina / home Public

Use exported origin validator on directory integration stack

Paul Campbell pushed by paul@keymail.dev 1 month ago 3e874a0a5ce3b373bfef9c74796ef4776ae05027 parent cb1fa49

1 file changed, +2 −2

internal/home/directorydata/roster.go +2 −2

Intent

full ledger: feat-roster-http

diff --git a/internal/home/directorydata/roster.go b/internal/home/directorydata/roster.go

index 317cd2c..2023d7f 100644

--- a/internal/home/directorydata/roster.go

+++ b/internal/home/directorydata/roster.go

@@ -42,7 +42,7 @@ type RosterSource struct {

// NewRosterSource creates a read-only source. The caller authenticates operator

// provisioning separately; this constructor never initializes authority.

func NewRosterSource(db *sql.DB, sealer Sealer, cfg Config, directory string) (*RosterSource, error) {

- if !validOrigin(directory) {

+ if !ValidOrigin(directory) {

return nil, ErrInvalid

}

s, err := New(db, sealer, cfg)

@@ -107,7 +107,7 @@ func (s *RosterSource) Read(ctx context.Context, req RosterRequest, now time.Tim

if req.Team != route.TeamSQID {

return fail(404, ErrRosterNotFound)

}

- if state != "live" || !s.store.apps[route.App] || !validOrigin(route.Origin) || !validConsumer(route.ConsumerID) || !validLabel(route.Label) || !s.store.validateRoute(route) {

+ if state != "live" || !s.store.apps[route.App] || !ValidOrigin(route.Origin) || !validConsumer(route.ConsumerID) || !validLabel(route.Label) || !s.store.validateRoute(route) {

return fail(503, ErrUnavailable)

}

p := roster.Page{Version: 1, Type: "page", Directory: s.directory, Consumer: route.ConsumerID, Team: route.TeamSQID, Audience: route.Origin, Fetch: req.Fetch, RequestCursorHash: roster.CursorHash(req.Cursor)}