From 79daf31058a6de8f3763366b586a99bb4b8e632e Mon Sep 17 00:00:00 2001 From: Dan Magnus Lindvall Date: Wed, 28 Jun 2017 03:35:35 +0200 Subject: Setting to disable authorized_keys backup (#1856) * Add setting to disable authorized_keys backup when rewriting public keys Signed-off-by: Magnus Lindvall * Update default value to comply with documentation Signed-off-by: Magnus Lindvall * Use tmp-file instead of bak-file for saving manually added keys. Signed-off-by: Magnus Lindvall * Change casing Signed-off-by: Magnus Lindvall * Change casing and build bakpath with sprintf only Signed-off-by: Magnus Lindvall * Only close file once Signed-off-by: Magnus Lindvall * Do not modify calcFingerprint Signed-off-by: Magnus Lindvall * Fix casing Signed-off-by: Magnus Lindvall * Change style from disable to enable Signed-off-by: Magnus Lindvall * Change name, just SSH_BACKUP_AUTHORIZED_KEYS Signed-off-by: Magnus Lindvall * Do not check for directory existence if backup is disabled Signed-off-by: Magnus Lindvall --- models/ssh_key.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'models/ssh_key.go') diff --git a/models/ssh_key.go b/models/ssh_key.go index 947b2dabfd..f70e16c62a 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -324,8 +324,8 @@ func appendAuthorizedKeysToFile(keys ...*PublicKey) error { sshOpLocker.Lock() defer sshOpLocker.Unlock() - fpath := filepath.Join(setting.SSH.RootPath, "authorized_keys") - f, err := os.OpenFile(fpath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) + fPath := filepath.Join(setting.SSH.RootPath, "authorized_keys") + f, err := os.OpenFile(fPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) if err != nil { return err } @@ -558,53 +558,53 @@ func RewriteAllPublicKeys() error { sshOpLocker.Lock() defer sshOpLocker.Unlock() - fpath := filepath.Join(setting.SSH.RootPath, "authorized_keys") - tmpPath := fpath + ".tmp" - f, err := os.OpenFile(tmpPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600) + fPath := filepath.Join(setting.SSH.RootPath, "authorized_keys") + tmpPath := fPath + ".tmp" + t, err := os.OpenFile(tmpPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600) if err != nil { return err } defer func() { - f.Close() + t.Close() os.Remove(tmpPath) }() + if setting.SSH.AuthorizedKeysBackup && com.IsExist(fPath) { + bakPath := fmt.Sprintf("%s_%d.gitea_bak", fPath, time.Now().Unix()) + if err = com.Copy(fPath, bakPath); err != nil { + return err + } + } + err = x.Iterate(new(PublicKey), func(idx int, bean interface{}) (err error) { - _, err = f.WriteString((bean.(*PublicKey)).AuthorizedString()) + _, err = t.WriteString((bean.(*PublicKey)).AuthorizedString()) return err }) if err != nil { return err } - if com.IsExist(fpath) { - bakPath := fpath + fmt.Sprintf("_%d.gitea_bak", time.Now().Unix()) - if err = com.Copy(fpath, bakPath); err != nil { - return err - } - - p, err := os.Open(bakPath) + if com.IsExist(fPath) { + f, err := os.Open(fPath) if err != nil { return err } - defer p.Close() - - scanner := bufio.NewScanner(p) + scanner := bufio.NewScanner(f) for scanner.Scan() { line := scanner.Text() if strings.HasPrefix(line, tplCommentPrefix) { scanner.Scan() continue } - _, err = f.WriteString(line + "\n") + _, err = t.WriteString(line + "\n") if err != nil { return err } } + defer f.Close() } - f.Close() - if err = os.Rename(tmpPath, fpath); err != nil { + if err = os.Rename(tmpPath, fPath); err != nil { return err } -- cgit v1.2.3