diff --git a/internal/contracts/state/v1/state.pb.go b/internal/contracts/state/v1/state.pb.go index bc14c3f41..2c197f67a 100644 --- a/internal/contracts/state/v1/state.pb.go +++ b/internal/contracts/state/v1/state.pb.go @@ -14033,12 +14033,15 @@ func (x *GetOrgResponse) GetOrg() *Org { return nil } +// CreateOrgRequest creates an org with its default workspace and its first +// owner. Only an instance admin may. type CreateOrgRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + OwnerIdentityId string `protobuf:"bytes,3,opt,name=owner_identity_id,json=ownerIdentityId,proto3" json:"owner_identity_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CreateOrgRequest) Reset() { @@ -14085,6 +14088,13 @@ func (x *CreateOrgRequest) GetName() string { return "" } +func (x *CreateOrgRequest) GetOwnerIdentityId() string { + if x != nil { + return x.OwnerIdentityId + } + return "" +} + type CreateOrgResponse struct { state protoimpl.MessageState `protogen:"open.v1"` Org *Org `protobuf:"bytes,1,opt,name=org,proto3" json:"org,omitempty"` @@ -15627,10 +15637,11 @@ const file_state_v1_state_proto_rawDesc = "" + "\rGetOrgRequest\x12\x15\n" + "\x06org_id\x18\x01 \x01(\tR\x05orgId\"1\n" + "\x0eGetOrgResponse\x12\x1f\n" + - "\x03org\x18\x01 \x01(\v2\r.state.v1.OrgR\x03org\"6\n" + + "\x03org\x18\x01 \x01(\v2\r.state.v1.OrgR\x03org\"b\n" + "\x10CreateOrgRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" + - "\x04name\x18\x02 \x01(\tR\x04name\"4\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12*\n" + + "\x11owner_identity_id\x18\x03 \x01(\tR\x0fownerIdentityId\"4\n" + "\x11CreateOrgResponse\x12\x1f\n" + "\x03org\x18\x01 \x01(\v2\r.state.v1.OrgR\x03org\".\n" + "\x15ListWorkspacesRequest\x12\x15\n" + diff --git a/internal/domain/access/request.go b/internal/domain/access/request.go index 12bb5700e..4cefaeb82 100644 --- a/internal/domain/access/request.go +++ b/internal/domain/access/request.go @@ -73,6 +73,17 @@ func (p Principal) Role(ws org.WorkspaceID) org.Role { return orgRole } +// InstanceAdmin reports whether the principal owns the default org (org-sys): +// its owners administer the whole instance, whichever org they act in. +func (p Principal) InstanceAdmin() bool { + for _, m := range p.Memberships { + if m.OrgID == org.DefaultOrgID && m.WorkspaceID == "" && m.Role == org.RoleOwner { + return true + } + } + return false +} + // Resource is the record acted on: its type, its workspace and org as // parents, its owner and its state. type Resource struct { diff --git a/internal/domain/org/store.go b/internal/domain/org/store.go index e44ff19ad..1a0f753bb 100644 --- a/internal/domain/org/store.go +++ b/internal/domain/org/store.go @@ -12,8 +12,9 @@ import ( // Repository persists the tenant boundary. A store that implements it owns // ID conflict rules (org and workspace IDs are caller-provided and unique). type Repository interface { //nolint:interfacebloat // one tenant-boundary store contract: orgs, workspaces, memberships and agent assignments - // CreateOrg inserts a new org; re-creating an existing ID is an error. - CreateOrg(context.Context, Org) (Org, error) + // CreateOrg inserts a new org with its default workspace and owner; + // re-creating an existing ID is an error. + CreateOrg(context.Context, Org, identity.IdentityID) (Org, error) // GetOrg returns one org by ID, or ErrOrgNotFound. GetOrg(context.Context, OrgID) (Org, error) // ListOrgs returns every org, oldest first. @@ -55,6 +56,12 @@ type API interface { AssignAgent(context.Context, AgentAssignment) error } +// Creator makes an org with its default workspace and first owner, the one +// instance-admin write the dashboard carries. +type Creator interface { + CreateOrg(context.Context, Org, identity.IdentityID) (Org, error) +} + // Upgrader performs the resumable default org/workspace upgrade. // It runs in // the State Store first, then in the event store, each phase resumable from diff --git a/internal/infrastructure/postgres/orgs.go b/internal/infrastructure/postgres/orgs.go index 981c521cd..598fcfd22 100644 --- a/internal/infrastructure/postgres/orgs.go +++ b/internal/infrastructure/postgres/orgs.go @@ -24,20 +24,40 @@ func orgFromRow(o postgresdb.Org) org.Org { return org.Org{ID: org.OrgID(o.ID), Name: o.Name} } -// CreateOrg inserts a new org; re-creating an existing ID is ErrOrgExists. -func (s *Store) CreateOrg(ctx context.Context, value org.Org) (org.Org, error) { +// CreateOrg inserts a new org, its default workspace and its owner in one +// transaction, so an org never exists without someone who can act in it. +// Re-creating an existing ID is ErrOrgExists. +func (s *Store) CreateOrg(ctx context.Context, value org.Org, owner identity.IdentityID) (org.Org, error) { if err := value.Validate(); err != nil { return org.Org{}, err } - if err := s.queries().InsertOrg(ctx, postgresdb.InsertOrgParams{ - ID: string(value.ID), Name: value.Name, - }); err != nil { + membership := org.Membership{IdentityID: owner, OrgID: value.ID, Role: org.RoleOwner} + if err := membership.Validate(); err != nil { + return org.Org{}, err + } + tx, err := s.pool.Begin(ctx) + if err != nil { + return org.Org{}, err + } + defer func() { _ = tx.Rollback(ctx) }() + q := postgresdb.New(tx) + if err := q.InsertOrg(ctx, postgresdb.InsertOrgParams{ID: string(value.ID), Name: value.Name}); err != nil { if isUniqueViolation(err) { return org.Org{}, fmt.Errorf("%w: %s", org.ErrOrgExists, value.ID) } return org.Org{}, err } - return value, nil + if err := q.InsertWorkspace(ctx, postgresdb.InsertWorkspaceParams{ + ID: string(org.DefaultWorkspaceID), OrgID: string(value.ID), Name: "Default", + }); err != nil { + return org.Org{}, err + } + if err := q.EnsureMembership(ctx, postgresdb.EnsureMembershipParams{ + IdentityID: string(owner), OrgID: string(value.ID), Role: string(org.RoleOwner), + }); err != nil { + return org.Org{}, err + } + return value, tx.Commit(ctx) } // GetOrg returns one org by ID, or ErrOrgNotFound. diff --git a/internal/infrastructure/postgres/orgs_test.go b/internal/infrastructure/postgres/orgs_test.go index 846aca305..d304a186f 100644 --- a/internal/infrastructure/postgres/orgs_test.go +++ b/internal/infrastructure/postgres/orgs_test.go @@ -15,9 +15,6 @@ import ( func TestOrgStoreMembers(t *testing.T) { ctx := t.Context() db := pgstore.Open(t) - if _, err := db.CreateOrg(ctx, org.Org{ID: "acme", Name: "Acme"}); err != nil { - t.Fatalf("create org: %v", err) - } for _, id := range []string{"sam", "bot"} { kind := identity.KindUser name := "Sam" @@ -28,6 +25,9 @@ func TestOrgStoreMembers(t *testing.T) { t.Fatalf("create identity %s: %v", id, err) } } + if _, err := db.CreateOrg(ctx, org.Org{ID: "acme", Name: "Acme"}, "sam"); err != nil { + t.Fatalf("create org: %v", err) + } if err := db.EnsureMembership(ctx, org.Membership{IdentityID: "sam", OrgID: "acme", Role: org.RoleDeveloper}); err != nil { t.Fatalf("ensure membership: %v", err) diff --git a/internal/infrastructure/staterpc/orgs.go b/internal/infrastructure/staterpc/orgs.go index f86bf44b8..f14d617ac 100644 --- a/internal/infrastructure/staterpc/orgs.go +++ b/internal/infrastructure/staterpc/orgs.go @@ -3,11 +3,13 @@ package staterpc import ( "context" "errors" + "slices" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" pb "github.com/samcharles93/archie-core/internal/contracts/state/v1" + "github.com/samcharles93/archie-core/internal/domain/access" "github.com/samcharles93/archie-core/internal/domain/identity" "github.com/samcharles93/archie-core/internal/domain/org" ) @@ -69,6 +71,11 @@ func (s *server) ListOrgs(ctx context.Context, _ *pb.ListOrgsRequest) (*pb.ListO if err != nil { return nil, s.orgErr("ListOrgs", err) } + // Only an instance admin sees every org; anyone else sees their own. + if p, ok := access.PrincipalFromContext(ctx); !ok || !p.InstanceAdmin() { + caller := org.OrgFromContext(ctx) + values = slices.DeleteFunc(values, func(o org.Org) bool { return o.ID != caller }) + } out := make([]*pb.Org, len(values)) for i := range values { out[i] = orgProto(values[i]) @@ -78,13 +85,25 @@ func (s *server) ListOrgs(ctx context.Context, _ *pb.ListOrgsRequest) (*pb.ListO // orgInForce is the org a request is served for: the one the caller's // principal carries. A request field cannot choose another tenant. -func orgInForce(ctx context.Context) org.OrgID { return org.OrgFromContext(ctx) } +// orgFor is the org a request acts in: the caller's own, or the one it names +// when the caller is an instance admin. Anyone else naming another org still +// acts in their own, so the contract cannot reach another tenant. +func orgFor(ctx context.Context, requested string) org.OrgID { + caller := org.OrgFromContext(ctx) + if requested == "" || org.OrgID(requested) == caller { + return caller + } + if p, ok := access.PrincipalFromContext(ctx); ok && p.InstanceAdmin() { + return org.OrgID(requested) + } + return caller +} -func (s *server) GetOrg(ctx context.Context, _ *pb.GetOrgRequest) (*pb.GetOrgResponse, error) { +func (s *server) GetOrg(ctx context.Context, r *pb.GetOrgRequest) (*pb.GetOrgResponse, error) { if s.deps.Orgs == nil { return nil, errOrgsUnavailable } - value, err := s.deps.Orgs.GetOrg(ctx, orgInForce(ctx)) + value, err := s.deps.Orgs.GetOrg(ctx, orgFor(ctx, r.GetOrgId())) if err != nil { return nil, s.orgErr("GetOrg", err) } @@ -95,18 +114,27 @@ func (s *server) CreateOrg(ctx context.Context, r *pb.CreateOrgRequest) (*pb.Cre if s.deps.Orgs == nil { return nil, errOrgsUnavailable } - value, err := s.deps.Orgs.CreateOrg(ctx, orgValue(&pb.Org{Id: r.GetId(), Name: r.GetName()})) + if p, ok := access.PrincipalFromContext(ctx); !ok || !p.InstanceAdmin() { + return nil, status.Error(codes.PermissionDenied, "only an instance admin creates orgs") + } + value, err := s.deps.Orgs.CreateOrg(ctx, orgValue(&pb.Org{Id: r.GetId(), Name: r.GetName()}), identity.IdentityID(r.GetOwnerIdentityId())) if err != nil { return nil, s.orgErr("CreateOrg", err) } + // The new org's role policies are what let its owner act in it. + if s.deps.Policies != nil { + if err := s.deps.Policies.EnsureShippedOrgPolicies(ctx, value.ID); err != nil { + return nil, s.logErr("CreateOrg policies", err) + } + } return &pb.CreateOrgResponse{Org: orgProto(value)}, nil } -func (s *server) ListWorkspaces(ctx context.Context, _ *pb.ListWorkspacesRequest) (*pb.ListWorkspacesResponse, error) { +func (s *server) ListWorkspaces(ctx context.Context, r *pb.ListWorkspacesRequest) (*pb.ListWorkspacesResponse, error) { if s.deps.Orgs == nil { return nil, errOrgsUnavailable } - values, err := s.deps.Orgs.ListWorkspaces(ctx, orgInForce(ctx)) + values, err := s.deps.Orgs.ListWorkspaces(ctx, orgFor(ctx, r.GetOrgId())) if err != nil { return nil, s.orgErr("ListWorkspaces", err) } @@ -121,7 +149,7 @@ func (s *server) CreateWorkspace(ctx context.Context, r *pb.CreateWorkspaceReque if s.deps.Orgs == nil { return nil, errOrgsUnavailable } - value := workspaceValue(&pb.Workspace{Id: r.GetId(), OrgId: string(orgInForce(ctx)), Name: r.GetName(), Environment: r.GetEnvironment()}) + value := workspaceValue(&pb.Workspace{Id: r.GetId(), OrgId: string(orgFor(ctx, r.GetOrgId())), Name: r.GetName(), Environment: r.GetEnvironment()}) created, err := s.deps.Orgs.CreateWorkspace(ctx, value) if err != nil { return nil, s.orgErr("CreateWorkspace", err) @@ -129,11 +157,11 @@ func (s *server) CreateWorkspace(ctx context.Context, r *pb.CreateWorkspaceReque return &pb.CreateWorkspaceResponse{Workspace: workspaceProto(created)}, nil } -func (s *server) ListMembers(ctx context.Context, _ *pb.ListMembersRequest) (*pb.ListMembersResponse, error) { +func (s *server) ListMembers(ctx context.Context, r *pb.ListMembersRequest) (*pb.ListMembersResponse, error) { if s.deps.Orgs == nil { return nil, errOrgsUnavailable } - values, err := s.deps.Orgs.ListMembers(ctx, orgInForce(ctx)) + values, err := s.deps.Orgs.ListMembers(ctx, orgFor(ctx, r.GetOrgId())) if err != nil { return nil, s.orgErr("ListMembers", err) } @@ -150,7 +178,7 @@ func (s *server) SetMembership(ctx context.Context, r *pb.SetMembershipRequest) } err := s.deps.Orgs.EnsureMembership(ctx, org.Membership{ IdentityID: identity.IdentityID(r.GetIdentityId()), - OrgID: orgInForce(ctx), + OrgID: orgFor(ctx, r.GetOrgId()), WorkspaceID: org.WorkspaceID(r.GetWorkspaceId()), Role: org.Role(r.GetRole()), }) @@ -166,7 +194,7 @@ func (s *server) RemoveMembership(ctx context.Context, r *pb.RemoveMembershipReq } err := s.deps.Orgs.RemoveMembership(ctx, org.Membership{ IdentityID: identity.IdentityID(r.GetIdentityId()), - OrgID: orgInForce(ctx), + OrgID: orgFor(ctx, r.GetOrgId()), WorkspaceID: org.WorkspaceID(r.GetWorkspaceId()), }) if err != nil { @@ -181,7 +209,7 @@ func (s *server) AssignAgent(ctx context.Context, r *pb.AssignAgentRequest) (*pb } err := s.deps.Orgs.AssignAgent(ctx, org.AgentAssignment{ IdentityID: identity.IdentityID(r.GetIdentityId()), - OrgID: orgInForce(ctx), + OrgID: orgFor(ctx, r.GetOrgId()), }) if err != nil { return nil, s.orgErr("AssignAgent", err) diff --git a/internal/infrastructure/staterpc/orgs_client.go b/internal/infrastructure/staterpc/orgs_client.go index ff75a2faa..2f92d5dd6 100644 --- a/internal/infrastructure/staterpc/orgs_client.go +++ b/internal/infrastructure/staterpc/orgs_client.go @@ -11,8 +11,8 @@ import ( // The Client serves the dashboard's org surface over the contract. var _ org.API = (*Client)(nil) -func (c *Client) CreateOrg(ctx context.Context, value org.Org) (org.Org, error) { - r, err := c.client.CreateOrg(ctx, &pb.CreateOrgRequest{Id: string(value.ID), Name: value.Name}) +func (c *Client) CreateOrg(ctx context.Context, value org.Org, owner identity.IdentityID) (org.Org, error) { + r, err := c.client.CreateOrg(ctx, &pb.CreateOrgRequest{Id: string(value.ID), Name: value.Name, OwnerIdentityId: string(owner)}) if err != nil { return org.Org{}, unmapError(err) } diff --git a/internal/infrastructure/staterpc/orgs_test.go b/internal/infrastructure/staterpc/orgs_test.go index dabb8cf71..45d79a264 100644 --- a/internal/infrastructure/staterpc/orgs_test.go +++ b/internal/infrastructure/staterpc/orgs_test.go @@ -22,7 +22,9 @@ type fakeOrgs struct { agents []org.AgentAssignment } -func (*fakeOrgs) CreateOrg(_ context.Context, value org.Org) (org.Org, error) { return value, nil } +func (*fakeOrgs) CreateOrg(_ context.Context, value org.Org, _ identity.IdentityID) (org.Org, error) { + return value, nil +} func (*fakeOrgs) GetOrg(_ context.Context, id org.OrgID) (org.Org, error) { return org.Org{ID: id, Name: "Acme"}, nil diff --git a/internal/webui/api_access_policies.go b/internal/webui/api_access_policies.go index 0765e2292..f78330489 100644 --- a/internal/webui/api_access_policies.go +++ b/internal/webui/api_access_policies.go @@ -122,5 +122,5 @@ func instanceOwner(r *http.Request) bool { if !ok { principal = access.SharedTokenOwner() } - return principal.Org == org.DefaultOrgID && principal.Role("") == org.RoleOwner + return principal.InstanceAdmin() } diff --git a/internal/webui/api_access_policies_test.go b/internal/webui/api_access_policies_test.go index dfec38608..edb1e3a83 100644 --- a/internal/webui/api_access_policies_test.go +++ b/internal/webui/api_access_policies_test.go @@ -37,13 +37,13 @@ func TestInstanceOwner(t *testing.T) { {"a developer of org-sys is not the instance owner", memberOf("dev", org.DefaultOrgID, org.RoleDeveloper), true, false}, {"an owner of another org is not the instance owner", memberOf("other", "acme", org.RoleOwner), true, false}, { - "an org-sys owner membership while serving another org is not the instance owner", + "an org-sys owner acting in another org is still the instance owner", access.Principal{ IdentityID: "other", Org: "acme", Memberships: []org.Membership{{IdentityID: "other", OrgID: org.DefaultOrgID, Role: org.RoleOwner}}, }, - true, false, + true, true, }, } for _, tt := range tests { diff --git a/internal/webui/api_orgs.go b/internal/webui/api_orgs.go index c602679bb..bedd27685 100644 --- a/internal/webui/api_orgs.go +++ b/internal/webui/api_orgs.go @@ -19,20 +19,19 @@ func (s *Server) orgReady(w http.ResponseWriter) bool { return true } -// orgInPath resolves the route's {id}, requiring it to be the caller's own -// org: the dashboard has no instance-admin view yet, so a path that names -// another tenant reads as not found rather than leaking it. +// orgInPath resolves the route's {id}: the caller's own org, or any org for +// an instance admin. Another tenant reads as not found rather than leaking. func (s *Server) orgInPath(w http.ResponseWriter, r *http.Request) (org.OrgID, bool) { - caller := policyOrg(r) - if r.PathValue("id") != string(caller) { + id := org.OrgID(r.PathValue("id")) + if id != policyOrg(r) && !instanceOwner(r) { http.Error(w, "org not found", http.StatusNotFound) return "", false } - return caller, true + return id, true } -// handleOrgsList lists the caller's org only. The State Store contract lists -// every org; instance-admin widening is a later change. +// handleOrgsList lists every org to an instance admin and the caller's own +// to anyone else. func (s *Server) handleOrgsList(w http.ResponseWriter, r *http.Request) { if !s.orgReady(w) { return @@ -45,13 +44,52 @@ func (s *Server) handleOrgsList(w http.ResponseWriter, r *http.Request) { caller := policyOrg(r) out := []org.Org{} for _, value := range values { - if value.ID == caller { + if value.ID == caller || instanceOwner(r) { out = append(out, value) } } writeJSON(w, map[string]any{"orgs": out}) } +// handleOrgCreate creates an org with its default workspace and first owner. +// Only an instance admin may. +func (s *Server) handleOrgCreate(w http.ResponseWriter, r *http.Request) { + if !s.orgReady(w) { + return + } + if !instanceOwner(r) { + http.Error(w, "only an instance admin creates orgs", http.StatusForbidden) + return + } + creator, ok := s.Orgs.(org.Creator) + if !ok { + http.Error(w, "org creation unavailable", http.StatusServiceUnavailable) + return + } + var request struct { + ID string `json:"id"` + Name string `json:"name"` + OwnerIdentity string `json:"owner_identity"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 16<<10)).Decode(&request); err != nil { + http.Error(w, "invalid org: "+err.Error(), http.StatusBadRequest) + return + } + created, err := creator.CreateOrg(r.Context(), org.Org{ID: org.OrgID(request.ID), Name: request.Name}, identity.IdentityID(request.OwnerIdentity)) + if err != nil { + writeOrgError(w, err) + return + } + // The new org's role policies were seeded; load them so its owner can act. + if s.ReloadAccess != nil { + if err := s.ReloadAccess(r.Context()); err != nil { + s.logf("reload access after org create", "err", err) + } + } + w.WriteHeader(http.StatusCreated) + writeJSON(w, map[string]any{"org": created}) +} + func (s *Server) handleOrgGet(w http.ResponseWriter, r *http.Request) { if !s.orgReady(w) { return diff --git a/internal/webui/api_orgs_test.go b/internal/webui/api_orgs_test.go index df6ac14ec..ee6416fa3 100644 --- a/internal/webui/api_orgs_test.go +++ b/internal/webui/api_orgs_test.go @@ -35,6 +35,15 @@ func newFakeOrgs() *fakeOrgs { func (f *fakeOrgs) ListOrgs(context.Context) ([]org.Org, error) { return f.orgs, nil } +func (f *fakeOrgs) CreateOrg(_ context.Context, value org.Org, owner identity.IdentityID) (org.Org, error) { + if err := value.Validate(); err != nil { + return org.Org{}, err + } + f.orgs = append(f.orgs, value) + f.members[value.ID] = []org.Member{{IdentityID: owner, Role: org.RoleOwner}} + return value, nil +} + func (f *fakeOrgs) GetOrg(_ context.Context, id org.OrgID) (org.Org, error) { for _, o := range f.orgs { if o.ID == id { @@ -97,6 +106,7 @@ func (f *fakeOrgs) AssignAgent(_ context.Context, value org.AgentAssignment) err func orgRoutes(s *Server) http.Handler { mux := http.NewServeMux() mux.HandleFunc("GET /api/orgs", s.handleOrgsList) + mux.HandleFunc("POST /api/orgs", s.handleOrgCreate) mux.HandleFunc("GET /api/orgs/{id}", s.handleOrgGet) mux.HandleFunc("GET /api/orgs/{id}/workspaces", s.handleOrgWorkspacesList) mux.HandleFunc("POST /api/orgs/{id}/workspaces", s.handleOrgWorkspaceCreate) @@ -218,3 +228,62 @@ func TestOrgMembershipNeedsItsRole(t *testing.T) { }) } } + +// TestInstanceAdminOrgs holds the instance-admin boundary: an owner of org-sys +// lists and opens every org and creates one with its owner; an admin of +// org-sys sees only its own org and cannot create one. +func TestInstanceAdminOrgs(t *testing.T) { + engine, err := infraaccess.New(access.ShippedOrgPolicies(org.DefaultOrgID)) + if err != nil { + t.Fatal(err) + } + tests := []struct { + name string + caller string + method string + path string + body string + wantStatus int + wantBody string + }{ + {"an instance admin lists every org", "owner", http.MethodGet, "/api/orgs", "", http.StatusOK, "acme"}, + {"anyone else lists only their own", "admin", http.MethodGet, "/api/orgs", "", http.StatusOK, string(org.DefaultOrgID)}, + {"an instance admin opens another org", "owner", http.MethodGet, "/api/orgs/acme/members", "", http.StatusOK, "boss"}, + {"anyone else does not", "admin", http.MethodGet, "/api/orgs/acme/members", "", http.StatusNotFound, ""}, + {"an instance admin creates an org with its owner", "owner", http.MethodPost, "/api/orgs", `{"id":"beta","name":"Beta","owner_identity":"sam"}`, http.StatusCreated, "beta"}, + {"anyone else cannot", "admin", http.MethodPost, "/api/orgs", `{"id":"beta","name":"Beta","owner_identity":"sam"}`, http.StatusForbidden, ""}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + orgs := newFakeOrgs() + orgs.orgs = append(orgs.orgs, org.Org{ID: "acme", Name: "Acme"}) + orgs.members["acme"] = []org.Member{{IdentityID: "boss", Role: org.RoleOwner}} + s := &Server{ + Access: engine, Principals: rolePrincipals{}, Orgs: orgs, + Authenticate: func(_ context.Context, token string) (identity.Identity, error) { + return identity.Identity{ID: identity.IdentityID(token), Kind: identity.KindUser}, nil + }, + } + var body io.Reader + if tt.body != "" { + body = strings.NewReader(tt.body) + } + req := httptest.NewRequestWithContext(t.Context(), tt.method, tt.path, body) + req.Header.Set("Authorization", "Bearer "+tt.caller) + if tt.body != "" { + req.Header.Set("Content-Type", "application/json") + } + rec := httptest.NewRecorder() + orgRoutes(s).ServeHTTP(rec, req) + if rec.Code != tt.wantStatus { + t.Fatalf("status = %d, want %d, body %s", rec.Code, tt.wantStatus, rec.Body.String()) + } + if tt.wantBody != "" && !strings.Contains(rec.Body.String(), tt.wantBody) { + t.Fatalf("body = %s, want %q", rec.Body.String(), tt.wantBody) + } + if tt.caller == "admin" && tt.path == "/api/orgs" && strings.Contains(rec.Body.String(), "acme") { + t.Fatalf("a non-admin saw another org: %s", rec.Body.String()) + } + }) + } +} diff --git a/internal/webui/server.go b/internal/webui/server.go index 1745a3d61..017c83d1b 100644 --- a/internal/webui/server.go +++ b/internal/webui/server.go @@ -331,6 +331,7 @@ func (s *Server) registerConfigAndLogRoutes(mux *http.ServeMux) { mux.HandleFunc("GET /api/control-plane/audit", s.handleAudit) mux.HandleFunc("GET /api/identities", s.handleIdentitiesList) mux.HandleFunc("GET /api/orgs", s.handleOrgsList) + mux.HandleFunc("POST /api/orgs", s.handleOrgCreate) mux.HandleFunc("GET /api/orgs/{id}", s.handleOrgGet) mux.HandleFunc("GET /api/orgs/{id}/workspaces", s.handleOrgWorkspacesList) mux.HandleFunc("POST /api/orgs/{id}/workspaces", s.handleOrgWorkspaceCreate) diff --git a/proto/state/v1/state.proto b/proto/state/v1/state.proto index 5e4932bd4..c4630d062 100644 --- a/proto/state/v1/state.proto +++ b/proto/state/v1/state.proto @@ -1398,9 +1398,12 @@ message ListOrgsRequest {} message ListOrgsResponse { repeated Org orgs = 1; } message GetOrgRequest { string org_id = 1; } message GetOrgResponse { Org org = 1; } +// CreateOrgRequest creates an org with its default workspace and its first +// owner. Only an instance admin may. message CreateOrgRequest { string id = 1; string name = 2; + string owner_identity_id = 3; } message CreateOrgResponse { Org org = 1; } message ListWorkspacesRequest { string org_id = 1; } diff --git a/ui/dist/assets/index.js b/ui/dist/assets/index.js index faa0807b5..a71ba4532 100644 --- a/ui/dist/assets/index.js +++ b/ui/dist/assets/index.js @@ -3,7 +3,7 @@ var e=Object.defineProperty,t=(t,n)=>{let r={};for(var i in t)e(r,i,{get:t[i],en `&&(e.tagName===`PRE`||e.tagName===`TEXTAREA`)&&(n=n.slice(1));let{textContent:r}=e;r!==n&&r!==n.replace(/\r\n|\r/g,` `)&&(mi(e,0)||ii(),e.textContent=t.children)}if(d){if(_||b||!o||f&48){let t=e.tagName.includes(`-`),i=e.namespaceURI.includes(`svg`)?`svg`:e.namespaceURI.includes(`MathML`)?`mathml`:void 0;for(let a in d)if(_&&(a.endsWith(`value`)||a===`indeterminate`)||s(a)&&!O(a)||a[0]===`.`||t&&!O(a)||u&&u.includes(a)){if(di(e,a,d[a]))continue;r(e,a,null,d[a],i,n)}}else if(d.onClick)r(e,`onClick`,null,d.onClick,void 0,n);else if(f&4&&$t(d.style))for(let e in d.style)d.style[e]}let x;(x=d&&d.onVnodeBeforeMount)&&hs(x,n,t),h&&lr(t,null,n,`beforeMount`),((x=d&&d.onVnodeMounted)||h||l)&&Go(()=>{x&&hs(x,n,t),l&&g.enter(e),h&&lr(t,null,n,`mounted`)},i)}return e.nextSibling},m=(e,t,r,o,s,c,u)=>{u||=!!t.dynamicChildren;let d=t.children,p=d.length,m=!1;for(let t=0;t
{let{slotScopeIds:c}=t;c&&(i=i?i.concat(c):c);let d=o(e),f=m(a(e),t,d,n,r,i,s);return f&&ci(f)&&f.data===`]`?a(t.anchor=f):(ii(),l(t.anchor=u(`]`),d,f),f)},g=(e,t,r,i,s,l)=>{if(gi(e,t)||ii(),t.el=null,l){let t=_(e);for(;;){let n=a(e);if(n&&n!==t)c(n);else break}}let u=a(e),d=o(e);return c(e),n(null,t,d,u,r,i,si(d),s),r&&(r.vnode.el=t.el,ro(r,t.el)),u},_=(e,t=`[`,n=`]`)=>{let r=0;for(;e;)if(e=a(e),e&&ci(e)&&(e.data===t&&r++,e.data===n)){if(r===0)return a(e);r--}return e},v=(e,t,n)=>{let r=t.parentNode;r&&r.replaceChild(e,t);let i=n;for(;i;)i.vnode.el===t&&(i.vnode.el=i.subTree.el=e),i=i.parent},y=e=>e.nodeType===1&&e.tagName===`TEMPLATE`;return[d,f]}var ui=new Set([`src`,`srcset`,`href`,`poster`]);function di(e,t,n){return ui.has(t)?e.getAttribute(t)===(n==null?null:`${n}`):!1}var fi=`data-allow-mismatch`,pi={0:`text`,1:`children`,2:`class`,3:`style`,4:`attribute`};function mi(e,t){if(t===0||t===1)for(;e&&!e.hasAttribute(fi);)e=e.parentElement;return hi(e&&e.getAttribute(fi),t)}function hi(e,t){if(e==null)return!1;if(e===``)return!0;{let n=e.split(`,`);return t===0&&n.includes(`children`)?!0:n.includes(pi[t])}}function gi(e,t){return mi(e.parentElement,1)||_i(e)||vi(t)}function _i(e){return e.nodeType===1&&hi(e.getAttribute(fi),1)}function vi({props:e}){let t=e&&e[fi];return typeof t==`string`&&hi(t,1)}var yi=de().requestIdleCallback||(e=>setTimeout(e,1)),bi=de().cancelIdleCallback||(e=>clearTimeout(e)),xi=(e=1e4)=>t=>{let n=yi(t,{timeout:e});return()=>bi(n)};function Si(e){let{top:t,left:n,bottom:r,right:i}=e.getBoundingClientRect(),{innerHeight:a,innerWidth:o}=window;return(t>0&&t0&&r0&&ne.slice(1,-1).indexOf(`:`)===-1?void 0:(()=>{let t=e.slice(1,-1),n=t.indexOf(`:`),r=t.slice(0,n);return r?of+r:void 0})(),uf=e=>{let{theme:t,classGroups:n}=e;return df(n,t)},df=(e,t)=>{let n=nf();for(let r in e){let i=e[r];ff(i,n,r,t)}return n},ff=(e,t,n,r)=>{let i=e.length;for(let a=0;a{if(typeof e==`string`){mf(e,t,n);return}if(typeof e==`function`){hf(e,t,n,r);return}gf(e,t,n,r)},mf=(e,t,n)=>{let r=e===``?t:_f(t,e);r.classGroupId=n},hf=(e,t,n,r)=>{if(vf(e)){ff(e(r),t,n,r);return}t.validators===null&&(t.validators=[]),t.validators.push(tf(n,e))},gf=(e,t,n,r)=>{let i=Object.entries(e),a=i.length;for(let e=0;e{let n=e,r=t.split(rf),i=r.length;for(let e=0;e`isThemeGetter`in e&&e.isThemeGetter===!0,yf=e=>{if(e<1)return{get:()=>void 0,set:()=>{}};let t=0,n=Object.create(null),r=Object.create(null),i=(i,a)=>{n[i]=a,t++,t>e&&(t=0,r=n,n=Object.create(null))};return{get(e){let t=n[e];if(t!==void 0)return t;if((t=r[e])!==void 0)return i(e,t),t},set(e,t){e in n?n[e]=t:i(e,t)}}},bf=`!`,xf=`:`,Sf=[],Cf=(e,t,n,r,i)=>({modifiers:e,hasImportantModifier:t,baseClassName:n,maybePostfixModifierPosition:r,isExternal:i}),wf=e=>{let{prefix:t,experimentalParseClassName:n}=e,r=e=>{let t=[],n=0,r=0,i=0,a,o=e.length;for(let s=0;s