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

Moved defer f.Close() up so there is no chance of returning without closing and handled an error on f.Chmod

Browse source
This commit is contained in:
Sebastian Jackel 2014-08-07 11:06:42 +02:00
parent 51abaf788c
commit 0bfbefc38a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
models/publickey.go
View file

@ -155,17 +155,19 @@ func saveAuthorizedKeyFile(key *PublicKey) error {
if err != nil { if err != nil {
return err return err
} }
defer f.Close()
finfo, err := f.Stat() finfo, err := f.Stat()
if err != nil { if err != nil {
return err return err
} }
if finfo.Mode().Perm() > 0600 { if finfo.Mode().Perm() > 0600 {
log.Error(3, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String()) log.Error(3, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
f.Chmod(0600) err = f.Chmod(0600)
if err != nil {
return err
}
} }
defer f.Close()
_, err = f.WriteString(key.GetAuthorizedString()) _, err = f.WriteString(key.GetAuthorizedString())
return err return err
} }