mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from globekeeper/daniel/auth-profile-api

Browse source 
🔒 Make /profile API authenticated.
This commit is contained in:
Daniel Aloni 2024-05-22 15:38:21 +03:00 committed by GitHub
parent 746572948b f942bcb076
commit b23f2416e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/clientapi_test.go
View file

@ -447,6 +447,7 @@ func TestSetDisplayname(t *testing.T) {
// check profile after initial account creation // check profile after initial account creation
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/profile/"+tc.user.ID, strings.NewReader("")) req := httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/profile/"+tc.user.ID, strings.NewReader(""))
req.Header.Set("Authorization", "Bearer "+accessTokens[tc.user].accessToken)
t.Logf("%s", req.URL.String()) t.Logf("%s", req.URL.String())
routers.Client.ServeHTTP(rec, req) routers.Client.ServeHTTP(rec, req)
@ -559,6 +560,7 @@ func TestSetAvatarURL(t *testing.T) {
// check profile after initial account creation // check profile after initial account creation
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/profile/"+tc.user.ID, strings.NewReader("")) req := httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/profile/"+tc.user.ID, strings.NewReader(""))
req.Header.Set("Authorization", "Bearer "+accessTokens[tc.user].accessToken)
t.Logf("%s", req.URL.String()) t.Logf("%s", req.URL.String())
routers.Client.ServeHTTP(rec, req) routers.Client.ServeHTTP(rec, req)

4
clientapi/routing/routing.go
View file

@ -888,9 +888,9 @@ func Setup(
).Methods(http.MethodPut) ).Methods(http.MethodPut)
// Element user settings // Element user settings
// GK-CUSTOMIZATION: Make /profile endpoints authenticated
v3mux.Handle("/profile/{userID}", v3mux.Handle("/profile/{userID}",
httputil.MakeExternalAPI("profile", func(req *http.Request) util.JSONResponse { httputil.MakeAuthAPI("profile", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
vars, err := httputil.URLDecodeMapValues(mux.Vars(req)) vars, err := httputil.URLDecodeMapValues(mux.Vars(req))
if err != nil { if err != nil {
return util.ErrorResponse(err) return util.ErrorResponse(err)