merge

Author: lunny

cmd/migrate_storage.go

@@ -102,7 +102,7 @@ func migrateAvatars(dstStorage storage.ObjectStorage) error {
 }
 
 func migrateRepoAvatars(dstStorage storage.ObjectStorage) error {
-	return repo_model.IterateRepository(func(repo *repo_model.Repository) error {
+	return models.IterateRepository(func(repo *repo_model.Repository) error {
 		_, err := storage.Copy(dstStorage, repo.CustomAvatarRelativePath(), storage.RepoAvatars, repo.CustomAvatarRelativePath())
 		return err
 	})

models/asymkey/gpg_key_commit_verification.go

@@ -70,7 +70,7 @@ const (
 )
 
 // ParseCommitsWithSignature checks if signaute of commits are corresponding to users gpg keys.
-func ParseCommitsWithSignature(oldCommits []*user_model.UserCommit, repoTrustModel TrustModelType, isCodeReader func(*user_model.User) (bool, error)) []*SignCommit {
+func ParseCommitsWithSignature(oldCommits []*user_model.UserCommit, repoTrustModel repo_model.TrustModelType, isCodeReader func(*user_model.User) (bool, error)) []*SignCommit {
 	newCommits := make([]*SignCommit, 0, len(oldCommits))
 	keyMap := map[string]bool{}
 
@@ -447,50 +447,9 @@ func hashAndVerifyForKeyID(sig *packet.Signature, payload string, committer *use
 	}
 }
 
-// TrustModelType defines the types of trust model for this repository
-type TrustModelType int
-
-// kinds of TrustModel
-const (
-	DefaultTrustModel TrustModelType = iota // default trust model
-	CommitterTrustModel
-	CollaboratorTrustModel
-	CollaboratorCommitterTrustModel
-)
-
-// String converts a TrustModelType to a string
-func (t TrustModelType) String() string {
-	switch t {
-	case DefaultTrustModel:
-		return "default"
-	case CommitterTrustModel:
-		return "committer"
-	case CollaboratorTrustModel:
-		return "collaborator"
-	case CollaboratorCommitterTrustModel:
-		return "collaboratorcommitter"
-	}
-	return "default"
-}
-
-// ToTrustModel converts a string to a TrustModelType
-func ToTrustModel(model string) TrustModelType {
-	switch strings.ToLower(strings.TrimSpace(model)) {
-	case "default":
-		return DefaultTrustModel
-	case "collaborator":
-		return CollaboratorTrustModel
-	case "committer":
-		return CommitterTrustModel
-	case "collaboratorcommitter":
-		return CollaboratorCommitterTrustModel
-	}
-	return DefaultTrustModel
-}
-
 // CalculateTrustStatus will calculate the TrustStatus for a commit verification within a repository
 // There are several trust models in Gitea
-func CalculateTrustStatus(verification *CommitVerification, repoTrustModel TrustModelType, isCodeReader func(*user_model.User) (bool, error), keyMap *map[string]bool) (err error) {
+func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_model.TrustModelType, isCodeReader func(*user_model.User) (bool, error), keyMap *map[string]bool) (err error) {
 	if !verification.Verified {
 		return
 	}

models/asymkey/ssh_key_deploy.go

@@ -11,8 +11,6 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"xorm.io/builder"
@@ -211,68 +209,6 @@ func UpdateDeployKey(key *DeployKey) error {
 	return err
 }
 
-// DeleteDeployKey deletes deploy key from its repository authorized_keys file if needed.
-func DeleteDeployKey(doer *user_model.User, id int64) error {
-	ctx, committer, err := db.TxContext()
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-
-	if err := deleteDeployKey(ctx, doer, id); err != nil {
-		return err
-	}
-	return committer.Commit()
-}
-
-func deleteDeployKey(ctx context.Context, doer *user_model.User, id int64) error {
-	sess := db.GetEngine(ctx)
-	key, err := getDeployKeyByID(sess, id)
-	if err != nil {
-		if IsErrDeployKeyNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("GetDeployKeyByID: %v", err)
-	}
-
-	// Check if user has access to delete this key.
-	if !doer.IsAdmin {
-		repo, err := repo_model.GetRepositoryByIDCtx(ctx, key.RepoID)
-		if err != nil {
-			return fmt.Errorf("repo_model.GetRepositoryByID: %v", err)
-		}
-		has, err := isUserRepoAdmin(sess, repo, doer)
-		if err != nil {
-			return fmt.Errorf("GetUserRepoPermission: %v", err)
-		} else if !has {
-			return ErrKeyAccessDenied{doer.ID, key.ID, "deploy"}
-		}
-	}
-
-	if _, err = sess.ID(key.ID).Delete(new(DeployKey)); err != nil {
-		return fmt.Errorf("delete deploy key [%d]: %v", key.ID, err)
-	}
-
-	// Check if this is the last reference to same key content.
-	has, err := sess.
-		Where("key_id = ?", key.KeyID).
-		Get(new(DeployKey))
-	if err != nil {
-		return err
-	} else if !has {
-		if err = deletePublicKeys(sess, key.KeyID); err != nil {
-			return err
-		}
-
-		// after deleted the public keys, should rewrite the public keys file
-		if err = rewriteAllPublicKeys(sess); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ListDeployKeysOptions are options for ListDeployKeys
 type ListDeployKeysOptions struct {
 	db.ListOptions

models/repo.go

@@ -416,17 +416,8 @@ type CreateRepoOptions struct {
 	IsMirror       bool
 	IsTemplate     bool
 	AutoInit       bool
-<<<<<<< HEAD
 	Status         repo_model.RepositoryStatus
 	TrustModel     repo_model.TrustModelType
-=======
-	Status         RepositoryStatus
-<<<<<<< HEAD
-	TrustModel     keys.TrustModelType
->>>>>>> 3db02666b (Move keys to models/keys)
-=======
-	TrustModel     asymkey_model.TrustModelType
->>>>>>> 98e1e13cc (Fix package alias)
 	MirrorInterval string
 }
 
@@ -872,11 +863,7 @@ func DeleteRepository(doer *user_model.User, uid, repoID int64) error {
 	}
 	var needRewriteKeysFile = len(deployKeys) > 0
 	for _, dKey := range deployKeys {
-<<<<<<< HEAD
-		if err := deleteDeployKey(ctx, doer, dKey.ID); err != nil {
-=======
 		if err := DeleteDeployKey(ctx, doer, dKey.ID); err != nil {
->>>>>>> 3db02666b (Move keys to models/keys)
 			return fmt.Errorf("deleteDeployKeys: %v", err)
 		}
 	}
@@ -1344,21 +1331,6 @@ func UpdateRepositoryCols(repo *repo_model.Repository, cols ...string) error {
 	return updateRepositoryCols(db.GetEngine(db.DefaultContext), repo, cols...)
 }
 
-<<<<<<< HEAD
-=======
-// GetTrustModel will get the TrustModel for the repo or the default trust model
-func (repo *Repository) GetTrustModel() asymkey_model.TrustModelType {
-	trustModel := repo.TrustModel
-	if trustModel == asymkey_model.DefaultTrustModel {
-		trustModel = asymkey_model.ToTrustModel(setting.Repository.Signing.DefaultTrustModel)
-		if trustModel == asymkey_model.DefaultTrustModel {
-			return asymkey_model.CollaboratorTrustModel
-		}
-	}
-	return trustModel
-}
-
->>>>>>> 3db02666b (Move keys to models/keys)
 func updateUserStarNumbers(users []user_model.User) error {
 	ctx, committer, err := db.TxContext()
 	if err != nil {
@@ -1458,7 +1430,7 @@ func DeleteDeployKey(ctx context.Context, doer *user_model.User, id int64) error
 
 	// Check if user has access to delete this key.
 	if !doer.IsAdmin {
-		repo, err := getRepositoryByID(sess, key.RepoID)
+		repo, err := repo_model.GetRepositoryByIDCtx(ctx, key.RepoID)
 		if err != nil {
 			return fmt.Errorf("GetRepositoryByID: %v", err)
 		}

models/statistic.go

@@ -48,17 +48,8 @@ func GetStatistic() (stats Statistic) {
 	e := db.GetEngine(db.DefaultContext)
 	stats.Counter.User = user_model.CountUsers()
 	stats.Counter.Org = CountOrganizations()
-<<<<<<< HEAD
-<<<<<<< HEAD
-	stats.Counter.PublicKey, _ = e.Count(new(PublicKey))
-	stats.Counter.Repo = repo_model.CountRepositories(true)
-=======
-	stats.Counter.PublicKey, _ = e.Count(new(keys.PublicKey))
-=======
 	stats.Counter.PublicKey, _ = e.Count(new(asymkey_model.PublicKey))
->>>>>>> c486d0ca6 (Rename models/keys -> models/asymkey)
-	stats.Counter.Repo = CountRepositories(true)
->>>>>>> 3db02666b (Move keys to models/keys)
+	stats.Counter.Repo = repo_model.CountRepositories(true)
 	stats.Counter.Watch, _ = e.Count(new(Watch))
 	stats.Counter.Star, _ = e.Count(new(Star))
 	stats.Counter.Action, _ = e.Count(new(Action))

routers/api/v1/repo/key.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"code.gitea.io/gitea/models"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
@@ -25,15 +24,7 @@ import (
 )
 
 // appendPrivateInformation appends the owner and key type information to api.PublicKey
-<<<<<<< HEAD
-<<<<<<< HEAD
-func appendPrivateInformation(apiKey *api.DeployKey, key *models.DeployKey, repository *repo_model.Repository) (*api.DeployKey, error) {
-=======
-func appendPrivateInformation(apiKey *api.DeployKey, key *keys_model.DeployKey, repository *models.Repository) (*api.DeployKey, error) {
->>>>>>> 3db02666b (Move keys to models/keys)
-=======
-func appendPrivateInformation(apiKey *api.DeployKey, key *asymkey_model.DeployKey, repository *models.Repository) (*api.DeployKey, error) {
->>>>>>> c486d0ca6 (Rename models/keys -> models/asymkey)
+func appendPrivateInformation(apiKey *api.DeployKey, key *asymkey_model.DeployKey, repository *repo_model.Repository) (*api.DeployKey, error) {
 	apiKey.ReadOnly = key.Mode == perm.AccessModeRead
 	if repository.ID == key.RepoID {
 		apiKey.Repository = convert.ToRepo(repository, key.Mode)

routers/api/v1/repo/repo.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models"
-	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -258,15 +257,7 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre
 		IsPrivate:     opt.Private,
 		AutoInit:      opt.AutoInit,
 		DefaultBranch: opt.DefaultBranch,
-<<<<<<< HEAD
-<<<<<<< HEAD
 		TrustModel:    repo_model.ToTrustModel(opt.TrustModel),
-=======
-		TrustModel:    keys_model.ToTrustModel(opt.TrustModel),
->>>>>>> 3db02666b (Move keys to models/keys)
-=======
-		TrustModel:    asymkey_model.ToTrustModel(opt.TrustModel),
->>>>>>> c486d0ca6 (Rename models/keys -> models/asymkey)
 		IsTemplate:    opt.Template,
 	})
 	if err != nil {

routers/web/repo/repo.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models"
-	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
@@ -262,15 +261,7 @@ func CreatePost(ctx *context.Context) {
 			DefaultBranch: form.DefaultBranch,
 			AutoInit:      form.AutoInit,
 			IsTemplate:    form.Template,
-<<<<<<< HEAD
-<<<<<<< HEAD
 			TrustModel:    repo_model.ToTrustModel(form.TrustModel),
-=======
-			TrustModel:    keys_model.ToTrustModel(form.TrustModel),
->>>>>>> 3db02666b (Move keys to models/keys)
-=======
-			TrustModel:    asymkey_model.ToTrustModel(form.TrustModel),
->>>>>>> c486d0ca6 (Rename models/keys -> models/asymkey)
 		})
 		if err == nil {
 			log.Trace("Repository created [%d]: %s/%s", repo.ID, ctxUser.Name, repo.Name)

routers/web/repo/setting.go

@@ -478,16 +478,7 @@ func SettingsPost(ctx *context.Context) {
 
 	case "signing":
 		changed := false
-
-<<<<<<< HEAD
-<<<<<<< HEAD
 		trustModel := repo_model.ToTrustModel(form.TrustModel)
-=======
-		trustModel := keys_model.ToTrustModel(form.TrustModel)
->>>>>>> 3db02666b (Move keys to models/keys)
-=======
-		trustModel := asymkey_model.ToTrustModel(form.TrustModel)
->>>>>>> c486d0ca6 (Rename models/keys -> models/asymkey)
 		if trustModel != repo.TrustModel {
 			repo.TrustModel = trustModel
 			changed = true

services/repository/archiver/archiver.go

@@ -14,7 +14,6 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
@@ -171,7 +170,7 @@ func doArchive(r *ArchiveRequest) (*repo_model.RepoArchiver, error) {
 		rd.Close()
 	}()
 	var done = make(chan error)
-	repo, err := models.GetRepositoryByID(archiver.RepoID)
+	repo, err := repo_model.GetRepositoryByID(archiver.RepoID)
 	if err != nil {
 		return nil, fmt.Errorf("archiver.LoadRepo failed: %v", err)
 	}

services/repository/repository.go

@@ -31,11 +31,7 @@ func CreateRepository(doer, owner *user_model.User, opts models.CreateRepoOption
 }
 
 // DeleteRepository deletes a repository for a user or organization.
-<<<<<<< HEAD
-func DeleteRepository(doer *user_model.User, repo *repo_model.Repository) error {
-=======
-func DeleteRepository(doer *user_model.User, repo *models.Repository, notify bool) error {
->>>>>>> 3db02666b (Move keys to models/keys)
+func DeleteRepository(doer *user_model.User, repo *repo_model.Repository, notify bool) error {
 	if err := pull_service.CloseRepoBranchesPulls(doer, repo); err != nil {
 		log.Error("CloseRepoBranchesPulls failed: %v", err)
 	}