Skip to content

Commit c459a7e

Browse files
committed
Fix simple server
1 parent bc0bca5 commit c459a7e

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

simple_server.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,29 @@ func serverConfig(addr string) (host string, config *ssh.ServerConfig, err error
6666
}
6767

6868
hostkeyFiles := ur.Query()["hostkey_file"]
69-
for _, ident := range hostkeyFiles {
70-
if ident == "" {
71-
continue
69+
if len(hostkeyFiles) == 0 {
70+
key, err := sshd.RandomHostkey()
71+
if err != nil {
72+
return "", nil, err
7273
}
73-
if strings.HasPrefix(ident, "~") {
74-
home, err := os.UserHomeDir()
75-
if err == nil {
76-
ident = filepath.Join(home, ident[1:])
74+
config.AddHostKey(key)
75+
} else {
76+
for _, ident := range hostkeyFiles {
77+
if ident == "" {
78+
continue
79+
}
80+
if strings.HasPrefix(ident, "~") {
81+
home, err := os.UserHomeDir()
82+
if err == nil {
83+
ident = filepath.Join(home, ident[1:])
84+
}
7785
}
78-
}
7986

80-
if ident != "" {
8187
key, err := sshd.GetHostkey(ident)
8288
if err != nil {
8389
return "", nil, err
8490
}
8591
config.AddHostKey(key)
86-
} else {
87-
key, err := sshd.RandomHostkey()
88-
if err != nil {
89-
return "", nil, err
90-
}
91-
config.AddHostKey(key)
9292
}
9393
}
9494
identityFiles := ur.Query()["authorized_file"]

0 commit comments

Comments
 (0)