Browse Source
Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
* make repo as "pending transfer" if on transfer start doer has no right to create repo in new destination * if new pending transfer ocured, create UI & Mail notificationsmj-v1.14.3
6543
1 year ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 898 additions and 167 deletions
-
18integrations/api_repo_test.go
-
34models/error.go
-
7models/fixtures/repo_transfer.yml
-
2models/issue.go
-
2models/migrations/migrations.go
-
23models/migrations/v174.go
-
1models/models.go
-
78models/notification.go
-
14models/org.go
-
18models/org_test.go
-
144models/repo.go
-
335models/repo_transfer.go
-
54models/repo_transfer_test.go
-
18modules/context/repo.go
-
8modules/convert/notification.go
-
2modules/notification/base/notifier.go
-
4modules/notification/base/null.go
-
6modules/notification/mail/mail.go
-
7modules/notification/notification.go
-
6modules/notification/ui/ui.go
-
22options/locale/locale_en-US.ini
-
20routers/api/v1/repo/transfer.go
-
35routers/repo/repo.go
-
44routers/repo/setting.go
-
8routers/repo/view.go
-
2services/mailer/mail.go
-
57services/mailer/mail_repo.go
-
35services/repository/transfer.go
-
17templates/mail/notify/repo_transfer.tmpl
-
18templates/repo/header.tmpl
-
18templates/repo/settings/options.tmpl
-
8templates/user/notification/notification_div.tmpl
@ -0,0 +1,7 @@ |
|||
- |
|||
id: 1 |
|||
doer_id: 3 |
|||
recipient_id: 1 |
|||
repo_id: 3 |
|||
created_unix: 1553610671 |
|||
updated_unix: 1553610671 |
|||
@ -0,0 +1,23 @@ |
|||
// Copyright 2021 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 ( |
|||
"xorm.io/xorm" |
|||
) |
|||
|
|||
func addRepoTransfer(x *xorm.Engine) error { |
|||
type RepoTransfer struct { |
|||
ID int64 `xorm:"pk autoincr"` |
|||
DoerID int64 |
|||
RecipientID int64 |
|||
RepoID int64 |
|||
TeamIDs []int64 |
|||
CreatedUnix int64 `xorm:"INDEX NOT NULL created"` |
|||
UpdatedUnix int64 `xorm:"INDEX NOT NULL updated"` |
|||
} |
|||
|
|||
return x.Sync(new(RepoTransfer)) |
|||
} |
|||
@ -0,0 +1,335 @@ |
|||
// Copyright 2021 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 models |
|||
|
|||
import ( |
|||
"fmt" |
|||
"os" |
|||
|
|||
"code.gitea.io/gitea/modules/log" |
|||
"code.gitea.io/gitea/modules/timeutil" |
|||
"code.gitea.io/gitea/modules/util" |
|||
) |
|||
|
|||
// RepoTransfer is used to manage repository transfers
|
|||
type RepoTransfer struct { |
|||
ID int64 `xorm:"pk autoincr"` |
|||
DoerID int64 |
|||
Doer *User `xorm:"-"` |
|||
RecipientID int64 |
|||
Recipient *User `xorm:"-"` |
|||
RepoID int64 |
|||
TeamIDs []int64 |
|||
Teams []*Team `xorm:"-"` |
|||
|
|||
CreatedUnix timeutil.TimeStamp `xorm:"INDEX NOT NULL created"` |
|||
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX NOT NULL updated"` |
|||
} |
|||
|
|||
// LoadAttributes fetches the transfer recipient from the database
|
|||
func (r *RepoTransfer) LoadAttributes() error { |
|||
if r.Recipient == nil { |
|||
u, err := GetUserByID(r.RecipientID) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
r.Recipient = u |
|||
} |
|||
|
|||
if r.Recipient.IsOrganization() && len(r.TeamIDs) != len(r.Teams) { |
|||
|
|||
for _, v := range r.TeamIDs { |
|||
team, err := GetTeamByID(v) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
if team.OrgID != r.Recipient.ID { |
|||
return fmt.Errorf("team %d belongs not to org %d", v, r.Recipient.ID) |
|||
} |
|||
|
|||
r.Teams = append(r.Teams, team) |
|||
} |
|||
} |
|||
|
|||
if r.Doer == nil { |
|||
u, err := GetUserByID(r.DoerID) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
r.Doer = u |
|||
} |
|||
|
|||
return nil |
|||
} |
|||
|
|||
// CanUserAcceptTransfer checks if the user has the rights to accept/decline a repo transfer.
|
|||
// For user, it checks if it's himself
|
|||
// For organizations, it checks if the user is able to create repos
|
|||
func (r *RepoTransfer) CanUserAcceptTransfer(u *User) bool { |
|||
if err := r.LoadAttributes(); err != nil { |
|||
log.Error("LoadAttributes: %v", err) |
|||
return false |
|||
} |
|||
|
|||
if !r.Recipient.IsOrganization() { |
|||
return r.RecipientID == u.ID |
|||
} |
|||
|
|||
allowed, err := CanCreateOrgRepo(r.RecipientID, u.ID) |
|||
if err != nil { |
|||
log.Error("CanCreateOrgRepo: %v", err) |
|||
return false |
|||
} |
|||
|
|||
return allowed |
|||
} |
|||
|
|||
// GetPendingRepositoryTransfer fetches the most recent and ongoing transfer
|
|||
// process for the repository
|
|||
func GetPendingRepositoryTransfer(repo *Repository) (*RepoTransfer, error) { |
|||
var transfer = new(RepoTransfer) |
|||
|
|||
has, err := x.Where("repo_id = ? ", repo.ID).Get(transfer) |
|||
if err != nil { |
|||
return nil, err |
|||
} |
|||
|
|||
if !has { |
|||
return nil, ErrNoPendingRepoTransfer{RepoID: repo.ID} |
|||
} |
|||
|
|||
return transfer, nil |
|||
} |
|||
|
|||
func deleteRepositoryTransfer(e Engine, repoID int64) error { |
|||
_, err := e.Where("repo_id = ?", repoID).Delete(&RepoTransfer{}) |
|||
return err |
|||
} |
|||
|
|||
// CancelRepositoryTransfer marks the repository as ready and remove pending transfer entry,
|
|||
// thus cancel the transfer process.
|
|||
func CancelRepositoryTransfer(repo *Repository) error { |
|||
sess := x.NewSession() |
|||
defer sess.Close() |
|||
if err := sess.Begin(); err != nil { |
|||
return err |
|||
} |
|||
|
|||
repo.Status = RepositoryReady |
|||
if err := updateRepositoryCols(sess, repo, "status"); err != nil { |
|||
return err |
|||
} |
|||
|
|||
if err := deleteRepositoryTransfer(sess, repo.ID); err != nil { |
|||
return err |
|||
} |
|||
|
|||
return sess.Commit() |
|||
} |
|||
|
|||
// TestRepositoryReadyForTransfer make sure repo is ready to transfer
|
|||
func TestRepositoryReadyForTransfer(status RepositoryStatus) error { |
|||
switch status { |
|||
case RepositoryBeingMigrated: |
|||
return fmt.Errorf("repo is not ready, currently migrating") |
|||
case RepositoryPendingTransfer: |
|||
return ErrRepoTransferInProgress{} |
|||
} |
|||
return nil |
|||
} |
|||
|
|||
// CreatePendingRepositoryTransfer transfer a repo from one owner to a new one.
|
|||
// it marks the repository transfer as "pending"
|
|||
func CreatePendingRepositoryTransfer(doer, newOwner *User, repoID int64, teams []*Team) error { |
|||
sess := x.NewSession() |
|||
defer sess.Close() |
|||
if err := sess.Begin(); err != nil { |
|||
return err |
|||
} |
|||
|
|||
repo, err := getRepositoryByID(sess, repoID) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
// Make sure repo is ready to transfer
|
|||
if err := TestRepositoryReadyForTransfer(repo.Status); err != nil { |
|||
return err |
|||
} |
|||
|
|||
repo.Status = RepositoryPendingTransfer |
|||
if err := updateRepositoryCols(sess, repo, "status"); err != nil { |
|||
return err |
|||
} |
|||
|
|||
// Check if new owner has repository with same name.
|
|||
if has, err := isRepositoryExist(sess, newOwner, repo.Name); err != nil { |
|||
return fmt.Errorf("IsRepositoryExist: %v", err) |
|||
} else if has { |
|||
return ErrRepoAlreadyExist{newOwner.LowerName, repo.Name} |
|||
} |
|||
|
|||
transfer := &RepoTransfer{ |
|||
RepoID: repo.ID, |
|||
RecipientID: newOwner.ID, |
|||
CreatedUnix: timeutil.TimeStampNow(), |
|||
UpdatedUnix: timeutil.TimeStampNow(), |
|||
DoerID: doer.ID, |
|||
TeamIDs: make([]int64, 0, len(teams)), |
|||
} |
|||
|
|||
for k := range teams { |
|||
transfer.TeamIDs = append(transfer.TeamIDs, teams[k].ID) |
|||
} |
|||
|
|||
if _, err := sess.Insert(transfer); err != nil { |
|||
return err |
|||
} |
|||
|
|||
return sess.Commit() |
|||
} |
|||
|
|||
// TransferOwnership transfers all corresponding repository items from old user to new one.
|
|||
func TransferOwnership(doer *User, newOwnerName string, repo *Repository) error { |
|||
sess := x.NewSession() |
|||
defer sess.Close() |
|||
if err := sess.Begin(); err != nil { |
|||
return fmt.Errorf("sess.Begin: %v", err) |
|||
} |
|||
|
|||
newOwner, err := getUserByName(sess, newOwnerName) |
|||
if err != nil { |
|||
return fmt.Errorf("get new owner '%s': %v", newOwnerName, err) |
|||
} |
|||
|
|||
// Check if new owner has repository with same name.
|
|||
if has, err := isRepositoryExist(sess, newOwner, repo.Name); err != nil { |
|||
return fmt.Errorf("IsRepositoryExist: %v", err) |
|||
} else if has { |
|||
return ErrRepoAlreadyExist{newOwnerName, repo.Name} |
|||
} |
|||
|
|||
oldOwner := repo.Owner |
|||
|
|||
// Note: we have to set value here to make sure recalculate accesses is based on
|
|||
// new owner.
|
|||
repo.OwnerID = newOwner.ID |
|||
repo.Owner = newOwner |
|||
repo.OwnerName = newOwner.Name |
|||
|
|||
// Update repository.
|
|||
if _, err := sess.ID(repo.ID).Update(repo); err != nil { |
|||
return fmt.Errorf("update owner: %v", err) |
|||
} |
|||
|
|||
// Remove redundant collaborators.
|
|||
collaborators, err := repo.getCollaborators(sess, ListOptions{}) |
|||
if err != nil { |
|||
return fmt.Errorf("getCollaborators: %v", err) |
|||
} |
|||
|
|||
// Dummy object.
|
|||
collaboration := &Collaboration{RepoID: repo.ID} |
|||
for _, c := range collaborators { |
|||
if c.ID != newOwner.ID { |
|||
isMember, err := isOrganizationMember(sess, newOwner.ID, c.ID) |
|||
if err != nil { |
|||
return fmt.Errorf("IsOrgMember: %v", err) |
|||
} else if !isMember { |
|||
continue |
|||
} |
|||
} |
|||
collaboration.UserID = c.ID |
|||
if _, err := sess.Delete(collaboration); err != nil { |
|||
return fmt.Errorf("remove collaborator '%d': %v", c.ID, err) |
|||
} |
|||
} |
|||
|
|||
// Remove old team-repository relations.
|
|||
if oldOwner.IsOrganization() { |
|||
if err := oldOwner.removeOrgRepo(sess, repo.ID); err != nil { |
|||
return fmt.Errorf("removeOrgRepo: %v", err) |
|||
} |
|||
} |
|||
|
|||
if newOwner.IsOrganization() { |
|||
if err := newOwner.getTeams(sess); err != nil { |
|||
return fmt.Errorf("GetTeams: %v", err) |
|||
} |
|||
for _, t := range newOwner.Teams { |
|||
if t.IncludesAllRepositories { |
|||
if err := t.addRepository(sess, repo); err != nil { |
|||
return fmt.Errorf("addRepository: %v", err) |
|||
} |
|||
} |
|||
} |
|||
} else if err := repo.recalculateAccesses(sess); err != nil { |
|||
// Organization called this in addRepository method.
|
|||
return fmt.Errorf("recalculateAccesses: %v", err) |
|||
} |
|||
|
|||
// Update repository count.
|
|||
if _, err := sess.Exec("UPDATE `user` SET num_repos=num_repos+1 WHERE id=?", newOwner.ID); err != nil { |
|||
return fmt.Errorf("increase new owner repository count: %v", err) |
|||
} else if _, err := sess.Exec("UPDATE `user` SET num_repos=num_repos-1 WHERE id=?", oldOwner.ID); err != nil { |
|||
return fmt.Errorf("decrease old owner repository count: %v", err) |
|||
} |
|||
|
|||
if err := watchRepo(sess, doer.ID, repo.ID, true); err != nil { |
|||
return fmt.Errorf("watchRepo: %v", err) |
|||
} |
|||
|
|||
// Remove watch for organization.
|
|||
if oldOwner.IsOrganization() { |
|||
if err := watchRepo(sess, oldOwner.ID, repo.ID, false); err != nil { |
|||
return fmt.Errorf("watchRepo [false]: %v", err) |
|||
} |
|||
} |
|||
|
|||
// Rename remote repository to new path and delete local copy.
|
|||
dir := UserPath(newOwner.Name) |
|||
|
|||
if err := os.MkdirAll(dir, os.ModePerm); err != nil { |
|||
return fmt.Errorf("Failed to create dir %s: %v", dir, err) |
|||
} |
|||
|
|||
if err := os.Rename(RepoPath(oldOwner.Name, repo.Name), RepoPath(newOwner.Name, repo.Name)); err != nil { |
|||
return fmt.Errorf("rename repository directory: %v", err) |
|||
} |
|||
|
|||
// Rename remote wiki repository to new path and delete local copy.
|
|||
wikiPath := WikiPath(oldOwner.Name, repo.Name) |
|||
|
|||
if isExist, err := util.IsExist(wikiPath); err != nil { |
|||
log.Error("Unable to check if %s exists. Error: %v", wikiPath, err) |
|||
return err |
|||
} else if isExist { |
|||
if err := os.Rename(wikiPath, WikiPath(newOwner.Name, repo.Name)); err != nil { |
|||
return fmt.Errorf("rename repository wiki: %v", err) |
|||
} |
|||
} |
|||
|
|||
if err := deleteRepositoryTransfer(sess, repo.ID); err != nil { |
|||
return fmt.Errorf("deleteRepositoryTransfer: %v", err) |
|||
} |
|||
repo.Status = RepositoryReady |
|||
if err := updateRepositoryCols(sess, repo, "status"); err != nil { |
|||
return err |
|||
} |
|||
|
|||
// If there was previously a redirect at this location, remove it.
|
|||
if err := deleteRepoRedirect(sess, newOwner.ID, repo.Name); err != nil { |
|||
return fmt.Errorf("delete repo redirect: %v", err) |
|||
} |
|||
|
|||
if err := newRepoRedirect(sess, oldOwner.ID, repo.ID, repo.Name, repo.Name); err != nil { |
|||
return fmt.Errorf("newRepoRedirect: %v", err) |
|||
} |
|||
|
|||
return sess.Commit() |
|||
} |
|||
@ -0,0 +1,54 @@ |
|||
// Copyright 2021 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 models |
|||
|
|||
import ( |
|||
"testing" |
|||
|
|||
"github.com/stretchr/testify/assert" |
|||
) |
|||
|
|||
func TestRepositoryTransfer(t *testing.T) { |
|||
|
|||
assert.NoError(t, PrepareTestDatabase()) |
|||
|
|||
doer := AssertExistsAndLoadBean(t, &User{ID: 3}).(*User) |
|||
repo := AssertExistsAndLoadBean(t, &Repository{ID: 3}).(*Repository) |
|||
|
|||
transfer, err := GetPendingRepositoryTransfer(repo) |
|||
assert.NoError(t, err) |
|||
assert.NotNil(t, transfer) |
|||
|
|||
// Cancel transfer
|
|||
assert.NoError(t, CancelRepositoryTransfer(repo)) |
|||
|
|||
transfer, err = GetPendingRepositoryTransfer(repo) |
|||
assert.Error(t, err) |
|||
assert.Nil(t, transfer) |
|||
assert.True(t, IsErrNoPendingTransfer(err)) |
|||
|
|||
user2 := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) |
|||
|
|||
assert.NoError(t, CreatePendingRepositoryTransfer(doer, user2, repo.ID, nil)) |
|||
|
|||
transfer, err = GetPendingRepositoryTransfer(repo) |
|||
assert.Nil(t, err) |
|||
assert.NoError(t, transfer.LoadAttributes()) |
|||
assert.Equal(t, "user2", transfer.Recipient.Name) |
|||
|
|||
user6 := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) |
|||
|
|||
// Only transfer can be started at any given time
|
|||
err = CreatePendingRepositoryTransfer(doer, user6, repo.ID, nil) |
|||
assert.Error(t, err) |
|||
assert.True(t, IsErrRepoTransferInProgress(err)) |
|||
|
|||
// Unknown user
|
|||
err = CreatePendingRepositoryTransfer(doer, &User{ID: 1000, LowerName: "user1000"}, repo.ID, nil) |
|||
assert.Error(t, err) |
|||
|
|||
// Cancel transfer
|
|||
assert.NoError(t, CancelRepositoryTransfer(repo)) |
|||
} |
|||
@ -0,0 +1,57 @@ |
|||
// Copyright 2021 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 mailer |
|||
|
|||
import ( |
|||
"bytes" |
|||
"fmt" |
|||
|
|||
"code.gitea.io/gitea/models" |
|||
) |
|||
|
|||
// SendRepoTransferNotifyMail triggers a notification e-mail when a pending repository transfer was created
|
|||
func SendRepoTransferNotifyMail(doer, newOwner *models.User, repo *models.Repository) error { |
|||
var ( |
|||
emails []string |
|||
destination string |
|||
content bytes.Buffer |
|||
) |
|||
|
|||
if newOwner.IsOrganization() { |
|||
users, err := models.GetUsersWhoCanCreateOrgRepo(newOwner.ID) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
for i := range users { |
|||
emails = append(emails, users[i].Email) |
|||
} |
|||
destination = newOwner.DisplayName() |
|||
} else { |
|||
emails = []string{newOwner.Email} |
|||
destination = "you" |
|||
} |
|||
|
|||
subject := fmt.Sprintf("%s would like to transfer \"%s\" to %s", doer.DisplayName(), repo.FullName(), destination) |
|||
data := map[string]interface{}{ |
|||
"Doer": doer, |
|||
"User": repo.Owner, |
|||
"Repo": repo.FullName(), |
|||
"Link": repo.HTMLURL(), |
|||
"Subject": subject, |
|||
|
|||
"Destination": destination, |
|||
} |
|||
|
|||
if err := bodyTemplates.ExecuteTemplate(&content, string(mailRepoTransferNotify), data); err != nil { |
|||
return err |
|||
} |
|||
|
|||
msg := NewMessage(emails, subject, content.String()) |
|||
msg.Info = fmt.Sprintf("UID: %d, repository pending transfer notification", newOwner.ID) |
|||
|
|||
SendAsync(msg) |
|||
return nil |
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
<!DOCTYPE html> |
|||
<html> |
|||
<head> |
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
|||
<title>{{.Subject}}</title> |
|||
</head> |
|||
|
|||
<body> |
|||
<p>{{.Subject}}. |
|||
To accept or reject it visit <a href="{{.Link}}">{{.Repo}}</a> or just ignore it. |
|||
<p> |
|||
--- |
|||
<br> |
|||
<a href="{{.Link}}">View it on Gitea</a>. |
|||
</p> |
|||
</body> |
|||
</html> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue