From 06337a5e557a1eaa52670e9f930d1d8c2dbb3a67 Mon Sep 17 00:00:00 2001 From: Daniel Aloni Date: Tue, 28 May 2024 17:17:59 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=92=20Make=20downloading=20media=20API?= =?UTF-8?q?=20authenticated.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/routes.go | 2 +- test/upload_suite_test.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/routes.go b/api/routes.go index 423a6e32..92db49c4 100644 --- a/api/routes.go +++ b/api/routes.go @@ -32,7 +32,7 @@ func buildRoutes() http.Handler { // Standard (spec) features register([]string{"PUT"}, PrefixMedia, "upload/:server/:mediaId", mxV3, router, makeRoute(_routers.RequireAccessToken(r0.UploadMediaAsync), "upload_async", counter)) register([]string{"POST"}, PrefixMedia, "upload", mxSpecV3Transition, router, makeRoute(_routers.RequireAccessToken(r0.UploadMediaSync), "upload", counter)) - downloadRoute := makeRoute(_routers.OptionalAccessToken(r0.DownloadMedia), "download", counter) + downloadRoute := makeRoute(_routers.RequireAccessToken(r0.DownloadMedia), "download", counter) register([]string{"GET"}, PrefixMedia, "download/:server/:mediaId/:filename", mxSpecV3Transition, router, downloadRoute) register([]string{"GET"}, PrefixMedia, "download/:server/:mediaId", mxSpecV3Transition, router, downloadRoute) register([]string{"GET"}, PrefixMedia, "thumbnail/:server/:mediaId", mxSpecV3Transition, router, makeRoute(_routers.OptionalAccessToken(r0.ThumbnailMedia), "thumbnail", counter)) diff --git a/test/upload_suite_test.go b/test/upload_suite_test.go index a4b88a3e..687bcc53 100644 --- a/test/upload_suite_test.go +++ b/test/upload_suite_test.go @@ -45,10 +45,10 @@ func (s *UploadTestSuite) TestUpload() { client1 := s.deps.Homeservers[0].UnprivilegedUsers[0].WithCsUrl(s.deps.Machines[0].HttpUrl) client2 := &test_internals.MatrixClient{ - ClientServerUrl: s.deps.Machines[1].HttpUrl, // deliberately the second machine - ServerName: s.deps.Homeservers[1].ServerName, // deliberately the second machine - AccessToken: "", // no auth for downloads - UserId: "", // no auth for downloads + ClientServerUrl: s.deps.Machines[1].HttpUrl, // deliberately the second machine + ServerName: s.deps.Homeservers[1].ServerName, // deliberately the second machine + AccessToken: s.deps.Homeservers[1].UnprivilegedUsers[0].AccessToken, // GK CUSTOMIZATION: auth for downloads + UserId: s.deps.Homeservers[1].UnprivilegedUsers[0].UserId, // GK CUSTOMIZATION: auth for downloads } contentType, img, err := test_internals.MakeTestImage(512, 512) @@ -256,10 +256,10 @@ func (s *UploadTestSuite) TestUploadAsyncFlow() { client1 := s.deps.Homeservers[0].UnprivilegedUsers[0].WithCsUrl(s.deps.Machines[0].HttpUrl) client2 := &test_internals.MatrixClient{ - ClientServerUrl: s.deps.Machines[1].HttpUrl, // deliberately the second machine - ServerName: s.deps.Homeservers[1].ServerName, // deliberately the second machine - AccessToken: "", // no auth for downloads - UserId: "", // no auth for downloads + ClientServerUrl: s.deps.Machines[1].HttpUrl, // deliberately the second machine + ServerName: s.deps.Homeservers[1].ServerName, // deliberately the second machine + AccessToken: s.deps.Homeservers[1].UnprivilegedUsers[0].AccessToken, // GK CUSTOMIZATION: auth for downloads + UserId: s.deps.Homeservers[1].UnprivilegedUsers[0].UserId, // GK CUSTOMIZATION: auth for downloads } contentType, img, err := test_internals.MakeTestImage(512, 512)