hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

P2P demo tweaks

Browse source
This commit is contained in:
Neil Alexander 2022-09-12 10:19:02 +01:00
parent 5997c32452
commit 3a9dde28fd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/gobind-pinecone/monolith.go
View file

@ -218,6 +218,9 @@ func (m *DendriteMonolith) Start() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} else { } else {
if sk, err = os.ReadFile(oldkeyfile); err != nil { if sk, err = os.ReadFile(oldkeyfile); err != nil {
panic("failed to read the old private key: " + err.Error()) panic("failed to read the old private key: " + err.Error())
@ -233,8 +236,13 @@ func (m *DendriteMonolith) Start() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} }
pk = sk.Public().(ed25519.PublicKey)
var err error var err error
m.listener, err = net.Listen("tcp", "localhost:65432") m.listener, err = net.Listen("tcp", "localhost:65432")
if err != nil { if err != nil {

8
build/gobind-yggdrasil/monolith.go
View file

@ -87,6 +87,9 @@ func (m *DendriteMonolith) Start() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} else { } else {
if sk, err = os.ReadFile(oldkeyfile); err != nil { if sk, err = os.ReadFile(oldkeyfile); err != nil {
panic("failed to read the old private key: " + err.Error()) panic("failed to read the old private key: " + err.Error())
@ -103,8 +106,13 @@ func (m *DendriteMonolith) Start() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} }
pk = sk.Public().(ed25519.PublicKey)
var err error var err error
m.listener, err = net.Listen("tcp", "localhost:65432") m.listener, err = net.Listen("tcp", "localhost:65432")
if err != nil { if err != nil {

10
cmd/dendrite-demo-pinecone/main.go
View file

@ -98,6 +98,9 @@ func main() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} else { } else {
if sk, err = os.ReadFile(oldkeyfile); err != nil { if sk, err = os.ReadFile(oldkeyfile); err != nil {
panic("failed to read the old private key: " + err.Error()) panic("failed to read the old private key: " + err.Error())
@ -114,7 +117,13 @@ func main() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} }
pk = sk.Public().(ed25519.PublicKey)
cfg.Defaults(config.DefaultOpts{ cfg.Defaults(config.DefaultOpts{
Generate: true, Generate: true,
Monolithic: true, Monolithic: true,
@ -136,7 +145,6 @@ func main() {
} }
} }
pk = sk.Public().(ed25519.PublicKey)
cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk)) cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)

9
cmd/dendrite-demo-yggdrasil/main.go
View file

@ -86,6 +86,9 @@ func main() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} else { } else {
if sk, err = os.ReadFile(oldkeyfile); err != nil { if sk, err = os.ReadFile(oldkeyfile); err != nil {
panic("failed to read the old private key: " + err.Error()) panic("failed to read the old private key: " + err.Error())
@ -102,8 +105,13 @@ func main() {
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic("failed to load PEM key: " + err.Error()) panic("failed to load PEM key: " + err.Error())
} }
if len(sk) != ed25519.PrivateKeySize {
panic("the private key is not long enough")
}
} }
pk = sk.Public().(ed25519.PublicKey)
// use custom config if config flag is set // use custom config if config flag is set
if configFlagSet { if configFlagSet {
cfg = setup.ParseFlags(true) cfg = setup.ParseFlags(true)
@ -129,7 +137,6 @@ func main() {
} }
} }
pk = sk.Public().(ed25519.PublicKey)
cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk)) cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)