Mirrors
/
nebula
mirror of https://github.com/slackhq/nebula.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support inlined sshd host key (#1054)

This commit is contained in:
Lingfeng Zhang 2024-01-23 02:58:44 +08:00 committed by GitHub
parent 3210198276
commit 1f83d1758d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssh.go
View File

@ -90,14 +90,19 @@ func configSSH(l *logrus.Logger, ssh *sshd.SSHServer, c *config.C) (func(), erro
} }
//TODO: no good way to reload this right now //TODO: no good way to reload this right now
hostKeyFile := c.GetString("sshd.host_key", "") hostKeyPathOrKey := c.GetString("sshd.host_key", "")
if hostKeyFile == "" { if hostKeyPathOrKey == "" {
return nil, fmt.Errorf("sshd.host_key must be provided") return nil, fmt.Errorf("sshd.host_key must be provided")
} }
hostKeyBytes, err := os.ReadFile(hostKeyFile) var hostKeyBytes []byte
if err != nil { if strings.Contains(hostKeyPathOrKey, "-----BEGIN") {
return nil, fmt.Errorf("error while loading sshd.host_key file: %s", err) hostKeyBytes = []byte(hostKeyPathOrKey)
} else {
hostKeyBytes, err = os.ReadFile(hostKeyPathOrKey)
if err != nil {
return nil, fmt.Errorf("error while loading sshd.host_key file: %s", err)
}
} }
err = ssh.SetHostKey(hostKeyBytes) err = ssh.SetHostKey(hostKeyBytes)