aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/access.go11
-rw-r--r--models/action.go13
-rw-r--r--models/models.go12
-rw-r--r--models/publickey.go4
-rw-r--r--models/repo.go133
-rw-r--r--models/user.go39
6 files changed, 176 insertions, 36 deletions
diff --git a/models/access.go b/models/access.go
index 83261575..2c090015 100644
--- a/models/access.go
+++ b/models/access.go
@@ -7,6 +7,8 @@ package models
import (
"strings"
"time"
+
+ "github.com/lunny/xorm"
)
// Access types.
@@ -40,6 +42,15 @@ func UpdateAccess(access *Access) error {
return err
}
+// UpdateAccess updates access information with session for rolling back.
+func UpdateAccessWithSession(sess *xorm.Session, access *Access) error {
+ if _, err := sess.Id(access.Id).Update(access); err != nil {
+ sess.Rollback()
+ return err
+ }
+ return nil
+}
+
// HasAccess returns true if someone can read or write to given repository.
func HasAccess(userName, repoName string, mode int) (bool, error) {
return orm.Get(&Access{
diff --git a/models/action.go b/models/action.go
index 1e55df85..a642a82c 100644
--- a/models/action.go
+++ b/models/action.go
@@ -21,6 +21,7 @@ const (
OP_COMMIT_REPO
OP_CREATE_ISSUE
OP_PULL_REQUEST
+ OP_TRANSFER_REPO
)
// Action represents user operation type and other information to repository.,
@@ -108,6 +109,18 @@ func NewRepoAction(user *User, repo *Repository) (err error) {
return err
}
+// TransferRepoAction adds new action for transfering repository.
+func TransferRepoAction(user, newUser *User, repo *Repository) (err error) {
+ if err = NotifyWatchers(&Action{ActUserId: user.Id, ActUserName: user.Name, ActEmail: user.Email,
+ OpType: OP_TRANSFER_REPO, RepoId: repo.Id, RepoName: repo.Name, Content: newUser.Name}); err != nil {
+ log.Error("action.TransferRepoAction(notify watchers): %d/%s", user.Id, repo.Name)
+ return err
+ }
+
+ log.Trace("action.TransferRepoAction: %s/%s", user.LowerName, repo.LowerName)
+ return err
+}
+
// GetFeeds returns action list of given user in given context.
func GetFeeds(userid, offset int64, isProfile bool) ([]Action, error) {
actions := make([]Action, 0, 20)
diff --git a/models/models.go b/models/models.go
index 384f1fc4..0ad86337 100644
--- a/models/models.go
+++ b/models/models.go
@@ -53,10 +53,10 @@ func NewTestEngine(x *xorm.Engine) (err error) {
// os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
// x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
default:
- return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type)
+ return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v\n", err)
+ return fmt.Errorf("models.init(fail to conntect database): %v", err)
}
return x.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
@@ -75,10 +75,10 @@ func SetEngine() (err error) {
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
orm, err = xorm.NewEngine("sqlite3", DbCfg.Path)
default:
- return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type)
+ return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v\n", err)
+ return fmt.Errorf("models.init(fail to conntect database): %v", err)
}
// WARNNING: for serv command, MUST remove the output to os.stdout,
@@ -89,7 +89,7 @@ func SetEngine() (err error) {
f, err := os.Create(logPath)
if err != nil {
- return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err)
+ return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
}
orm.Logger = f
@@ -104,7 +104,7 @@ func NewEngine() (err error) {
return err
} else if err = orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
new(Action), new(Access), new(Issue), new(Comment)); err != nil {
- return fmt.Errorf("sync database struct error: %v\n", err)
+ return fmt.Errorf("sync database struct error: %v", err)
}
return nil
}
diff --git a/models/publickey.go b/models/publickey.go
index 3f2fcabd..ed47ff20 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -77,8 +77,8 @@ func init() {
// PublicKey represents a SSH key of user.
type PublicKey struct {
Id int64
- OwnerId int64 `xorm:"index"`
- Name string `xorm:"unique not null"`
+ OwnerId int64 `xorm:"unique(s) index not null"`
+ Name string `xorm:"unique(s) not null"`
Fingerprint string
Content string `xorm:"TEXT not null"`
Created time.Time `xorm:"created"`
diff --git a/models/repo.go b/models/repo.go
index 56f28909..acee6f6a 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -143,17 +143,17 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
return nil, err
}
- session := orm.NewSession()
- defer session.Close()
- session.Begin()
+ sess := orm.NewSession()
+ defer sess.Close()
+ sess.Begin()
- if _, err = session.Insert(repo); err != nil {
+ if _, err = sess.Insert(repo); err != nil {
if err2 := os.RemoveAll(repoPath); err2 != nil {
log.Error("repo.CreateRepository(repo): %v", err)
return nil, errors.New(fmt.Sprintf(
"delete repo directory %s/%s failed(1): %v", user.Name, repoName, err2))
}
- session.Rollback()
+ sess.Rollback()
return nil, err
}
@@ -162,8 +162,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
RepoName: strings.ToLower(path.Join(user.Name, repo.Name)),
Mode: AU_WRITABLE,
}
- if _, err = session.Insert(&access); err != nil {
- session.Rollback()
+ if _, err = sess.Insert(&access); err != nil {
+ sess.Rollback()
if err2 := os.RemoveAll(repoPath); err2 != nil {
log.Error("repo.CreateRepository(access): %v", err)
return nil, errors.New(fmt.Sprintf(
@@ -173,8 +173,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
}
rawSql := "UPDATE `user` SET num_repos = num_repos + 1 WHERE id = ?"
- if _, err = session.Exec(rawSql, user.Id); err != nil {
- session.Rollback()
+ if _, err = sess.Exec(rawSql, user.Id); err != nil {
+ sess.Rollback()
if err2 := os.RemoveAll(repoPath); err2 != nil {
log.Error("repo.CreateRepository(repo count): %v", err)
return nil, errors.New(fmt.Sprintf(
@@ -183,8 +183,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
return nil, err
}
- if err = session.Commit(); err != nil {
- session.Rollback()
+ if err = sess.Commit(); err != nil {
+ sess.Rollback()
if err2 := os.RemoveAll(repoPath); err2 != nil {
log.Error("repo.CreateRepository(commit): %v", err)
return nil, errors.New(fmt.Sprintf(
@@ -369,6 +369,76 @@ func RepoPath(userName, repoName string) string {
return filepath.Join(UserPath(userName), strings.ToLower(repoName)+".git")
}
+// TransferOwnership transfers all corresponding setting from old user to new one.
+func TransferOwnership(user *User, newOwner string, repo *Repository) (err error) {
+ newUser, err := GetUserByName(newOwner)
+ if err != nil {
+ return err
+ }
+
+ // Update accesses.
+ accesses := make([]Access, 0, 10)
+ if err = orm.Find(&accesses, &Access{RepoName: user.LowerName + "/" + repo.LowerName}); err != nil {
+ return err
+ }
+
+ sess := orm.NewSession()
+ defer sess.Close()
+ if err = sess.Begin(); err != nil {
+ return err
+ }
+
+ for i := range accesses {
+ accesses[i].RepoName = newUser.LowerName + "/" + repo.LowerName
+ if accesses[i].UserName == user.LowerName {
+ accesses[i].UserName = newUser.LowerName
+ }
+ if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
+ return err
+ }
+ }
+
+ // Update repository.
+ repo.OwnerId = newUser.Id
+ if _, err := sess.Id(repo.Id).Update(repo); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ // Update user repository number.
+ rawSql := "UPDATE `user` SET num_repos = num_repos + 1 WHERE id = ?"
+ if _, err = sess.Exec(rawSql, newUser.Id); err != nil {
+ sess.Rollback()
+ return err
+ }
+ rawSql = "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?"
+ if _, err = sess.Exec(rawSql, user.Id); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ // Add watch of new owner to repository.
+ if !IsWatching(newUser.Id, repo.Id) {
+ if err = WatchRepo(newUser.Id, repo.Id, true); err != nil {
+ sess.Rollback()
+ return err
+ }
+ }
+
+ if err = TransferRepoAction(user, newUser, repo); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ // Change repository directory name.
+ if err = os.Rename(RepoPath(user.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ return sess.Commit()
+}
+
// ChangeRepositoryName changes all corresponding setting from old repository name to new one.
func ChangeRepositoryName(userName, oldRepoName, newRepoName string) (err error) {
// Update accesses.
@@ -376,15 +446,27 @@ func ChangeRepositoryName(userName, oldRepoName, newRepoName string) (err error)
if err = orm.Find(&accesses, &Access{RepoName: strings.ToLower(userName + "/" + oldRepoName)}); err != nil {
return err
}
+
+ sess := orm.NewSession()
+ defer sess.Close()
+ if err = sess.Begin(); err != nil {
+ return err
+ }
+
for i := range accesses {
accesses[i].RepoName = userName + "/" + newRepoName
- if err = UpdateAccess(&accesses[i]); err != nil {
+ if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
return err
}
}
// Change repository directory name.
- return os.Rename(RepoPath(userName, oldRepoName), RepoPath(userName, newRepoName))
+ if err = os.Rename(RepoPath(userName, oldRepoName), RepoPath(userName, newRepoName)); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ return sess.Commit()
}
func UpdateRepository(repo *Repository) error {
@@ -410,29 +492,30 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) {
return ErrRepoNotExist
}
- session := orm.NewSession()
- if err = session.Begin(); err != nil {
+ sess := orm.NewSession()
+ defer sess.Close()
+ if err = sess.Begin(); err != nil {
return err
}
- if _, err = session.Delete(&Repository{Id: repoId}); err != nil {
- session.Rollback()
+ if _, err = sess.Delete(&Repository{Id: repoId}); err != nil {
+ sess.Rollback()
return err
}
- if _, err := session.Delete(&Access{RepoName: strings.ToLower(path.Join(userName, repo.Name))}); err != nil {
- session.Rollback()
+ if _, err := sess.Delete(&Access{RepoName: strings.ToLower(path.Join(userName, repo.Name))}); err != nil {
+ sess.Rollback()
return err
}
rawSql := "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?"
- if _, err = session.Exec(rawSql, userId); err != nil {
- session.Rollback()
+ if _, err = sess.Exec(rawSql, userId); err != nil {
+ sess.Rollback()
return err
}
- if _, err = session.Delete(&Watch{RepoId: repoId}); err != nil {
- session.Rollback()
+ if _, err = sess.Delete(&Watch{RepoId: repoId}); err != nil {
+ sess.Rollback()
return err
}
- if err = session.Commit(); err != nil {
- session.Rollback()
+ if err = sess.Commit(); err != nil {
+ sess.Rollback()
return err
}
if err = os.RemoveAll(RepoPath(userName, repo.Name)); err != nil {
diff --git a/models/user.go b/models/user.go
index c5e46b48..2196eae8 100644
--- a/models/user.go
+++ b/models/user.go
@@ -105,11 +105,17 @@ type Member struct {
// IsUserExist checks if given user name exist,
// the user name should be noncased unique.
func IsUserExist(name string) (bool, error) {
+ if len(name) == 0 {
+ return false, nil
+ }
return orm.Get(&User{LowerName: strings.ToLower(name)})
}
// IsEmailUsed returns true if the e-mail has been used.
func IsEmailUsed(email string) (bool, error) {
+ if len(email) == 0 {
+ return false, nil
+ }
return orm.Get(&User{Email: email})
}
@@ -212,11 +218,18 @@ func ChangeUserName(user *User, newUserName string) (err error) {
if err = orm.Find(&accesses, &Access{UserName: user.LowerName}); err != nil {
return err
}
+
+ sess := orm.NewSession()
+ defer sess.Close()
+ if err = sess.Begin(); err != nil {
+ return err
+ }
+
for i := range accesses {
accesses[i].UserName = newUserName
if strings.HasPrefix(accesses[i].RepoName, user.LowerName+"/") {
accesses[i].RepoName = strings.Replace(accesses[i].RepoName, user.LowerName, newUserName, 1)
- if err = UpdateAccess(&accesses[i]); err != nil {
+ if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
return err
}
}
@@ -235,14 +248,19 @@ func ChangeUserName(user *User, newUserName string) (err error) {
for j := range accesses {
accesses[j].RepoName = newUserName + "/" + repos[i].LowerName
- if err = UpdateAccess(&accesses[j]); err != nil {
+ if err = UpdateAccessWithSession(sess, &accesses[j]); err != nil {
return err
}
}
}
// Change user directory name.
- return os.Rename(UserPath(user.LowerName), UserPath(newUserName))
+ if err = os.Rename(UserPath(user.LowerName), UserPath(newUserName)); err != nil {
+ sess.Rollback()
+ return err
+ }
+
+ return sess.Commit()
}
// UpdateUser updates user's information.
@@ -349,6 +367,21 @@ func GetUserByName(name string) (*User, error) {
return user, nil
}
+// GetUserByEmail returns the user object by given e-mail if exists.
+func GetUserByEmail(email string) (*User, error) {
+ if len(email) == 0 {
+ return nil, ErrUserNotExist
+ }
+ user := &User{Email: strings.ToLower(email)}
+ has, err := orm.Get(user)
+ if err != nil {
+ return nil, err
+ } else if !has {
+ return nil, ErrUserNotExist
+ }
+ return user, nil
+}
+
// LoginUserPlain validates user by raw user name and password.
func LoginUserPlain(name, passwd string) (*User, error) {
user := User{LowerName: strings.ToLower(name), Passwd: passwd}
Powered by cgit, Themed by Ted Yin.