Refactor pinecone demo to remove duplicate key setup
MODIFY
build/gobind-pinecone/monolith.go
build/gobind-pinecone/monolith.go
@@ -23,7 +23,6 @@ import (
"fmt"
"net"
"net/http"
- "os"
"path/filepath"
"strings"
"time"
@@ -33,6 +32,7 @@ import (
"github.com/matrix-org/dendrite/clientapi/userutil"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conduit"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conn"
+ "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/keys"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/relay"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/rooms"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/users"
@@ -49,7 +49,6 @@ import (
"github.com/matrix-org/dendrite/setup/base"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/setup/jetstream"
- "github.com/matrix-org/dendrite/test"
"github.com/matrix-org/dendrite/userapi"
userapiAPI "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/gomatrixserverlib"
@@ -351,45 +350,10 @@ func (m *DendriteMonolith) RegisterDevice(localpart, deviceID string) (string, e
return loginRes.Device.AccessToken, nil
}
-// nolint:gocyclo
func (m *DendriteMonolith) Start() {
- var sk ed25519.PrivateKey
- var pk ed25519.PublicKey
-
keyfile := filepath.Join(m.StorageDirectory, "p2p.pem")
- if _, err := os.Stat(keyfile); os.IsNotExist(err) {
- oldkeyfile := filepath.Join(m.StorageDirectory, "p2p.key")
- if _, err = os.Stat(oldkeyfile); os.IsNotExist(err) {
- if err = test.NewMatrixKey(keyfile); err != nil {
- panic("failed to generate a new PEM key: " + err.Error())
- }
- if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
- panic("failed to load PEM key: " + err.Error())
- }
- if len(sk) != ed25519.PrivateKeySize {
- panic("the private key is not long enough")
- }
- } else {
- if sk, err = os.ReadFile(oldkeyfile); err != nil {
- panic("failed to read the old private key: " + err.Error())
- }
- if len(sk) != ed25519.PrivateKeySize {
- panic("the private key is not long enough")
- }
- if err = test.SaveMatrixKey(keyfile, sk); err != nil {
- panic("failed to convert the private key to PEM format: " + err.Error())
- }
- }
- } else {
- if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
- 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)
+ oldKeyfile := filepath.Join(m.StorageDirectory, "p2p.key")
+ sk, pk := keys.GetOrCreateKey(keyfile, oldKeyfile)
var err error
m.listener, err = net.Listen("tcp", "localhost:65432")

ADD
cmd/dendrite-demo-pinecone/keys/keys.go
+// Copyright 2023 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package keys
+
+import (
+ "crypto/ed25519"
+ "os"
+
+ "github.com/matrix-org/dendrite/setup/config"
+ "github.com/matrix-org/dendrite/test"
+)
+
+func GetOrCreateKey(keyfile string, oldKeyfile string) (ed25519.PrivateKey, ed25519.PublicKey) {
+ var sk ed25519.PrivateKey
+ var pk ed25519.PublicKey
+
+ if _, err := os.Stat(keyfile); os.IsNotExist(err) {
+ if _, err = os.Stat(oldKeyfile); os.IsNotExist(err) {
+ if err = test.NewMatrixKey(keyfile); err != nil {
+ panic("failed to generate a new PEM key: " + err.Error())
+ }
+ if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
+ panic("failed to load PEM key: " + err.Error())
+ }
+ if len(sk) != ed25519.PrivateKeySize {
+ panic("the private key is not long enough")
+ }
+ } else {
+ if sk, err = os.ReadFile(oldKeyfile); err != nil {
+ panic("failed to read the old private key: " + err.Error())
+ }
+ if len(sk) != ed25519.PrivateKeySize {
+ panic("the private key is not long enough")
+ }
+ if err = test.SaveMatrixKey(keyfile, sk); err != nil {
+ panic("failed to convert the private key to PEM format: " + err.Error())
+ }
+ }
+ } else {
+ if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
+ 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)
+
+ return sk, pk
+}

MODIFY
cmd/dendrite-demo-pinecone/main.go
cmd/dendrite-demo-pinecone/main.go
@@ -33,6 +33,7 @@ import (
"github.com/matrix-org/dendrite/appservice"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conn"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/embed"
+ "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/keys"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/relay"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/rooms"
"github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/users"
@@ -49,7 +50,6 @@ import (
"github.com/matrix-org/dendrite/setup/base"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/setup/jetstream"
- "github.com/matrix-org/dendrite/test"
"github.com/matrix-org/dendrite/userapi"
"github.com/matrix-org/gomatrixserverlib"
@@ -71,7 +71,6 @@ var (
instanceRelayingEnabled = flag.Bool("relay", false, "whether to enable store & forward relaying for other nodes")
)
-// nolint:gocyclo
func main() {
flag.Parse()
internal.SetupPprof()
@@ -97,40 +96,8 @@ func main() {
pk = sk.Public().(ed25519.PublicKey)
} else {
keyfile := filepath.Join(*instanceDir, *instanceName) + ".pem"
- if _, err := os.Stat(keyfile); os.IsNotExist(err) {
- oldkeyfile := *instanceName + ".key"
- if _, err = os.Stat(oldkeyfile); os.IsNotExist(err) {
- if err = test.NewMatrixKey(keyfile); err != nil {
- panic("failed to generate a new PEM key: " + err.Error())
- }
- if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
- panic("failed to load PEM key: " + err.Error())
- }
- if len(sk) != ed25519.PrivateKeySize {
- panic("the private key is not long enough")
- }
- } else {
- if sk, err = os.ReadFile(oldkeyfile); err != nil {
- panic("failed to read the old private key: " + err.Error())
- }
- if len(sk) != ed25519.PrivateKeySize {
- panic("the private key is not long enough")
- }
- if err := test.SaveMatrixKey(keyfile, sk); err != nil {
- panic("failed to convert the private key to PEM format: " + err.Error())
- }
- }
- } else {
- var err error
- if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
- 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)
+ oldKeyfile := *instanceName + ".key"
+ sk, pk = keys.GetOrCreateKey(keyfile, oldKeyfile)
cfg.Defaults(config.DefaultOpts{
Generate: true,

Refactor pinecone demo to remove duplicate key setup