Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/make_join responses should not include signatures on events. #202

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions tests/federation_room_join_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/matrix-org/gomatrix"
"github.com/matrix-org/gomatrixserverlib"

"github.com/tidwall/gjson"
"github.com/tidwall/sjson"

"github.com/matrix-org/complement/internal/b"
Expand Down Expand Up @@ -390,3 +391,76 @@ func testValidationForSendMembershipEndpoint(t *testing.T, baseApiPath, expected
assertRequestFails(t, event)
})
}

// The (partial) event returned via /make_join should not include signatures.
func TestMakeJoinSignatures(t *testing.T) {
deployment := Deploy(t, b.BlueprintAlice)
defer deployment.Destroy(t)

srv := federation.NewServer(t, deployment,
federation.HandleKeyRequests(),
federation.HandleTransactionRequests(nil, nil),
)
cancel := srv.Listen()
defer cancel()

fedClient := srv.FederationClient(deployment)

// alice creates a room.
alice := deployment.Client(t, "hs1", "@alice:hs1")
roomID := alice.CreateRoom(t, map[string]interface{}{
"preset": "public_chat",
})

charlie := srv.UserID("charlie")

// charlie sends a make_join, note that we can't use the helpers from fedClient
// since that discards unknown fields during unmarshalling.
//
// Below is copied from MakeJoin -> doRequest.
path := "/_matrix/federation/v1/make_join/" + url.PathEscape(roomID) + "/" + charlie + "?ver=6"
fedReq := gomatrixserverlib.NewFederationRequest("GET", "hs1", path)
if err := fedReq.Sign(gomatrixserverlib.ServerName(srv.ServerName), srv.KeyID, srv.Priv); err != nil {
t.Fatalf("Unable to sign request")
}

req, err := fedReq.HTTPRequest()
if err != nil {
t.Fatalf("Creating request failed")
}
response, err2 := fedClient.Client.DoHTTPRequest(context.Background(), req)
if response != nil {
defer response.Body.Close() // nolint: errcheck
}
if response.StatusCode != 200 {
t.Fatalf("Unexpected result: %d", response.StatusCode)
}
if err2 != nil {
t.Fatalf("Request failed")
}
body := must.ParseJSON(t, response.Body)

// It should have event and room_version.
res := gjson.GetBytes(body, "event")
if !res.Exists() {
t.Errorf("key 'event' missing")
}
res = gjson.GetBytes(body, "room_version")
if !res.Exists() {
t.Errorf("key 'room_version' missing")
}

// The event should not have signatures / unsigned / hashes.
res = gjson.GetBytes(body, "event.signatures")
if res.Exists() {
t.Errorf("key 'signatures' exists")
}
res = gjson.GetBytes(body, "event.unsigned")
if res.Exists() {
t.Errorf("key 'unsigned' exists")
}
res = gjson.GetBytes(body, "event.hashes")
if res.Exists() {
t.Errorf("key 'hashes' exists")
}
}