Merge pull request #64 from matrix-org/neilalexander/gmsl

Update gomatrixserverlib

Author: neilalexander

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/gorilla/mux v1.7.3
-	github.com/matrix-org/gomatrixserverlib v0.0.0-20200626111150-364501214328
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20210122154608-a38974bd8a37
 	github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -32,8 +32,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 h1:Hr3zjRsq2bhrnp3Ky1qgx/fzCtCALOoGYylh2tpS9K4=
 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0=
-github.com/matrix-org/gomatrixserverlib v0.0.0-20200626111150-364501214328 h1:rz6aiTpUyNPRcWZBWUGDkQjI7lfeLdhzy+x/Pw2jha8=
-github.com/matrix-org/gomatrixserverlib v0.0.0-20200626111150-364501214328/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20210122154608-a38974bd8a37 h1:si2CZZpwOLWZfDXfgHPkaTlaAkdJvpJzr1zVqyKXd0I=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20210122154608-a38974bd8a37/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU=
 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo=
 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7/go.mod h1:vVQlW/emklohkZnOPwD3LrZUBqdfsbiyO3p1lNV8F6U=
 github.com/miekg/dns v1.1.12 h1:WMhc1ik4LNkTg8U9l3hI1LvxKmIL+f1+WV/SZtCbDDA=

internal/federation/handle.go

@@ -4,7 +4,6 @@ import (
 	"crypto/ed25519"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
@@ -98,7 +97,7 @@ func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request
 		w.Write([]byte("complement: HandleMakeSendJoinRequests send_join cannot parse event JSON: " + err.Error()))
 	}
 	// insert the join event into the room state
-	room.AddEvent(&event)
+	room.AddEvent(event)
 
 	// return current state and auth chain
 	b, err := json.Marshal(gomatrixserverlib.RespSendJoin{
@@ -204,12 +203,6 @@ func HandleEventRequests() func(*Server) {
 func HandleKeyRequests() func(*Server) {
 	return func(srv *Server) {
 		keymux := srv.mux.PathPrefix("/_matrix/key/v2").Subrouter()
-
-		certData, err := ioutil.ReadFile(srv.certPath)
-		if err != nil {
-			panic("failed to read cert file: " + err.Error())
-		}
-
 		keyFn := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			k := gomatrixserverlib.ServerKeys{}
 			k.ServerName = gomatrixserverlib.ServerName(srv.ServerName)
@@ -220,7 +213,6 @@ func HandleKeyRequests() func(*Server) {
 				},
 			}
 			k.OldVerifyKeys = map[gomatrixserverlib.KeyID]gomatrixserverlib.OldVerifyKey{}
-			k.TLSFingerprints = fingerprintPEM(certData)
 			k.ValidUntilTS = gomatrixserverlib.AsTimestamp(time.Now().Add(24 * time.Hour))
 			toSign, err := json.Marshal(k.ServerKeyFields)
 			if err != nil {
@@ -282,7 +274,7 @@ func HandleMediaRequests(mediaIds map[string]func(w http.ResponseWriter)) func(*
 
 // HandleTransactionRequests is an option which will process GET /_matrix/federation/v1/send/{transactionID} requests universally when requested.
 // pduCallback and eduCallback are functions that if non-nil will be called and passed each PDU or EDU event received in the transaction
-func HandleTransactionRequests(pduCallback func(gomatrixserverlib.Event), eduCallback func(gomatrixserverlib.EDU)) func(*Server) {
+func HandleTransactionRequests(pduCallback func(*gomatrixserverlib.Event), eduCallback func(gomatrixserverlib.EDU)) func(*Server) {
 	return func(srv *Server) {
 		srv.mux.Handle("/_matrix/federation/v1/send/{transactionID}", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			// Extract the transaction ID from the request vars
@@ -361,7 +353,7 @@ func HandleTransactionRequests(pduCallback func(gomatrixserverlib.Event), eduCal
 				}
 				roomVersion := gomatrixserverlib.RoomVersion(room.Version)
 
-				var event gomatrixserverlib.Event
+				var event *gomatrixserverlib.Event
 				event, err = gomatrixserverlib.NewEventFromUntrustedJSON(pdu, roomVersion)
 				if err != nil {
 					// We were unable to verify or process this event.
@@ -375,7 +367,7 @@ func HandleTransactionRequests(pduCallback func(gomatrixserverlib.Event), eduCal
 				}
 
 				// Store this PDU in the room's timeline
-				room.AddEvent(&event)
+				room.AddEvent(event)
 
 				// Add this PDU as a success to the response
 				response.PDUs[event.EventID()] = gomatrixserverlib.PDUResult{}

internal/federation/server.go

@@ -5,7 +5,6 @@ import (
 	"crypto/ed25519"
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/sha256"
 	"crypto/x509"
 	"encoding/json"
 	"encoding/pem"
@@ -69,9 +68,9 @@ func NewServer(t *testing.T, deployment *docker.Deployment, opts ...func(*Server
 	}
 	fetcher := &basicKeyFetcher{
 		KeyFetcher: &gomatrixserverlib.DirectKeyFetcher{
-			Client: *gomatrixserverlib.NewClientWithTransport(&docker.RoundTripper{
-				Deployment: deployment,
-			}),
+			Client: gomatrixserverlib.NewClient(
+				gomatrixserverlib.WithTransport(&docker.RoundTripper{Deployment: deployment}),
+			),
 		},
 		srv: srv,
 	}
@@ -149,8 +148,10 @@ func (s *Server) MustMakeRoom(t *testing.T, roomVer gomatrixserverlib.RoomVersio
 
 // FederationClient returns a client which will sign requests using this server and accept certs from hsName.
 func (s *Server) FederationClient(deployment *docker.Deployment, hsName string) *gomatrixserverlib.FederationClient {
-	f := gomatrixserverlib.NewFederationClient(gomatrixserverlib.ServerName(s.ServerName), s.KeyID, s.Priv)
-	f.Client = *gomatrixserverlib.NewClientWithTransport(&docker.RoundTripper{Deployment: deployment})
+	f := gomatrixserverlib.NewFederationClient(
+		gomatrixserverlib.ServerName(s.ServerName), s.KeyID, s.Priv,
+		gomatrixserverlib.WithTransport(&docker.RoundTripper{Deployment: deployment}),
+	)
 	return f
 }
 
@@ -188,7 +189,7 @@ func (s *Server) MustCreateEvent(t *testing.T, room *ServerRoom, ev b.Event) *go
 	if err != nil {
 		t.Fatalf("MustCreateEvent: failed to sign event: %s", err)
 	}
-	return &signedEvent
+	return signedEvent
 }
 
 // Mux returns this server's router so you can attach additional paths
@@ -403,22 +404,6 @@ func federationServer(name string, h http.Handler) (*http.Server, string, string
 	return srv, tlsCertPath, tlsKeyPath, nil
 }
 
-func fingerprintPEM(data []byte) []gomatrixserverlib.TLSFingerprint {
-	for {
-		var certDERBlock *pem.Block
-		certDERBlock, data = pem.Decode(data)
-		if data == nil {
-			return nil
-		}
-		if certDERBlock.Type == "CERTIFICATE" {
-			digest := sha256.Sum256(certDERBlock.Bytes)
-			return []gomatrixserverlib.TLSFingerprint{
-				{SHA256: digest[:]},
-			}
-		}
-	}
-}
-
 type nopKeyDatabase struct {
 	gomatrixserverlib.KeyFetcher
 }

internal/federation/server_room.go

@@ -74,15 +74,15 @@ func (r *ServerRoom) CurrentState(evType, stateKey string) *gomatrixserverlib.Ev
 }
 
 // AllCurrentState returns all the current state events
-func (r *ServerRoom) AllCurrentState() (events []gomatrixserverlib.Event) {
+func (r *ServerRoom) AllCurrentState() (events []*gomatrixserverlib.Event) {
 	for _, ev := range r.State {
-		events = append(events, *ev)
+		events = append(events, ev)
 	}
 	return
 }
 
 // AuthChain returns all auth events for all events in the current state TODO: recursively
-func (r *ServerRoom) AuthChain() (chain []gomatrixserverlib.Event) {
+func (r *ServerRoom) AuthChain() (chain []*gomatrixserverlib.Event) {
 	chainMap := make(map[string]bool)
 	// get all the auth event IDs
 	for _, ev := range r.AllCurrentState() {
@@ -96,7 +96,7 @@ func (r *ServerRoom) AuthChain() (chain []gomatrixserverlib.Event) {
 	// find them in the timeline
 	for _, tev := range r.Timeline {
 		if chainMap[tev.EventID()] {
-			chain = append(chain, *tev)
+			chain = append(chain, tev)
 		}
 	}
 	return

tests/federation_room_get_missing_events_test.go

@@ -83,7 +83,7 @@ func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *test
 	if err != nil {
 		t.Fatalf("failed to sign event: %s", err)
 	}
-	room.AddEvent(&signedBadEvent)
+	room.AddEvent(signedBadEvent)
 
 	sentEvent := srv.MustCreateEvent(t, room, b.Event{
 		Type:   "m.room.message",
@@ -106,9 +106,9 @@ func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *test
 		// return the bad event, which should result in the transaction failing.
 		w.WriteHeader(200)
 		res := struct {
-			Events []gomatrixserverlib.Event `json:"events"`
+			Events []*gomatrixserverlib.Event `json:"events"`
 		}{
-			Events: []gomatrixserverlib.Event{signedBadEvent},
+			Events: []*gomatrixserverlib.Event{signedBadEvent},
 		}
 		var responseBytes []byte
 		responseBytes, err = json.Marshal(&res)

tests/federation_room_join_test.go

@@ -128,7 +128,7 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		must.NotError(t, "failed to strip signatures key from event", err)
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
-		room.AddEvent(&unsignedEvent)
+		room.AddEvent(unsignedEvent)
 		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
@@ -157,7 +157,7 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		must.NotError(t, "failed to modify signatures key from event", err)
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
-		room.AddEvent(&unsignedEvent)
+		room.AddEvent(unsignedEvent)
 		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
@@ -187,7 +187,7 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		must.NotError(t, "failed to modify signatures key from event", err)
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
-		room.AddEvent(&unsignedEvent)
+		room.AddEvent(unsignedEvent)
 		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})

tests/federation_room_send_test.go

@@ -31,7 +31,7 @@ func TestOutboundFederationSend(t *testing.T) {
 		federation.HandleMakeSendJoinRequests(),
 		federation.HandleTransactionRequests(
 			// listen for PDU events in transactions
-			func(ev gomatrixserverlib.Event) {
+			func(ev *gomatrixserverlib.Event) {
 				defer waiter.Finish()
 
 				if ev.Type() != wantEventType {