From fbd9c11c3c17da3da62659e7295fd0b1421746bb Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 8 Jul 2020 15:48:10 +0100 Subject: [PATCH 1/3] Check error when setting static peer --- cmd/dendrite-demo-yggdrasil/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index f64bb2513..84e2dbd03 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -62,7 +62,9 @@ func main() { } ygg.SetMulticastEnabled(true) if instancePeer != nil && *instancePeer != "" { - ygg.SetStaticPeer(*instancePeer) + if err := ygg.SetStaticPeer(*instancePeer); err != nil { + logrus.WithError(err).Error("Failed to set static peer") + } } cfg := &config.Dendrite{} From 4370a808e394e23f36dfd61fd82bba95720ae075 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 8 Jul 2020 16:24:31 +0100 Subject: [PATCH 2/3] Fix media path for iOS gobind build --- build/gobind/monolith.go | 2 ++ cmd/dendrite-demo-yggdrasil/yggconn/node.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/gobind/monolith.go b/build/gobind/monolith.go index 5f4c5513b..d220fabc4 100644 --- a/build/gobind/monolith.go +++ b/build/gobind/monolith.go @@ -95,6 +95,8 @@ func (m *DendriteMonolith) Start() { cfg.Database.AppService = config.DataSource(fmt.Sprintf("file:%s/dendrite-appservice.db", m.StorageDirectory)) cfg.Database.CurrentState = config.DataSource(fmt.Sprintf("file:%s/dendrite-currentstate.db", m.StorageDirectory)) cfg.Database.Naffka = config.DataSource(fmt.Sprintf("file:%s/dendrite-naffka.db", m.StorageDirectory)) + cfg.Media.BasePath = config.Path(fmt.Sprintf("%s/tmp", m.StorageDirectory)) + cfg.Media.AbsBasePath = config.Path(fmt.Sprintf("%s/tmp", m.StorageDirectory)) if err = cfg.Derive(); err != nil { panic(err) } diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go index 79a56c8ef..89fb69b53 100644 --- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go +++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go @@ -138,7 +138,7 @@ func Setup(instanceName, storageDirectory string) (*Node, error) { MaxIncomingUniStreams: 0, KeepAlive: true, MaxIdleTimeout: time.Second * 60, - HandshakeTimeout: time.Second * 30, + HandshakeTimeout: time.Second * 15, } n.log.Println("Public curve25519:", n.core.EncryptionPublicKey()) From 6bee6e77d97ff1413bccc759385a68a90421ac8c Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 8 Jul 2020 16:39:50 +0100 Subject: [PATCH 3/3] Yet another v1 vs r0 media endpoint (#1190) --- mediaapi/routing/routing.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index bc0de0f45..f4a8b1575 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -53,12 +53,16 @@ func Setup( activeThumbnailGeneration := &types.ActiveThumbnailGeneration{ PathToResult: map[string]*types.ThumbnailGenerationResult{}, } - r0mux.Handle("/upload", httputil.MakeAuthAPI( + + uploadHandler := httputil.MakeAuthAPI( "upload", userAPI, func(req *http.Request, _ *userapi.Device) util.JSONResponse { return Upload(req, cfg, db, activeThumbnailGeneration) }, - )).Methods(http.MethodPost, http.MethodOptions) + ) + + r0mux.Handle("/upload", uploadHandler).Methods(http.MethodPost, http.MethodOptions) + v1mux.Handle("/upload", uploadHandler).Methods(http.MethodPost, http.MethodOptions) activeRemoteRequests := &types.ActiveRemoteRequests{ MXCToResult: map[string]*types.RemoteRequestResult{},