mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-13 21:31:08 +01:00
33a1392541
We were escaping the URL before performing any pattern matching on it. This meant that if you sent data that URLdecoded to a "/", it would count as a "/" in the URL, potentially causing a 404. This was causing some flaky tests with some randomly-generated query parameters. Now, we keep URLs encoded while doing the pattern matching, and only afterwards do we URL decode each query parameter individually before passing them to their respective handler functions. github.com/gorilla/mux was also updated to v1.7.3 to fix a bug with URL encoding and subrouters.
108 lines
3.4 KiB
Go
108 lines
3.4 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// 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 routing
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/matrix-org/dendrite/clientapi/auth"
|
|
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
|
|
"github.com/matrix-org/dendrite/common"
|
|
"github.com/matrix-org/dendrite/common/config"
|
|
"github.com/matrix-org/dendrite/mediaapi/storage"
|
|
"github.com/matrix-org/dendrite/mediaapi/types"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/matrix-org/util"
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
)
|
|
|
|
const pathPrefixR0 = "/_matrix/media/r0"
|
|
|
|
// Setup registers the media API HTTP handlers
|
|
//
|
|
// Due to Setup being used to call many other functions, a gocyclo nolint is
|
|
// applied:
|
|
// nolint: gocyclo
|
|
func Setup(
|
|
apiMux *mux.Router,
|
|
cfg *config.Dendrite,
|
|
db *storage.Database,
|
|
deviceDB *devices.Database,
|
|
client *gomatrixserverlib.Client,
|
|
) {
|
|
r0mux := apiMux.PathPrefix(pathPrefixR0).Subrouter()
|
|
|
|
activeThumbnailGeneration := &types.ActiveThumbnailGeneration{
|
|
PathToResult: map[string]*types.ThumbnailGenerationResult{},
|
|
}
|
|
authData := auth.Data{
|
|
AccountDB: nil,
|
|
DeviceDB: deviceDB,
|
|
AppServices: nil,
|
|
}
|
|
|
|
// TODO: Add AS support
|
|
r0mux.Handle("/upload", common.MakeAuthAPI(
|
|
"upload", authData,
|
|
func(req *http.Request, _ *authtypes.Device) util.JSONResponse {
|
|
return Upload(req, cfg, db, activeThumbnailGeneration)
|
|
},
|
|
)).Methods(http.MethodPost, http.MethodOptions)
|
|
|
|
activeRemoteRequests := &types.ActiveRemoteRequests{
|
|
MXCToResult: map[string]*types.RemoteRequestResult{},
|
|
}
|
|
r0mux.Handle("/download/{serverName}/{mediaId}",
|
|
makeDownloadAPI("download", cfg, db, client, activeRemoteRequests, activeThumbnailGeneration),
|
|
).Methods(http.MethodGet, http.MethodOptions)
|
|
r0mux.Handle("/thumbnail/{serverName}/{mediaId}",
|
|
makeDownloadAPI("thumbnail", cfg, db, client, activeRemoteRequests, activeThumbnailGeneration),
|
|
).Methods(http.MethodGet, http.MethodOptions)
|
|
}
|
|
|
|
func makeDownloadAPI(
|
|
name string,
|
|
cfg *config.Dendrite,
|
|
db *storage.Database,
|
|
client *gomatrixserverlib.Client,
|
|
activeRemoteRequests *types.ActiveRemoteRequests,
|
|
activeThumbnailGeneration *types.ActiveThumbnailGeneration,
|
|
) http.HandlerFunc {
|
|
return prometheus.InstrumentHandler(name, http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
|
req = util.RequestWithLogging(req)
|
|
|
|
// Set common headers returned regardless of the outcome of the request
|
|
util.SetCORSHeaders(w)
|
|
// Content-Type will be overridden in case of returning file data, else we respond with JSON-formatted errors
|
|
w.Header().Set("Content-Type", "application/json")
|
|
|
|
vars, _ := common.URLDecodeMapValues(mux.Vars(req))
|
|
Download(
|
|
w,
|
|
req,
|
|
gomatrixserverlib.ServerName(vars["serverName"]),
|
|
types.MediaID(vars["mediaId"]),
|
|
cfg,
|
|
db,
|
|
client,
|
|
activeRemoteRequests,
|
|
activeThumbnailGeneration,
|
|
name == "thumbnail",
|
|
)
|
|
}))
|
|
}
|