From 6eb856c614e4ff589b9373670ae26a1cea50339b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 3 Apr 2023 23:36:35 +0900 Subject: [PATCH] Fix owner team access mode value in team_unit table (#23675) All `access_mode` value of Owner Teams are 0(AccessModeNone) in `team_unit` table, which should be 4(AccessModeOwner) In `team` table: ![image](https://user-images.githubusercontent.com/18380374/227409457-1b9660ae-8cf7-49c8-a013-1850b46baebc.png) In `team_unit` table: ![image](https://user-images.githubusercontent.com/18380374/227409429-a793dd90-4ae1-4191-b95b-e288c591f9fd.png) ps: In https://github.com/go-gitea/gitea/pull/23630, `access_mode` in `team_unit` is used to check the team unit permission, but I found that user can not see issues in owned org repos. --- models/migrations/migrations.go | 2 ++ models/migrations/v1_20/v251.go | 47 +++++++++++++++++++++++++++++++++ models/organization/org.go | 7 ++--- 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 models/migrations/v1_20/v251.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index ea3619db97..07240c8e69 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -479,6 +479,8 @@ var migrations = []Migration{ NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices), // v250 -> v251 NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch), + // v251 -> v252 + NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go new file mode 100644 index 0000000000..7743248a3f --- /dev/null +++ b/models/migrations/v1_20/v251.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() +} diff --git a/models/organization/org.go b/models/organization/org.go index 269b3e8328..fa2a604721 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, }) }