summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/access.go6
-rw-r--r--models/action.go86
-rw-r--r--models/error.go84
-rw-r--r--models/login.go6
-rw-r--r--models/migrations/migrations.go5
-rw-r--r--models/models.go9
-rw-r--r--models/org.go35
-rw-r--r--models/publickey.go9
-rw-r--r--models/repo.go168
-rw-r--r--models/user.go89
-rw-r--r--models/webhook.go2
11 files changed, 318 insertions, 181 deletions
diff --git a/models/access.go b/models/access.go
index f353c39a2f..ea2f7f7b4b 100644
--- a/models/access.go
+++ b/models/access.go
@@ -6,6 +6,8 @@ package models
import (
"fmt"
+
+ "github.com/gogits/gogs/modules/log"
)
type AccessMode int
@@ -77,6 +79,10 @@ func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) {
for _, access := range accesses {
repo, err := GetRepositoryById(access.RepoID)
if err != nil {
+ if IsErrRepoNotExist(err) {
+ log.Error(4, "%v", err)
+ continue
+ }
return nil, err
}
if err = repo.GetOwner(); err != nil {
diff --git a/models/action.go b/models/action.go
index f872104eb2..d3393728fb 100644
--- a/models/action.go
+++ b/models/action.go
@@ -61,14 +61,14 @@ func init() {
// Action represents user operation type and other information to repository.,
// it implemented interface base.Actioner so that can be used in template render.
type Action struct {
- Id int64
- UserId int64 // Receiver user id.
+ ID int64 `xorm:"pk autoincr"`
+ UserID int64 // Receiver user id.
OpType ActionType
- ActUserId int64 // Action user id.
+ ActUserID int64 // Action user id.
ActUserName string // Action user name.
ActEmail string
ActAvatar string `xorm:"-"`
- RepoId int64
+ RepoID int64
RepoUserName string
RepoName string
RefName string
@@ -97,8 +97,15 @@ func (a Action) GetRepoName() string {
return a.RepoName
}
+func (a Action) GetRepoPath() string {
+ return path.Join(a.RepoUserName, a.RepoName)
+}
+
func (a Action) GetRepoLink() string {
- return path.Join(setting.AppSubUrl, a.RepoUserName, a.RepoName)
+ if len(setting.AppSubUrl) > 0 {
+ return path.Join(setting.AppSubUrl, a.GetRepoPath())
+ }
+ return "/" + a.GetRepoPath()
}
func (a Action) GetBranch() string {
@@ -302,7 +309,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
return errors.New("action.CommitRepoAction(GetRepositoryByName): " + err.Error())
}
repo.IsBare = false
- if err = UpdateRepository(repo); err != nil {
+ if err = UpdateRepository(repo, false); err != nil {
return errors.New("action.CommitRepoAction(UpdateRepository): " + err.Error())
}
@@ -312,10 +319,18 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
log.Debug("action.CommitRepoAction(updateIssuesCommit): ", err)
}
- if err = NotifyWatchers(&Action{ActUserId: userId, ActUserName: userName, ActEmail: actEmail,
- OpType: opType, Content: string(bs), RepoId: repoId, RepoUserName: repoUserName,
- RepoName: repoName, RefName: refName,
- IsPrivate: repo.IsPrivate}); err != nil {
+ if err = NotifyWatchers(&Action{
+ ActUserID: userId,
+ ActUserName: userName,
+ ActEmail: actEmail,
+ OpType: opType,
+ Content: string(bs),
+ RepoID: repoId,
+ RepoUserName: repoUserName,
+ RepoName: repoName,
+ RefName: refName,
+ IsPrivate: repo.IsPrivate,
+ }); err != nil {
return errors.New("action.CommitRepoAction(NotifyWatchers): " + err.Error())
}
@@ -402,32 +417,28 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
continue
}
+ var payload BasePayload
switch w.HookTaskType {
case SLACK:
- {
- s, err := GetSlackPayload(p, w.Meta)
- if err != nil {
- return errors.New("action.GetSlackPayload: " + err.Error())
- }
- CreateHookTask(&HookTask{
- Type: w.HookTaskType,
- Url: w.Url,
- BasePayload: s,
- ContentType: w.ContentType,
- IsSsl: w.IsSsl,
- })
+ s, err := GetSlackPayload(p, w.Meta)
+ if err != nil {
+ return errors.New("action.GetSlackPayload: " + err.Error())
}
+ payload = s
default:
- {
- p.Secret = w.Secret
- CreateHookTask(&HookTask{
- Type: w.HookTaskType,
- Url: w.Url,
- BasePayload: p,
- ContentType: w.ContentType,
- IsSsl: w.IsSsl,
- })
- }
+ payload = p
+ p.Secret = w.Secret
+ }
+
+ if err = CreateHookTask(&HookTask{
+ Type: w.HookTaskType,
+ Url: w.Url,
+ BasePayload: payload,
+ ContentType: w.ContentType,
+ EventType: HOOK_EVENT_PUSH,
+ IsSsl: w.IsSsl,
+ }); err != nil {
+ return fmt.Errorf("CreateHookTask: %v", err)
}
}
@@ -436,14 +447,15 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
func newRepoAction(e Engine, u *User, repo *Repository) (err error) {
if err = notifyWatchers(e, &Action{
- ActUserId: u.Id,
+ ActUserID: u.Id,
ActUserName: u.Name,
ActEmail: u.Email,
OpType: CREATE_REPO,
- RepoId: repo.Id,
+ RepoID: repo.Id,
RepoUserName: repo.Owner.Name,
RepoName: repo.Name,
- IsPrivate: repo.IsPrivate}); err != nil {
+ IsPrivate: repo.IsPrivate,
+ }); err != nil {
return fmt.Errorf("notify watchers '%d/%s'", u.Id, repo.Id)
}
@@ -458,11 +470,11 @@ func NewRepoAction(u *User, repo *Repository) (err error) {
func transferRepoAction(e Engine, actUser, oldOwner, newOwner *User, repo *Repository) (err error) {
action := &Action{
- ActUserId: actUser.Id,
+ ActUserID: actUser.Id,
ActUserName: actUser.Name,
ActEmail: actUser.Email,
OpType: TRANSFER_REPO,
- RepoId: repo.Id,
+ RepoID: repo.Id,
RepoUserName: newOwner.Name,
RepoName: repo.Name,
IsPrivate: repo.IsPrivate,
diff --git a/models/error.go b/models/error.go
new file mode 100644
index 0000000000..a434b8d6da
--- /dev/null
+++ b/models/error.go
@@ -0,0 +1,84 @@
+// Copyright 2015 The Gogs 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"
+)
+
+// ____ ___
+// | | \______ ___________
+// | | / ___// __ \_ __ \
+// | | /\___ \\ ___/| | \/
+// |______//____ >\___ >__|
+// \/ \/
+
+type ErrUserOwnRepos struct {
+ UID int64
+}
+
+func IsErrUserOwnRepos(err error) bool {
+ _, ok := err.(ErrUserOwnRepos)
+ return ok
+}
+
+func (err ErrUserOwnRepos) Error() string {
+ return fmt.Sprintf("user still has ownership of repositories: [uid: %d]", err.UID)
+}
+
+type ErrUserHasOrgs struct {
+ UID int64
+}
+
+func IsErrUserHasOrgs(err error) bool {
+ _, ok := err.(ErrUserHasOrgs)
+ return ok
+}
+
+func (err ErrUserHasOrgs) Error() string {
+ return fmt.Sprintf("user still has membership of organizations: [uid: %d]", err.UID)
+}
+
+// ________ .__ __ .__
+// \_____ \_______ _________ ____ |__|____________ _/ |_|__| ____ ____
+// / | \_ __ \/ ___\__ \ / \| \___ /\__ \\ __\ |/ _ \ / \
+// / | \ | \/ /_/ > __ \| | \ |/ / / __ \| | | ( <_> ) | \
+// \_______ /__| \___ (____ /___| /__/_____ \(____ /__| |__|\____/|___| /
+// \/ /_____/ \/ \/ \/ \/ \/
+
+type ErrLastOrgOwner struct {
+ UID int64
+}
+
+func IsErrLastOrgOwner(err error) bool {
+ _, ok := err.(ErrLastOrgOwner)
+ return ok
+}
+
+func (err ErrLastOrgOwner) Error() string {
+ return fmt.Sprintf("user is the last member of owner team: [uid: %d]", err.UID)
+}
+
+// __________ .__ __
+// \______ \ ____ ______ ____ _____|__|/ |_ ___________ ___.__.
+// | _// __ \\____ \ / _ \/ ___/ \ __\/ _ \_ __ < | |
+// | | \ ___/| |_> > <_> )___ \| || | ( <_> ) | \/\___ |
+// |____|_ /\___ > __/ \____/____ >__||__| \____/|__| / ____|
+// \/ \/|__| \/ \/
+
+type ErrRepoNotExist struct {
+ ID int64
+ UID int64
+ Name string
+}
+
+func IsErrRepoNotExist(err error) bool {
+ _, ok := err.(ErrRepoNotExist)
+ return ok
+}
+
+func (err ErrRepoNotExist) Error() string {
+ return fmt.Sprintf("repository does not exist [id: %d, uid: %d, name: %s]", err.ID, err.UID, err.Name)
+}
diff --git a/models/login.go b/models/login.go
index e00d59b0ed..5e5fbf43fa 100644
--- a/models/login.go
+++ b/models/login.go
@@ -215,11 +215,9 @@ func UserSignIn(uname, passwd string) (*User, error) {
switch u.LoginType {
case LDAP:
- return LoginUserLdapSource(u, u.LoginName, passwd,
- source.Id, source.Cfg.(*LDAPConfig), false)
+ return LoginUserLdapSource(u, u.LoginName, passwd, source.Id, source.Cfg.(*LDAPConfig), false)
case SMTP:
- return LoginUserSMTPSource(u, u.LoginName, passwd,
- source.Id, source.Cfg.(*SMTPConfig), false)
+ return LoginUserSMTPSource(u, u.LoginName, passwd, source.Id, source.Cfg.(*SMTPConfig), false)
}
return nil, ErrUnsupportedLoginType
}
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 8d2d5b40a1..4b5f5a6975 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -341,12 +341,15 @@ func teamToTeamRepo(x *xorm.Engine) error {
orgID := com.StrTo(team["org_id"]).MustInt64()
teamID := com.StrTo(team["id"]).MustInt64()
+ // #1032: legacy code can have duplicated IDs for same repository.
+ mark := make(map[int64]bool)
for _, idStr := range strings.Split(string(team["repo_ids"]), "|") {
repoID := com.StrTo(strings.TrimPrefix(idStr, "$")).MustInt64()
- if repoID == 0 {
+ if repoID == 0 || mark[repoID] {
continue
}
+ mark[repoID] = true
teamRepos = append(teamRepos, &TeamRepo{
OrgID: orgID,
TeamID: teamID,
diff --git a/models/models.go b/models/models.go
index a9436fca85..b7986fed11 100644
--- a/models/models.go
+++ b/models/models.go
@@ -89,8 +89,13 @@ func getEngine() (*xorm.Engine, error) {
cnnstr := ""
switch DbCfg.Type {
case "mysql":
- cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
- DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name)
+ if DbCfg.Host[0] == '/' { // looks like a unix socket
+ cnnstr = fmt.Sprintf("%s:%s@unix(%s)/%s?charset=utf8",
+ DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name)
+ } else {
+ cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
+ DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name)
+ }
case "postgres":
var host, port = "127.0.0.1", "5432"
fields := strings.Split(DbCfg.Host, ":")
diff --git a/models/org.go b/models/org.go
index 2c2b9b6356..32f135cbb7 100644
--- a/models/org.go
+++ b/models/org.go
@@ -18,7 +18,6 @@ var (
ErrTeamAlreadyExist = errors.New("Team already exist")
ErrTeamNotExist = errors.New("Team does not exist")
ErrTeamNameIllegal = errors.New("Team name contains illegal characters")
- ErrLastOrgOwner = errors.New("The user to remove is the last member in owner team")
)
// IsOwnedBy returns true if given user is in the owner team.
@@ -339,18 +338,20 @@ func RemoveOrgUser(orgId, uid int64) error {
has, err := x.Where("uid=?", uid).And("org_id=?", orgId).Get(ou)
if err != nil {
- return err
+ return fmt.Errorf("get org-user: %v", err)
} else if !has {
return nil
}
u, err := GetUserById(uid)
if err != nil {
- return err
+ return fmt.Errorf("GetUserById: %v", err)
}
org, err := GetUserById(orgId)
if err != nil {
- return err
+ return fmt.Errorf("get organization: %v", err)
+ } else if err = org.GetRepositories(); err != nil {
+ return fmt.Errorf("GetRepositories: %v", err)
}
// Check if the user to delete is the last member in owner team.
@@ -360,49 +361,39 @@ func RemoveOrgUser(orgId, uid int64) error {
return err
}
if t.NumMembers == 1 {
- return ErrLastOrgOwner
+ return ErrLastOrgOwner{UID: uid}
}
}
sess := x.NewSession()
- defer sess.Close()
+ defer sessionRelease(sess)
if err := sess.Begin(); err != nil {
return err
}
if _, err := sess.Id(ou.ID).Delete(ou); err != nil {
- sess.Rollback()
return err
- } else if _, err = sess.Exec("UPDATE `user` SET num_members=num_members-1 WHERE id = ?", orgId); err != nil {
- sess.Rollback()
+ } else if _, err = sess.Exec("UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgId); err != nil {
return err
}
// Delete all repository accesses.
- if err = org.GetRepositories(); err != nil {
- sess.Rollback()
- return err
- }
- access := &Access{
- UserID: u.Id,
- }
+ access := &Access{UserID: u.Id}
for _, repo := range org.Repos {
access.RepoID = repo.Id
if _, err = sess.Delete(access); err != nil {
- sess.Rollback()
return err
- } else if err = WatchRepo(u.Id, repo.Id, false); err != nil {
- sess.Rollback()
+ } else if err = watchRepo(sess, u.Id, repo.Id, false); err != nil {
return err
}
}
// Delete member in his/her teams.
- ts, err := GetUserTeams(org.Id, u.Id)
+ teams, err := getUserTeams(sess, org.Id, u.Id)
if err != nil {
return err
}
- for _, t := range ts {
+ for _, t := range teams {
if err = removeTeamMember(sess, org.Id, t.ID, u.Id); err != nil {
return err
}
@@ -902,7 +893,7 @@ func removeTeamMember(e Engine, orgId, teamId, uid int64) error {
// Check if the user to delete is the last member in owner team.
if t.IsOwnerTeam() && t.NumMembers == 1 {
- return ErrLastOrgOwner
+ return ErrLastOrgOwner{UID: uid}
}
t.NumMembers--
diff --git a/models/publickey.go b/models/publickey.go
index 6bec1139b8..f6cd5b4cbb 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -254,15 +254,16 @@ func saveAuthorizedKeyFile(keys ...*PublicKey) error {
}
defer f.Close()
- finfo, err := f.Stat()
+ fi, err := f.Stat()
if err != nil {
return err
}
// FIXME: following command does not support in Windows.
if !setting.IsWindows {
- if finfo.Mode().Perm() > 0600 {
- log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
+ // .ssh directory should have mode 700, and authorized_keys file should have mode 600.
+ if fi.Mode().Perm() > 0600 {
+ log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", fi.Mode().Perm().String())
if err = f.Chmod(0600); err != nil {
return err
}
@@ -433,7 +434,7 @@ func RewriteAllPublicKeys() error {
defer sshOpLocker.Unlock()
tmpPath := filepath.Join(SSHPath, "authorized_keys.tmp")
- f, err := os.Create(tmpPath)
+ f, err := os.OpenFile(tmpPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
return err
}
diff --git a/models/repo.go b/models/repo.go
index 65cd368640..cfab329bab 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -23,6 +23,7 @@ import (
"github.com/Unknwon/com"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/git"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
@@ -35,7 +36,6 @@ const (
var (
ErrRepoAlreadyExist = errors.New("Repository already exist")
- ErrRepoNotExist = errors.New("Repository does not exist")
ErrRepoFileNotExist = errors.New("Repository file does not exist")
ErrRepoNameIllegal = errors.New("Repository name contains illegal characters")
ErrRepoFileNotLoaded = errors.New("Repository file not loaded")
@@ -56,7 +56,7 @@ func LoadRepoConfig() {
types := []string{"gitignore", "license"}
typeFiles := make([][]string, 2)
for i, t := range types {
- files, err := com.StatDir(path.Join("conf", t))
+ files, err := bindata.AssetDir("conf/" + t)
if err != nil {
log.Fatal(4, "Fail to get %s files: %v", t, err)
}
@@ -348,7 +348,7 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
return repo, err
}
repo.IsMirror = true
- return repo, UpdateRepository(repo)
+ return repo, UpdateRepository(repo, false)
} else {
os.RemoveAll(repoPath)
}
@@ -363,18 +363,7 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
return repo, fmt.Errorf("create update hook: %v", err)
}
- return repo, UpdateRepository(repo)
-}
-
-// extractGitBareZip extracts git-bare.zip to repository path.
-func extractGitBareZip(repoPath string) error {
- z, err := zip.Open(path.Join(setting.ConfRootPath, "content/git-bare.zip"))
- if err != nil {
- return err
- }
- defer z.Close()
-
- return z.ExtractTo(repoPath)
+ return repo, UpdateRepository(repo, false)
}
// initRepoCommit temporarily changes with work directory.
@@ -407,12 +396,14 @@ func createUpdateHook(repoPath string) error {
}
// InitRepository initializes README and .gitignore if needed.
-func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bool, repoLang, license string) error {
- repoPath := RepoPath(u.Name, repo.Name)
-
- // Create bare new repository.
- if err := extractGitBareZip(repoPath); err != nil {
- return err
+func initRepository(e Engine, repoPath string, u *User, repo *Repository, initReadme bool, repoLang, license string) error {
+ // Init bare new repository.
+ os.MkdirAll(repoPath, os.ModePerm)
+ _, stderr, err := process.ExecDir(-1, repoPath,
+ fmt.Sprintf("initRepository(git init --bare): %s", repoPath),
+ "git", "init", "--bare")
+ if err != nil {
+ return errors.New("git init --bare: " + stderr)
}
if err := createUpdateHook(repoPath); err != nil {
@@ -435,11 +426,11 @@ func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bo
tmpDir := filepath.Join(os.TempDir(), com.ToStr(time.Now().Nanosecond()))
os.MkdirAll(tmpDir, os.ModePerm)
- _, stderr, err := process.Exec(
+ _, stderr, err = process.Exec(
fmt.Sprintf("initRepository(git clone): %s", repoPath),
"git", "clone", repoPath, tmpDir)
if err != nil {
- return errors.New("initRepository(git clone): " + stderr)
+ return errors.New("git clone: " + stderr)
}
// README
@@ -452,43 +443,36 @@ func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bo
}
}
+ // FIXME: following two can be merged.
+
// .gitignore
- filePath := "conf/gitignore/" + repoLang
- if com.IsFile(filePath) {
- targetPath := path.Join(tmpDir, fileName["gitign"])
- if com.IsFile(filePath) {
- if err = com.Copy(filePath, targetPath); err != nil {
- return err
- }
- } else {
- // Check custom files.
- filePath = path.Join(setting.CustomPath, "conf/gitignore", repoLang)
- if com.IsFile(filePath) {
- if err := com.Copy(filePath, targetPath); err != nil {
- return err
- }
- }
+ // Copy custom file when available.
+ customPath := path.Join(setting.CustomPath, "conf/gitignore", repoLang)
+ targetPath := path.Join(tmpDir, fileName["gitign"])
+ if com.IsFile(customPath) {
+ if err := com.Copy(customPath, targetPath); err != nil {
+ return fmt.Errorf("copy gitignore: %v", err)
+ }
+ } else if com.IsSliceContainsStr(Gitignores, repoLang) {
+ if err = ioutil.WriteFile(targetPath,
+ bindata.MustAsset(path.Join("conf/gitignore", repoLang)), os.ModePerm); err != nil {
+ return fmt.Errorf("generate gitignore: %v", err)
}
} else {
delete(fileName, "gitign")
}
// LICENSE
- filePath = "conf/license/" + license
- if com.IsFile(filePath) {
- targetPath := path.Join(tmpDir, fileName["license"])
- if com.IsFile(filePath) {
- if err = com.Copy(filePath, targetPath); err != nil {
- return err
- }
- } else {
- // Check custom files.
- filePath = path.Join(setting.CustomPath, "conf/license", license)
- if com.IsFile(filePath) {
- if err := com.Copy(filePath, targetPath); err != nil {
- return err
- }
- }
+ customPath = path.Join(setting.CustomPath, "conf/license", license)
+ targetPath = path.Join(tmpDir, fileName["license"])
+ if com.IsFile(customPath) {
+ if err = com.Copy(customPath, targetPath); err != nil {
+ return fmt.Errorf("copy license: %v", err)
+ }
+ } else if com.IsSliceContainsStr(Licenses, license) {
+ if err = ioutil.WriteFile(targetPath,
+ bindata.MustAsset(path.Join("conf/license", license)), os.ModePerm); err != nil {
+ return fmt.Errorf("generate license: %v", err)
}
} else {
delete(fileName, "license")
@@ -502,7 +486,7 @@ func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bo
}
repo.IsBare = true
repo.DefaultBranch = "master"
- return updateRepository(e, repo)
+ return updateRepository(e, repo, false)
}
// Apply changes and commit.
@@ -734,7 +718,7 @@ func ChangeRepositoryName(userName, oldRepoName, newRepoName string) (err error)
return os.Rename(RepoPath(userName, oldRepoName), RepoPath(userName, newRepoName))
}
-func updateRepository(e Engine, repo *Repository) error {
+func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err error) {
repo.LowerName = strings.ToLower(repo.Name)
if len(repo.Description) > 255 {
@@ -743,12 +727,40 @@ func updateRepository(e Engine, repo *Repository) error {
if len(repo.Website) > 255 {
repo.Website = repo.Website[:255]
}
- _, err := e.Id(repo.Id).AllCols().Update(repo)
- return err
+
+ if _, err = e.Id(repo.Id).AllCols().Update(repo); err != nil {
+ return fmt.Errorf("update: %v", err)
+ }
+
+ if visibilityChanged {
+ if err = repo.getOwner(e); err != nil {
+ return fmt.Errorf("getOwner: %v", err)
+ }
+ if !repo.Owner.IsOrganization() {
+ return nil
+ }
+
+ // Organization repository need to recalculate access table when visivility is changed.
+ if err = repo.recalculateTeamAccesses(e, 0); err != nil {
+ return fmt.Errorf("recalculateTeamAccesses: %v", err)
+ }
+ }
+
+ return nil
}
-func UpdateRepository(repo *Repository) error {
- return updateRepository(x, repo)
+func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) {
+ sess := x.NewSession()
+ defer sessionRelease(sess)
+ if err = sess.Begin(); err != nil {
+ return err
+ }
+
+ if err = updateRepository(x, repo, visibilityChanged); err != nil {
+ return fmt.Errorf("updateRepository: %v", err)
+ }
+
+ return sess.Commit()
}
// DeleteRepository deletes a repository for a user or organization.
@@ -758,7 +770,7 @@ func DeleteRepository(uid, repoID int64, userName string) error {
if err != nil {
return err
} else if !has {
- return ErrRepoNotExist
+ return ErrRepoNotExist{repoID, uid, ""}
}
// In case is a organization.
@@ -792,9 +804,9 @@ func DeleteRepository(uid, repoID int64, userName string) error {
return err
} else if _, err = sess.Delete(&Access{RepoID: repo.Id}); err != nil {
return err
- } else if _, err = sess.Delete(&Action{RepoId: repo.Id}); err != nil {
+ } else if _, err = sess.Delete(&Action{RepoID: repo.Id}); err != nil {
return err
- } else if _, err = sess.Delete(&Watch{RepoId: repoID}); err != nil {
+ } else if _, err = sess.Delete(&Watch{RepoID: repoID}); err != nil {
return err
} else if _, err = sess.Delete(&Mirror{RepoId: repoID}); err != nil {
return err
@@ -875,18 +887,18 @@ func GetRepositoryByName(uid int64, repoName string) (*Repository, error) {
if err != nil {
return nil, err
} else if !has {
- return nil, ErrRepoNotExist
+ return nil, ErrRepoNotExist{0, uid, repoName}
}
return repo, err
}
func getRepositoryById(e Engine, id int64) (*Repository, error) {
- repo := &Repository{}
+ repo := new(Repository)
has, err := e.Id(id).Get(repo)
if err != nil {
return nil, err
} else if !has {
- return nil, ErrRepoNotExist
+ return nil, ErrRepoNotExist{id, 0, ""}
}
return repo, nil
}
@@ -1163,9 +1175,9 @@ func (repo *Repository) DeleteCollaborator(u *User) (err error) {
// Watch is connection request for receiving repository notification.
type Watch struct {
- Id int64
- UserId int64 `xorm:"UNIQUE(watch)"`
- RepoId int64 `xorm:"UNIQUE(watch)"`
+ ID int64 `xorm:"pk autoincr"`
+ UserID int64 `xorm:"UNIQUE(watch)"`
+ RepoID int64 `xorm:"UNIQUE(watch)"`
}
// IsWatching checks if user has watched given repository.
@@ -1179,7 +1191,7 @@ func watchRepo(e Engine, uid, repoId int64, watch bool) (err error) {
if IsWatching(uid, repoId) {
return nil
}
- if _, err = e.Insert(&Watch{RepoId: repoId, UserId: uid}); err != nil {
+ if _, err = e.Insert(&Watch{RepoID: repoId, UserID: uid}); err != nil {
return err
}
_, err = e.Exec("UPDATE `repository` SET num_watches = num_watches + 1 WHERE id = ?", repoId)
@@ -1190,7 +1202,7 @@ func watchRepo(e Engine, uid, repoId int64, watch bool) (err error) {
if _, err = e.Delete(&Watch{0, uid, repoId}); err != nil {
return err
}
- _, err = e.Exec("UPDATE `repository` SET num_watches = num_watches - 1 WHERE id = ?", repoId)
+ _, err = e.Exec("UPDATE `repository` SET num_watches=num_watches-1 WHERE id=?", repoId)
}
return err
}
@@ -1202,7 +1214,7 @@ func WatchRepo(uid, repoId int64, watch bool) (err error) {
func getWatchers(e Engine, rid int64) ([]*Watch, error) {
watches := make([]*Watch, 0, 10)
- err := e.Find(&watches, &Watch{RepoId: rid})
+ err := e.Find(&watches, &Watch{RepoID: rid})
return watches, err
}
@@ -1213,24 +1225,24 @@ func GetWatchers(rid int64) ([]*Watch, error) {
func notifyWatchers(e Engine, act *Action) error {
// Add feeds for user self and all watchers.
- watches, err := getWatchers(e, act.RepoId)
+ watches, err := getWatchers(e, act.RepoID)
if err != nil {
return fmt.Errorf("get watchers: %v", err)
}
// Add feed for actioner.
- act.UserId = act.ActUserId
+ act.UserID = act.ActUserID
if _, err = e.InsertOne(act); err != nil {
return fmt.Errorf("insert new actioner: %v", err)
}
for i := range watches {
- if act.ActUserId == watches[i].UserId {
+ if act.ActUserID == watches[i].UserID {
continue
}
- act.Id = 0
- act.UserId = watches[i].UserId
+ act.ID = 0
+ act.UserID = watches[i].UserID
if _, err = e.InsertOne(act); err != nil {
return fmt.Errorf("insert new action: %v", err)
}
@@ -1377,5 +1389,9 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit
return nil, fmt.Errorf("git update-server-info: %v", err)
}
+ if err = createUpdateHook(repoPath); err != nil {
+ return nil, fmt.Errorf("createUpdateHook: %v", err)
+ }
+
return repo, sess.Commit()
}
diff --git a/models/user.go b/models/user.go
index ea5041bdff..dcfd0dc5ec 100644
--- a/models/user.go
+++ b/models/user.go
@@ -36,8 +36,6 @@ const (
)
var (
- ErrUserOwnRepos = errors.New("User still have ownership of repositories")
- ErrUserHasOrgs = errors.New("User still have membership of organization")
ErrUserAlreadyExist = errors.New("User already exist")
ErrUserNotExist = errors.New("User does not exist")
ErrUserNotKeyOwner = errors.New("User does not the owner of public key")
@@ -124,7 +122,7 @@ func (u *User) AvatarLink() string {
switch {
case u.UseCustomAvatar:
return setting.AppSubUrl + "/avatars/" + com.ToStr(u.Id)
- case setting.DisableGravatar:
+ case setting.DisableGravatar, setting.OfflineMode:
return setting.AppSubUrl + "/img/avatar_default.jpg"
case setting.Service.EnableCacheAvatar:
return setting.AppSubUrl + "/avatar/" + u.Avatar
@@ -432,55 +430,75 @@ func UpdateUser(u *User) error {
return err
}
+// DeleteBeans deletes all given beans, beans should contain delete conditions.
+func DeleteBeans(e Engine, beans ...interface{}) (err error) {
+ for i := range beans {
+ if _, err = e.Delete(beans[i]); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
// FIXME: need some kind of mechanism to record failure. HINT: system notice
// DeleteUser completely and permanently deletes everything of user.
func DeleteUser(u *User) error {
// Check ownership of repository.
count, err := GetRepositoryCount(u)
if err != nil {
- return errors.New("GetRepositoryCount: " + err.Error())
+ return fmt.Errorf("GetRepositoryCount: %v", err)
} else if count > 0 {
- return ErrUserOwnRepos
+ return ErrUserOwnRepos{UID: u.Id}
}
// Check membership of organization.
count, err = u.GetOrganizationCount()
if err != nil {
- return errors.New("GetOrganizationCount: " + err.Error())
+ return fmt.Errorf("GetOrganizationCount: %v", err)
} else if count > 0 {
- return ErrUserHasOrgs
+ return ErrUserHasOrgs{UID: u.Id}
}
- // FIXME: check issues, other repos' commits
- // FIXME: roll backable in some point.
-
- // Delete all followers.
- if _, err = x.Delete(&Follow{FollowId: u.Id}); err != nil {
- return err
+ // Get watches before session.
+ watches := make([]*Watch, 0, 10)
+ if err = x.Where("user_id=?", u.Id).Find(&watches); err != nil {
+ return fmt.Errorf("get all watches: %v", err)
}
- // Delete oauth2.
- if _, err = x.Delete(&Oauth2{Uid: u.Id}); err != nil {
- return err
+ repoIDs := make([]int64, 0, len(watches))
+ for i := range watches {
+ repoIDs = append(repoIDs, watches[i].RepoID)
}
- // Delete all feeds.
- if _, err = x.Delete(&Action{UserId: u.Id}); err != nil {
- return err
- }
- // Delete all watches.
- if _, err = x.Delete(&Watch{UserId: u.Id}); err != nil {
+
+ // FIXME: check issues, other repos' commits
+
+ sess := x.NewSession()
+ defer sessionRelease(sess)
+ if err = sess.Begin(); err != nil {
return err
}
- // Delete all accesses.
- if _, err = x.Delete(&Access{UserID: u.Id}); err != nil {
+
+ if err = DeleteBeans(sess,
+ &Follow{FollowID: u.Id},
+ &Oauth2{Uid: u.Id},
+ &Action{UserID: u.Id},
+ &Access{UserID: u.Id},
+ &Collaboration{UserID: u.Id},
+ &EmailAddress{Uid: u.Id},
+ &Watch{UserID: u.Id},
+ ); err != nil {
return err
}
- // Delete all alternative email addresses
- if _, err = x.Delete(&EmailAddress{Uid: u.Id}); err != nil {
- return err
+
+ // Decrease all watch numbers.
+ for i := range repoIDs {
+ if _, err = sess.Exec("UPDATE `repository` SET num_watches=num_watches-1 WHERE id=?", repoIDs[i]); err != nil {
+ return err
+ }
}
+
// Delete all SSH keys.
keys := make([]*PublicKey, 0, 10)
- if err = x.Find(&keys, &PublicKey{OwnerId: u.Id}); err != nil {
+ if err = sess.Find(&keys, &PublicKey{OwnerId: u.Id}); err != nil {
return err
}
for _, key := range keys {
@@ -489,13 +507,16 @@ func DeleteUser(u *User) error {
}
}
+ if _, err = sess.Delete(u); err != nil {
+ return err
+ }
+
// Delete user directory.
if err = os.RemoveAll(UserPath(u.Name)); err != nil {
return err
}
- _, err = x.Delete(u)
- return err
+ return sess.Commit()
}
// DeleteInactivateUsers deletes all inactivate users and email addresses.
@@ -777,8 +798,8 @@ func SearchUserByName(opt SearchOption) (us []*User, err error) {
// Follow is connection request for receiving user notification.
type Follow struct {
Id int64
- UserId int64 `xorm:"unique(follow)"`
- FollowId int64 `xorm:"unique(follow)"`
+ UserID int64 `xorm:"unique(follow)"`
+ FollowID int64 `xorm:"unique(follow)"`
}
// FollowUser marks someone be another's follower.
@@ -787,7 +808,7 @@ func FollowUser(userId int64, followId int64) (err error) {
defer sess.Close()
sess.Begin()
- if _, err = sess.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil {
+ if _, err = sess.Insert(&Follow{UserID: userId, FollowID: followId}); err != nil {
sess.Rollback()
return err
}
@@ -812,7 +833,7 @@ func UnFollowUser(userId int64, unFollowId int64) (err error) {
defer session.Close()
session.Begin()
- if _, err = session.Delete(&Follow{UserId: userId, FollowId: unFollowId}); err != nil {
+ if _, err = session.Delete(&Follow{UserID: userId, FollowID: unFollowId}); err != nil {
session.Rollback()
return err
}
diff --git a/models/webhook.go b/models/webhook.go
index 96af0b6967..bfa52b9902 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -205,7 +205,7 @@ func IsValidHookTaskType(name string) bool {
type HookEventType string
const (
- PUSH HookEventType = "push"
+ HOOK_EVENT_PUSH HookEventType = "push"
)
// FIXME: just use go-gogs-client structs maybe?
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 14:10:48 +0000