Parcourir la source

#2147 fix rewrites authorized_keys when builtin SSH server is enabled

Unknwon il y a 8 ans
Parent
commit
bc17f2f759
1 fichiers modifiés avec 10 ajouts et 0 suppressions
  1. 10 0
      models/ssh_key.go

+ 10 - 0
models/publickey.go → models/ssh_key.go

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