specialApe
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#2147 fix rewrites authorized_keys when builtin SSH server is enabled

This commit is contained in:
Unknwon 2015-12-11 05:02:33 -05:00
parent 40f3142264
commit bc17f2f759
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/publickey.go → models/ssh_key.go
View File

@ -299,6 +299,11 @@ func addKey(e Engine, key *PublicKey) (err error) {
if _, err = e.Insert(key); err != nil { if _, err = e.Insert(key); err != nil {
return err return err
} }
// Don't need to rewrite this file if builtin SSH server is enabled.
if setting.StartSSHServer {
return nil
}
return saveAuthorizedKeyFile(key) return saveAuthorizedKeyFile(key)
} }
@ -439,6 +444,11 @@ func deletePublicKey(e *xorm.Session, keyID int64) error {
return err return err
} }
// Don't need to rewrite this file if builtin SSH server is enabled.
if setting.StartSSHServer {
return nil
}
fpath := filepath.Join(SSHPath, "authorized_keys") fpath := filepath.Join(SSHPath, "authorized_keys")
tmpPath := filepath.Join(SSHPath, "authorized_keys.tmp") tmpPath := filepath.Join(SSHPath, "authorized_keys.tmp")
if err = rewriteAuthorizedKeys(key, fpath, tmpPath); err != nil { if err = rewriteAuthorizedKeys(key, fpath, tmpPath); err != nil {