mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-18 06:32:04 +00:00
5403be7c4b
# Which Problems Are Solved The commands for the resource based v2beta AuthorizationService API are added. Authorizations, previously knows as user grants, give a user in a specific organization and project context roles. The project can be owned or granted. The given roles can be used to restrict access within the projects applications. The commands for the resource based v2beta InteralPermissionService API are added. Administrators, previously knows as memberships, give a user in a specific organization and project context roles. The project can be owned or granted. The give roles give the user permissions to manage different resources in Zitadel. API definitions from https://github.com/zitadel/zitadel/issues/9165 are implemented. Contains endpoints for user metadata. # How the Problems Are Solved ### New Methods - CreateAuthorization - UpdateAuthorization - DeleteAuthorization - ActivateAuthorization - DeactivateAuthorization - ListAuthorizations - CreateAdministrator - UpdateAdministrator - DeleteAdministrator - ListAdministrators - SetUserMetadata to set metadata on a user - DeleteUserMetadata to delete metadata on a user - ListUserMetadata to query for metadata of a user ## Deprecated Methods ### v1.ManagementService - GetUserGrantByID - ListUserGrants - AddUserGrant - UpdateUserGrant - DeactivateUserGrant - ReactivateUserGrant - RemoveUserGrant - BulkRemoveUserGrant ### v1.AuthService - ListMyUserGrants - ListMyProjectPermissions # Additional Changes - Permission checks for metadata functionality on query and command side - correct existence checks for resources, for example you can only be an administrator on an existing project - combined all member tables to singular query for the administrators - add permission checks for command an query side functionality - combined functions on command side where necessary for easier maintainability # Additional Context Closes #9165 --------- Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Livio Spring <livio.a@gmail.com>
469 lines
11 KiB
Go
469 lines
11 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
)
|
|
|
|
var (
|
|
membershipsStmt = regexp.QuoteMeta(
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.org_id" +
|
|
", members.id" +
|
|
", members.project_id" +
|
|
", members.grant_id" +
|
|
", projections.project_grants4.granted_org_id" +
|
|
", projections.projects4.name" +
|
|
", projections.orgs1.name" +
|
|
", projections.instances.name" +
|
|
", COUNT(*) OVER ()" +
|
|
" FROM (" +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", members.org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", NULL::TEXT AS project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.org_members4 AS members" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", members.id" +
|
|
", NULL::TEXT AS project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.instance_members4 AS members" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", members.project_id" +
|
|
", NULL::TEXT AS grant_id" +
|
|
" FROM projections.project_members4 AS members" +
|
|
" UNION ALL " +
|
|
"SELECT members.user_id" +
|
|
", members.roles" +
|
|
", members.creation_date" +
|
|
", members.change_date" +
|
|
", members.sequence" +
|
|
", members.resource_owner" +
|
|
", members.instance_id" +
|
|
", NULL::TEXT AS org_id" +
|
|
", NULL::TEXT AS id" +
|
|
", members.project_id" +
|
|
", members.grant_id" +
|
|
" FROM projections.project_grant_members4 AS members" +
|
|
") AS members" +
|
|
" LEFT JOIN projections.projects4 ON members.project_id = projections.projects4.id AND members.instance_id = projections.projects4.instance_id" +
|
|
" LEFT JOIN projections.orgs1 ON members.org_id = projections.orgs1.id AND members.instance_id = projections.orgs1.instance_id" +
|
|
" LEFT JOIN projections.project_grants4 ON members.grant_id = projections.project_grants4.grant_id AND members.instance_id = projections.project_grants4.instance_id AND members.project_id = projections.project_grants4.project_id" +
|
|
" LEFT JOIN projections.instances ON members.instance_id = projections.instances.id")
|
|
membershipCols = []string{
|
|
"user_id",
|
|
"roles",
|
|
"creation_date",
|
|
"change_date",
|
|
"sequence",
|
|
"resource_owner",
|
|
"org_id",
|
|
"instance_id",
|
|
"project_id",
|
|
"grant_id",
|
|
"granted_org_id",
|
|
"name", //project name
|
|
"name", //org name
|
|
"name", // instance name
|
|
"count",
|
|
}
|
|
)
|
|
|
|
func Test_MembershipPrepares(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareMembershipsQuery no result",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &Memberships{Memberships: []*Membership{}},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one org member",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
"org-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"org-name",
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one instance member",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
"iam-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"instance",
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
IAM: &IAMMembership{IAMID: "iam-id", Name: "instance"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one project member",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
nil,
|
|
nil,
|
|
"project-name",
|
|
nil,
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one project grant member",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
"grant-id",
|
|
"granted-org-id",
|
|
"project-name",
|
|
nil,
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
ProjectGrant: &ProjectGrantMembership{
|
|
GrantID: "grant-id",
|
|
ProjectID: "project-id",
|
|
ProjectName: "project-name",
|
|
GrantedOrgID: "granted-org-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery one for each member type",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
membershipsStmt,
|
|
membershipCols,
|
|
[][]driver.Value{
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
"org-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"org-name",
|
|
nil,
|
|
},
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
"iam-id",
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
"instance",
|
|
},
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
nil,
|
|
nil,
|
|
"project-name",
|
|
nil,
|
|
nil,
|
|
},
|
|
{
|
|
"user-id",
|
|
database.TextArray[string]{"role1", "role2"},
|
|
testNow,
|
|
testNow,
|
|
uint64(20211202),
|
|
"ro",
|
|
nil,
|
|
nil,
|
|
"project-id",
|
|
"grant-id",
|
|
"granted-org-id",
|
|
"project-name",
|
|
nil,
|
|
nil,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Memberships{
|
|
SearchResponse: SearchResponse{
|
|
Count: 4,
|
|
},
|
|
Memberships: []*Membership{
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
IAM: &IAMMembership{IAMID: "iam-id", Name: "instance"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
|
|
},
|
|
{
|
|
UserID: "user-id",
|
|
Roles: database.TextArray[string]{"role1", "role2"},
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
Sequence: 20211202,
|
|
ResourceOwner: "ro",
|
|
ProjectGrant: &ProjectGrantMembership{
|
|
ProjectID: "project-id",
|
|
GrantID: "grant-id",
|
|
ProjectName: "project-name",
|
|
GrantedOrgID: "granted-org-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMembershipsQuery sql err",
|
|
prepare: prepareMembershipWrapper(),
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
membershipsStmt,
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*Memberships)(nil),
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func prepareMembershipWrapper() func() (sq.SelectBuilder, func(*sql.Rows) (*Memberships, error)) {
|
|
return func() (sq.SelectBuilder, func(*sql.Rows) (*Memberships, error)) {
|
|
builder, _, fun := prepareMembershipsQuery(context.Background(), &MembershipSearchQuery{}, false)
|
|
return builder, fun
|
|
}
|
|
}
|