cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-24 19:31:36 +00:00
Code Releases Activity

Ensure PublicKey is correct when extracting from old config

Browse Source
This commit is contained in:
Neil Alexander 2021-06-05 21:40:58 +01:00
parent 5cede61a34
commit 54cced0b89
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/yggdrasil/main.go
View File

@ -82,18 +82,16 @@ func readConfig(log *log.Logger, useconf *bool, useconffile *string, normaliseco
if _, ok := dat["TunnelRouting"]; ok { if _, ok := dat["TunnelRouting"]; ok {
log.Warnln("WARNING: Tunnel routing is no longer supported") log.Warnln("WARNING: Tunnel routing is no longer supported")
} }
if _, ok := dat["SigningPrivateKey"]; ok { if old, ok := dat["SigningPrivateKey"]; ok {
log.Warnln("WARNING: The configuration file is out of date, please take a backup and then use -normaliseconf")
log.Warnln("WARNING: The \"SigningPrivateKey\" configuration option has been renamed to \"PrivateKey\"") log.Warnln("WARNING: The \"SigningPrivateKey\" configuration option has been renamed to \"PrivateKey\"")
if _, ok := dat["PrivateKey"]; !ok { if _, ok := dat["PrivateKey"]; !ok {
dat["PrivateKey"] = dat["SigningPrivateKey"] if privstr, err := hex.DecodeString(old.(string)); err == nil {
priv := ed25519.PrivateKey(privstr)
pub := priv.Public().(ed25519.PublicKey)
dat["PrivateKey"] = hex.EncodeToString(priv[:])
dat["PublicKey"] = hex.EncodeToString(pub[:])
} }
} }
if _, ok := dat["SigningPublicKey"]; ok {
log.Warnln("WARNING: The \"SigningPrivateKey\" configuration option has been renamed to \"PrivateKey\"")
if _, ok := dat["PublicKey"]; !ok {
dat["PublicKey"] = dat["SigningPublicKey"]
}
} }
// Sanitise the config // Sanitise the config
confJson, err := json.Marshal(dat) confJson, err := json.Marshal(dat)