finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:gogits/gogs

Browse source
This commit is contained in:
Lunny Xiao 2014-03-16 23:03:27 +08:00
commit 015174484a
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
models/user.go
View file

@ -168,6 +168,11 @@ func DeleteUser(user *User) error {
}
}
// Delete user directory.
if err = os.RemoveAll(UserPath(user.Name)); err != nil {
return err
}
_, err = orm.Delete(user)
// TODO: delete and update follower information.
return err
@ -175,8 +180,8 @@ func DeleteUser(user *User) error {
// EncodePasswd encodes password to safe format.
func (user *User) EncodePasswd() error {
var err error
user.Passwd, err = EncodePasswd(user.Passwd)
newPasswd, err := scrypt.Key([]byte(user.Passwd), []byte(UserPasswdSalt), 16384, 8, 1, 64)
user.Passwd = fmt.Sprintf("%x", newPasswd)
return err
}
@ -184,14 +189,6 @@ func UserPath(userName string) string {
return filepath.Join(RepoRootPath, userName)
}
func EncodePasswd(rawPasswd string) (string, error) {
newPasswd, err := scrypt.Key([]byte(rawPasswd), []byte(UserPasswdSalt), 16384, 8, 1, 64)
if err != nil {
return "", err
}
return fmt.Sprintf("%x", newPasswd), nil
}
func GetUserByKeyId(keyId int64) (*User, error) {
user := new(User)
has, err := orm.Sql("select a.* from user as a, public_key as b where a.id = b.owner_id and b.id=?", keyId).Get(user)