direktil/initrd
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ssh: load more host key formats than rsa

Browse Source
This commit is contained in:
Mikaël Cluseau 2023-12-17 15:33:56 +01:00
parent d69f2f27ee
commit 650c913930
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap.go
View File

@ -133,6 +133,7 @@ func setUserPass(user, passwordHash string) {
p := strings.Split(line, ":") p := strings.Split(line, ":")
if len(p) < 2 || p[0] != user { if len(p) < 2 || p[0] != user {
buf.WriteString(line) buf.WriteString(line)
buf.WriteByte('\n')
continue continue
} }

17
ssh.go
View File

@ -23,17 +23,28 @@ func startSSH(cfg *config.Config) {
PublicKeyCallback: sshCheckPubkey, PublicKeyCallback: sshCheckPubkey,
} }
pkBytes, err := os.ReadFile("/id_rsa") // TODO configurable hostKeyLoaded := false
for _, format := range []string{"rsa", "dsa", "ecdsa", "ed25519"} {
pkBytes, err := os.ReadFile("/id_" + format)
if err != nil { if err != nil {
fatalf("ssh: failed to load private key: %v", err) log.Printf("ssh : failed to load %s host key: %v", format, err)
continue
} }
pk, err := ssh.ParsePrivateKey(pkBytes) pk, err := ssh.ParsePrivateKey(pkBytes)
if err != nil { if err != nil {
fatalf("ssh: failed to parse private key: %v", err) log.Printf("ssh: failed to parse %s host key: %v", format, err)
continue
} }
sshConfig.AddHostKey(pk) sshConfig.AddHostKey(pk)
hostKeyLoaded = true
}
if !hostKeyLoaded {
fatalf("ssh: failed to load any host key")
}
sshBind := ":22" // TODO configurable sshBind := ":22" // TODO configurable
listener, err := net.Listen("tcp", sshBind) listener, err := net.Listen("tcp", sshBind)