From ee7b30984ecd407154e71f5edf46a5c25ae126c4 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 24 Mar 2023 02:25:58 +0000 Subject: [PATCH 1/6] fix owner team access mode --- models/organization/org.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/models/organization/org.go b/models/organization/org.go index 269b3e83288d..fa2a60472128 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -338,9 +338,10 @@ func CreateOrganization(org *Organization, owner *user_model.User) (err error) { units := make([]TeamUnit, 0, len(unit.AllRepoUnitTypes)) for _, tp := range unit.AllRepoUnitTypes { units = append(units, TeamUnit{ - OrgID: org.ID, - TeamID: t.ID, - Type: tp, + OrgID: org.ID, + TeamID: t.ID, + Type: tp, + AccessMode: perm.AccessModeOwner, }) } From a0a2480ba73f9e5d48bf85edf4e25554448ff185 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 24 Mar 2023 04:23:25 +0000 Subject: [PATCH 2/6] add db migration --- models/migrations/migrations.go | 2 ++ models/migrations/v1_20/v249.go | 47 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 models/migrations/v1_20/v249.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 6224e1c8d7c0..21e0c666b24c 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -475,6 +475,8 @@ var migrations = []Migration{ NewMigration("Fix incorrect project type", v1_20.FixIncorrectProjectType), // v248 -> v249 NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner), + // v249 -> v250 + NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go new file mode 100644 index 000000000000..7743248a3f17 --- /dev/null +++ b/models/migrations/v1_20/v249.go @@ -0,0 +1,47 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_20 //nolint + +import ( + "code.gitea.io/gitea/modules/log" + + "xorm.io/xorm" +) + +func FixIncorrectOwnerTeamUnitAccessMode(x *xorm.Engine) error { + type UnitType int + type AccessMode int + + type TeamUnit struct { + ID int64 `xorm:"pk autoincr"` + OrgID int64 `xorm:"INDEX"` + TeamID int64 `xorm:"UNIQUE(s)"` + Type UnitType `xorm:"UNIQUE(s)"` + AccessMode AccessMode + } + + const ( + // AccessModeOwner owner access + AccessModeOwner = 4 + ) + + sess := x.NewSession() + defer sess.Close() + + if err := sess.Begin(); err != nil { + return err + } + + count, err := sess.Table("team_unit"). + Where("team_id IN (SELECT id FROM team WHERE authorize = ?)", AccessModeOwner). + Update(&TeamUnit{ + AccessMode: AccessModeOwner, + }) + if err != nil { + return err + } + log.Debug("Updated %d owner team unit access mode to belong to owner instead of none", count) + + return sess.Commit() +} From 9654b124479f53fb826befca859413990272e7e3 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 25 Mar 2023 01:38:24 +0900 Subject: [PATCH 3/6] rename v249 to v250 --- models/migrations/v1_20/{v249.go => v250.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename models/migrations/v1_20/{v249.go => v250.go} (100%) diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v250.go similarity index 100% rename from models/migrations/v1_20/v249.go rename to models/migrations/v1_20/v250.go From fe0e75c092b6f2788ca1f82a57713a197fe8417e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 25 Mar 2023 11:46:18 +0900 Subject: [PATCH 4/6] fix lint --- models/migrations/migrations.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index dbe553da8a01..6bf97ae82e33 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -477,8 +477,8 @@ var migrations = []Migration{ NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner), // v249 -> v250 NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices), - // v250 -> v251 - NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode), + // v250 -> v251 + NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode), } // GetCurrentDBVersion returns the current db version From 7e3cdaac03b40dc7367a0adb95dead1e5ee2869f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 3 Apr 2023 01:08:22 +0000 Subject: [PATCH 5/6] convert v250 into v251 --- models/migrations/migrations.go | 2 +- models/migrations/v1_20/{v250.go => v251.go} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename models/migrations/v1_20/{v250.go => v251.go} (100%) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 6bf97ae82e33..963c4aecb375 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -477,7 +477,7 @@ var migrations = []Migration{ NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner), // v249 -> v250 NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices), - // v250 -> v251 + // v251 -> v252 NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode), } diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v251.go similarity index 100% rename from models/migrations/v1_20/v250.go rename to models/migrations/v1_20/v251.go From 878feae6bb5f1ea150817a16500630a61f80f580 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 3 Apr 2023 01:09:34 +0000 Subject: [PATCH 6/6] fix lint --- models/migrations/migrations.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 9f5b2cc99634..07240c8e69ed 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -477,7 +477,7 @@ var migrations = []Migration{ NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner), // v249 -> v250 NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices), - // v250 -> v251 + // v250 -> v251 NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch), // v251 -> v252 NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode),