linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

race condition on keydelete

Browse Source
This commit is contained in:
Don Bowman 2015-08-12 22:00:43 +00:00
parent 1cb46ede1a
commit ab0247b4dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
models/publickey.go
View File

@ -386,8 +386,6 @@ func ListPublicKeys(uid int64) ([]*PublicKey, error) {
// rewriteAuthorizedKeys finds and deletes corresponding line in authorized_keys file. // rewriteAuthorizedKeys finds and deletes corresponding line in authorized_keys file.
func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error { func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error {
sshOpLocker.Lock()
defer sshOpLocker.Unlock()
fr, err := os.Open(p) fr, err := os.Open(p)
if err != nil { if err != nil {
@ -444,6 +442,9 @@ func UpdatePublicKey(key *PublicKey) error {
} }
func deletePublicKey(e *xorm.Session, key *PublicKey) error { func deletePublicKey(e *xorm.Session, key *PublicKey) error {
sshOpLocker.Lock()
defer sshOpLocker.Unlock()
has, err := e.Get(key) has, err := e.Get(key)
if err != nil { if err != nil {
return err return err