TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-01 00:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: protect default and zitadel project org from remove (#4875)

Browse Source
This commit is contained in:
Livio Spring 2022-12-14 11:44:43 +01:00 committed by GitHub
parent 06c5f2a731
commit d3e4281bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/command/main_test.go
View File

@ -234,7 +234,7 @@ func (m *mockInstance) DefaultLanguage() language.Tag {
}
func (m *mockInstance) DefaultOrganisationID() string {
return "orgID"
return "defaultOrgID"
}
func (m *mockInstance) RequestedDomain() string {

13
internal/command/org.go
View File

@ -314,6 +314,19 @@ func (c *Commands) RemoveOrg(ctx context.Context, id string) (*domain.ObjectDeta
func (c *Commands) prepareRemoveOrg(a *org.Aggregate) preparation.Validation {
return func() (preparation.CreateCommands, error) {
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
instance := authz.GetInstance(ctx)
if a.ID == instance.DefaultOrganisationID() {
return nil, errors.ThrowPreconditionFailed(nil, "COMMA-wG9p1", "Errors.Org.DefaultOrgNotDeletable")
}
err := c.checkProjectExists(ctx, instance.ProjectID(), a.ID)
// if there is no error, the ZITADEL project was found on the org to be deleted
if err == nil {
return nil, errors.ThrowPreconditionFailed(err, "COMMA-AF3JW", "Errors.Org.ZitadelOrgNotDeletable")
}
// "precondition failed" error means the project does not exist, return other errors
if !errors.IsPreconditionFailed(err) {
return nil, err
}
writeModel, err := c.getOrgWriteModelByID(ctx, a.ID)
if err != nil {
return nil, errors.ThrowPreconditionFailed(err, "COMMA-wG9p1", "Errors.Org.NotFound")

46
internal/command/org_test.go
View File

@ -1026,11 +1026,53 @@ func TestCommandSide_RemoveOrg(t *testing.T) {
args args
res res
}{
{
name: "default org, error",
fields: fields{
eventstore: eventstoreExpect(
t,
),
},
args: args{
ctx: authz.WithInstance(context.Background(), &mockInstance{}),
orgID: "defaultOrgID",
},
res: res{
err: errors.IsPreconditionFailed,
},
},
{
name: "zitadel org, error",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
project.NewProjectAddedEvent(context.Background(),
&project.NewAggregate("projectID", "org1").Aggregate,
"ZITADEL",
false,
false,
false,
domain.PrivateLabelingSettingUnspecified,
),
)),
),
},
args: args{
ctx: context.Background(),
orgID: "org1",
},
res: res{
err: errors.IsPreconditionFailed,
},
},
{
name: "org not found, error",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(), // zitadel project check
expectFilter(),
),
},
@ -1047,6 +1089,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) {
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(), // zitadel project check
expectFilter(
eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(),
@ -1074,6 +1117,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) {
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(), // zitadel project check
expectFilter(
eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(),
@ -1121,6 +1165,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) {
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(), // zitadel project check
expectFilter(
eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(),
@ -1165,6 +1210,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) {
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(), // zitadel project check
expectFilter(
eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(),

4
internal/static/i18n/de.yaml
View File

@ -155,6 +155,8 @@ Errors:
Empty: Organisation ist leer
NotFound: Organisation konnte nicht gefunden werden
NotChanged: Organisation wurde nicht verändert
DefaultOrgNotDeletable: Default Organisation kann nicht gelöscht werden
ZitadelOrgNotDeletable: Organisation mit ZITADEL Projekt kann nicht gelöscht werden
InvalidDomain: Domäne ist ungültig
DomainMissing: Domäne fehlt
DomainNotOnOrg: Domäne fehlt auf Organisation
@ -928,4 +930,4 @@ Action:
PreCreation: Vor Erstellung
PostCreation: Nach Erstellung
PreUserinfoCreation: Vor Userinfo Erstellung
PreAccessTokenCreation: Vor Access Token Erstellung
PreAccessTokenCreation: Vor Access Token Erstellung

4
internal/static/i18n/en.yaml
View File

@ -155,6 +155,8 @@ Errors:
Empty: Organisation is empty
NotFound: Organisation not found
NotChanged: Organisation not changed
DefaultOrgNotDeletable: Default Organisation must not be deleted
ZitadelOrgNotDeletable: Organisation with ZITADEL project must not be deleted
InvalidDomain: Invalid domain
DomainMissing: Domain missing
DomainNotOnOrg: Domain doesn't exist on organization
@ -928,4 +930,4 @@ Action:
PreCreation: Pre Creation
PostCreation: Post Creation
PreUserinfoCreation: Pre Userinfo creation
PreAccessTokenCreation: Pre access token creation
PreAccessTokenCreation: Pre access token creation

4
internal/static/i18n/fr.yaml
View File

@ -155,6 +155,8 @@ Errors:
Empty: L'organisation est vide
NotFound: Organisation non trouvée
NotChanged: L'organisation n'a pas changé
DefaultOrgNotDeletable: L'organisation par défault ne doit pas être supprimée
ZitadelOrgNotDeletable: L'organisation avec ZITADEL project ne doit pas être supprimée
InvalidDomain: Domaine non valide
DomainMissing: Domaine manquant
DomainNotOnOrg: Le domaine n'existe pas dans l'organisation
@ -928,4 +930,4 @@ Action:
PreCreation: Pré création
PostCreation: Post-création
PreUserinfoCreation: Pré Userinfo création
PreAccessTokenCreation: Pré access token création
PreAccessTokenCreation: Pré access token création

4
internal/static/i18n/it.yaml
View File

@ -155,6 +155,8 @@ Errors:
Empty: L'organizzazione è vuota
NotFound: Organizzazione non trovata
NotChanged: Organizzazione non cambiata
DefaultOrgNotDeletable: L'organizzazione predefinita non deve essere cancellata
ZitadelOrgNotDeletable: L'organizzazione con il progetto ZITADEL non deve essere cancellata
InvalidDomain: Dominio non valido
DomainMissing: Dominio mancante
DomainNotOnOrg: Il dominio non esistente nell'organizzazione
@ -928,4 +930,4 @@ Action:
PreCreation: Pre-creazione
PostCreation: Creazione successiva
PreUserinfoCreation: Pre userinfo creazione
PreAccessTokenCreation: Pre access token creazione
PreAccessTokenCreation: Pre access token creazione

2
internal/static/i18n/zh.yaml
View File

@ -155,6 +155,8 @@ Errors:
Empty: 组织为空
NotFound: 未找到组织
NotChanged: 组织信息未改变
DefaultOrgNotDeletable: 默认组织不应删除
ZitadelOrgNotDeletable: 不得删除与ZITADEL项目有关的组织
InvalidDomain: 无效的域名
DomainMissing: 域名缺失
DomainNotOnOrg: 组织中不存在域