Skip to content

Commit 45d73fa

Browse files
committed
fix: Don't rewrite key if internal server
1 parent 38fdab9 commit 45d73fa

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

models/ssh_key.go

+10
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,11 @@ func CheckPublicKeyString(content string) (_ string, err error) {
304304

305305
// appendAuthorizedKeysToFile appends new SSH keys' content to authorized_keys file.
306306
func appendAuthorizedKeysToFile(keys ...*PublicKey) error {
307+
// Don't need to rewrite this file if builtin SSH server is enabled.
308+
if setting.SSH.StartBuiltinServer {
309+
return nil
310+
}
311+
307312
sshOpLocker.Lock()
308313
defer sshOpLocker.Unlock()
309314

@@ -532,6 +537,11 @@ func DeletePublicKey(doer *User, id int64) (err error) {
532537
// Note: x.Iterate does not get latest data after insert/delete, so we have to call this function
533538
// outside any session scope independently.
534539
func RewriteAllPublicKeys() error {
540+
//Don't rewrite key if internal server
541+
if setting.SSH.StartBuiltinServer {
542+
return nil
543+
}
544+
535545
sshOpLocker.Lock()
536546
defer sshOpLocker.Unlock()
537547

0 commit comments

Comments
 (0)