mirror of https://github.com/go-gitea/gitea
Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055)
* Possibility to not use whitelist but allow anyone with write access * fix existing test * rename migration function * Try to give a better name for migration step * Clear settings if higher level setting is not set * Move official reviews to db instead of counting approvals each time * migration * fix * fix migration * fix migration * Remove NOT NULL from EnableWhitelist as migration isn't possible * Fix migration, reviews are connected to issues. * Fix SQL query issues in GetReviewersByPullID. * Simplify function GetReviewersByIssueID * Handle reviewers that has been deleted * Ensure reviews for test is in a well defined order * Only clear and set official reviews when it is an approve or reject.pull/9051/head^2
parent
6460284085
commit
bac4b78e09
@ -0,0 +1,87 @@ |
||||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package migrations |
||||
|
||||
import ( |
||||
"code.gitea.io/gitea/models" |
||||
|
||||
"xorm.io/xorm" |
||||
) |
||||
|
||||
func addBranchProtectionCanPushAndEnableWhitelist(x *xorm.Engine) error { |
||||
|
||||
type ProtectedBranch struct { |
||||
CanPush bool `xorm:"NOT NULL DEFAULT false"` |
||||
EnableApprovalsWhitelist bool `xorm:"NOT NULL DEFAULT false"` |
||||
RequiredApprovals int64 `xorm:"NOT NULL DEFAULT 0"` |
||||
} |
||||
|
||||
type Review struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
Official bool `xorm:"NOT NULL DEFAULT false"` |
||||
} |
||||
|
||||
sess := x.NewSession() |
||||
defer sess.Close() |
||||
|
||||
if err := sess.Sync2(new(ProtectedBranch)); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if err := sess.Sync2(new(Review)); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if _, err := sess.Exec("UPDATE `protected_branch` SET `can_push` = `enable_whitelist`"); err != nil { |
||||
return err |
||||
} |
||||
if _, err := sess.Exec("UPDATE `protected_branch` SET `enable_approvals_whitelist` = ? WHERE `required_approvals` > ?", true, 0); err != nil { |
||||
return err |
||||
} |
||||
|
||||
var pageSize int64 = 20 |
||||
qresult, err := sess.QueryInterface("SELECT max(id) as max_id FROM issue") |
||||
if err != nil { |
||||
return err |
||||
} |
||||
var totalIssues int64 |
||||
totalIssues, ok := qresult[0]["max_id"].(int64) |
||||
if !ok { |
||||
// If there are no issues at all we ignore it
|
||||
return nil |
||||
} |
||||
totalPages := totalIssues / pageSize |
||||
|
||||
// Find latest review of each user in each pull request, and set official field if appropriate
|
||||
reviews := []*models.Review{} |
||||
var page int64 |
||||
for page = 0; page <= totalPages; page++ { |
||||
if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id > ? AND issue_id <= ? AND type in (?, ?) GROUP BY issue_id, reviewer_id)", |
||||
page*pageSize, (page+1)*pageSize, models.ReviewTypeApprove, models.ReviewTypeReject). |
||||
Find(&reviews); err != nil { |
||||
return err |
||||
} |
||||
|
||||
for _, review := range reviews { |
||||
if err := review.LoadAttributes(); err != nil { |
||||
// Error might occur if user or issue doesn't exist, ignore it.
|
||||
continue |
||||
} |
||||
official, err := models.IsOfficialReviewer(review.Issue, review.Reviewer) |
||||
if err != nil { |
||||
// Branch might not be proteced or other error, ignore it.
|
||||
continue |
||||
} |
||||
review.Official = official |
||||
|
||||
if _, err := sess.ID(review.ID).Cols("official").Update(review); err != nil { |
||||
return err |
||||
} |
||||
} |
||||
|
||||
} |
||||
|
||||
return sess.Commit() |
||||
} |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue