Merge branch 'markjh/utility' into markjh/invites

src/github.com/matrix-org/dendrite/clientapi/readers/directory.go

@@ -35,7 +35,7 @@ func DirectoryRoom(
 	federation *gomatrixserverlib.FederationClient,
 	cfg *config.Dendrite,
 ) util.JSONResponse {
-	_, domain, err := gomatrixserverlib.ParseID('#', roomAlias)
+	_, domain, err := gomatrixserverlib.SplitID('#', roomAlias)
 	if err != nil {
 		return util.JSONResponse{
 			Code: 400,

src/github.com/matrix-org/dendrite/clientapi/writers/createroom.go

@@ -60,7 +60,7 @@ func (r createRoomRequest) Validate() *util.JSONResponse {
 		//       It should be a struct (with pointers into a single string to avoid copying) and
 		//       we should update all refs to use UserID types rather than strings.
 		// https://github.com/matrix-org/synapse/blob/v0.19.2/synapse/types.py#L92
-		if _, _, err := gomatrixserverlib.ParseID('@', userID); err != nil {
+		if _, _, err := gomatrixserverlib.SplitID('@', userID); err != nil {
 			return &util.JSONResponse{
 				Code: 400,
 				JSON: jsonerror.BadJSON("user id must be in the form @localpart:domain"),

src/github.com/matrix-org/dendrite/clientapi/writers/joinroom.go

@@ -89,7 +89,7 @@ func (r joinRoomReq) joinRoomByID() util.JSONResponse {
 
 // joinRoomByAlias joins a room using a room alias.
 func (r joinRoomReq) joinRoomByAlias(roomAlias string) util.JSONResponse {
-	_, domain, err := gomatrixserverlib.ParseID('#', roomAlias)
+	_, domain, err := gomatrixserverlib.SplitID('#', roomAlias)
 	if err != nil {
 		return util.JSONResponse{
 			Code: 400,

src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go

@@ -223,10 +223,10 @@ func joinedHostsFromEvents(evs []gomatrixserverlib.Event) ([]types.JoinedHost, e
 		if err != nil {
 			return nil, err
 		}
-		if *membership != "join" {
+		if membership != "join" {
 			continue
 		}
-		_, serverName, err := gomatrixserverlib.ParseID('@', *ev.StateKey())
+		_, serverName, err := gomatrixserverlib.SplitID('@', *ev.StateKey())
 		if err != nil {
 			return nil, err
 		}

src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go

@@ -193,7 +193,7 @@ func (r *uploadRequest) Validate(maxFileSizeBytes config.FileSizeBytes) *util.JS
 		//       It should be a struct (with pointers into a single string to avoid copying) and
 		//       we should update all refs to use UserID types rather than strings.
 		// https://github.com/matrix-org/synapse/blob/v0.19.2/synapse/types.py#L92
-		if _, _, err := gomatrixserverlib.ParseID('@', string(r.MediaMetadata.UserID)); err != nil {
+		if _, _, err := gomatrixserverlib.SplitID('@', string(r.MediaMetadata.UserID)); err != nil {
 			return &util.JSONResponse{
 				Code: 400,
 				JSON: jsonerror.BadJSON("user id must be in the form @localpart:domain"),

src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go

@@ -125,15 +125,13 @@ func (d *SyncServerDatabase) updateRoomState(
 			// ignore non state events
 			continue
 		}
-		var (
-			membership *string
-			err        error
-		)
+		var membership *string
 		if event.Type() == "m.room.member" {
-			membership, err = event.Membership()
+			value, err := event.Membership()
 			if err != nil {
 				return err
 			}
+			membership = &value
 		}
 		if err := d.roomstate.upsertRoomState(txn, event, membership, int64(streamPos)); err != nil {
 			return err
@@ -477,7 +475,7 @@ func getMembershipFromEvent(ev *gomatrixserverlib.Event, userID string) string {
 		if err != nil {
 			return ""
 		}
-		return *membership
+		return membership
 	}
 	return ""
 }

src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go

@@ -73,7 +73,7 @@ func (n *Notifier) OnNewEvent(ev *gomatrixserverlib.Event, pos types.StreamPosit
 			)
 		} else {
 			// Keep the joined user map up-to-date
-			switch *membership {
+			switch membership {
 			case "invite":
 				userIDs = append(userIDs, userID)
 			case "join":

vendor/manifest

@@ -98,7 +98,7 @@
 		{
 			"importpath": "github.com/matrix-org/gomatrixserverlib",
 			"repository": "https://github.com/matrix-org/gomatrixserverlib",
-			"revision": "0e1596ae7b0a034ec572cd1448aeaf7e96bff95a",
+			"revision": "30652b26ec2e83b97c941eb1c293bf7d67340f74",
 			"branch": "master"
 		},
 		{

vendor/src/github.com/matrix-org/gomatrixserverlib/event.go

@@ -482,15 +482,15 @@ func (e Event) PrevEventIDs() []string {
 // is an "m.room.member" event.
 // Returns an error if the event is not a m.room.member event or if the content
 // is not valid m.room.member content.
-func (e Event) Membership() (*string, error) {
+func (e Event) Membership() (string, error) {
 	if e.fields.Type != MRoomMember {
-		return nil, fmt.Errorf("gomatrixserverlib: not an m.room.member event")
+		return "", fmt.Errorf("gomatrixserverlib: not an m.room.member event")
 	}
 	var content memberContent
 	if err := json.Unmarshal(e.fields.Content, &content); err != nil {
-		return nil, err
+		return "", err
 	}
-	return &content.Membership, nil
+	return content.Membership, nil
 }
 
 // AuthEvents returns references to the events needed to auth the event.
@@ -500,9 +500,9 @@ func (e Event) AuthEvents() []EventReference {
 
 // AuthEventIDs returns the event IDs of the events needed to auth the event.
 func (e Event) AuthEventIDs() []string {
-	result := make([]string, len(e.fields.PrevEvents))
-	for i := range e.fields.PrevEvents {
-		result[i] = e.fields.PrevEvents[i].EventID
+	result := make([]string, len(e.fields.AuthEvents))
+	for i := range e.fields.AuthEvents {
+		result[i] = e.fields.AuthEvents[i].EventID
 	}
 	return result
 }
@@ -570,8 +570,8 @@ func (er EventReference) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tuple)
 }
 
-// ParseID splits a matrix ID into a local part and a server name.
-func ParseID(sigil byte, id string) (local string, domain ServerName, err error) {
+// SplitID splits a matrix ID into a local part and a server name.
+func SplitID(sigil byte, id string) (local string, domain ServerName, err error) {
 	// IDs have the format: SIGIL LOCALPART ":" DOMAIN
 	// Split on the first ":" character since the domain can contain ":"
 	// characters.

vendor/src/github.com/matrix-org/gomatrixserverlib/eventauth.go

@@ -379,6 +379,9 @@ func aliasEventAllowed(event Event, authEvents AuthEventProvider) error {
 	// https://github.com/matrix-org/synapse/blob/v0.18.5/synapse/api/auth.py#L143-L160
 
 	create, err := newCreateContentFromAuthEvents(authEvents)
+	if err != nil {
+		return err
+	}
 
 	senderDomain, err := domainFromID(event.Sender())
 	if err != nil {

vendor/src/github.com/matrix-org/gomatrixserverlib/federationtypes.go

@@ -213,7 +213,7 @@ type respSendJoinFields struct {
 	AuthEvents  []Event `json:"auth_chain"`
 }
 
-// Check that a reponse to /send_join is valid.
+// Check that a response to /send_join is valid.
 // This checks that it would be valid as a response to /state
 // This also checks that the join event is allowed by the state.
 func (r RespSendJoin) Check(keyRing KeyRing, joinEvent Event) error {

vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit

@@ -3,7 +3,22 @@
 set -eu
 
 golint ./...
-go fmt
+misspell -error .
+
+# gofmt doesn't exit with an error code if the files don't match the expected
+# format. So we have to run it and see if it outputs anything.
+if gofmt -l -s . 2>&1 | read
+then
+    echo "Error: not all code had been formatted with gofmt."
+    echo "Fixing the following files"
+    gofmt -s -w -l .
+    echo
+    echo "Please add them to the commit"
+    git status --short
+    exit 1
+fi
+
+ineffassign .
 go tool vet --all --shadow .
 gocyclo -over 16 .
 go test -timeout 5s . ./...

vendor/src/github.com/matrix-org/gomatrixserverlib/json.go

@@ -23,7 +23,7 @@ import (
 	"unicode/utf8"
 )
 
-// CanonicalJSON re-encodes the JSON in a cannonical encoding. The encoding is
+// CanonicalJSON re-encodes the JSON in a canonical encoding. The encoding is
 // the shortest possible encoding using integer values with sorted object keys.
 // https://matrix.org/docs/spec/server_server/unstable.html#canonical-json
 func CanonicalJSON(input []byte) ([]byte, error) {
@@ -223,7 +223,7 @@ func compactUnicodeEscape(input, output []byte, index int) ([]byte, int) {
 // Taken from https://github.com/NegativeMjark/indolentjson-rust/blob/8b959791fe2656a88f189c5d60d153be05fe3deb/src/readhex.rs#L21
 func readHexDigits(input []byte) uint32 {
 	hex := binary.BigEndian.Uint32(input)
-	// substract '0'
+	// subtract '0'
 	hex -= 0x30303030
 	// strip the higher bits, maps 'a' => 'A'
 	hex &= 0x1F1F1F1F

vendor/src/github.com/matrix-org/gomatrixserverlib/keys.go

@@ -167,7 +167,7 @@ type KeyChecks struct {
 	AllEd25519ChecksOK        *bool                   // All the Ed25519 checks are ok. or null if there weren't any to check.
 	Ed25519Checks             map[KeyID]Ed25519Checks // Checks for Ed25519 keys.
 	HasTLSFingerprint         bool                    // The server has at least one fingerprint.
-	AllTLSFingerprintChecksOK *bool                   // All the fingerpint checks are ok.
+	AllTLSFingerprintChecksOK *bool                   // All the fingerprint checks are ok.
 	TLSFingerprintChecks      []TLSFingerprintChecks  // Checks for TLS fingerprints.
 	MatchingTLSFingerprint    *bool                   // The TLS fingerprint for the connection matches one of the listed fingerprints.
 }

vendor/src/github.com/matrix-org/gomatrixserverlib/request.go

@@ -268,7 +268,7 @@ func readHTTPRequest(req *http.Request) (*FederationRequest, error) {
 		}
 		result.fields.Origin = origin
 		if result.fields.Signatures == nil {
-			result.fields.Signatures = map[ServerName]map[KeyID]string{origin: map[KeyID]string{key: sig}}
+			result.fields.Signatures = map[ServerName]map[KeyID]string{origin: {key: sig}}
 		} else {
 			result.fields.Signatures[origin][key] = sig
 		}

vendor/src/github.com/matrix-org/gomatrixserverlib/resolve.go

@@ -57,7 +57,7 @@ func LookupServer(serverName ServerName) (*DNSResult, error) {
 					return nil, err
 				}
 				// If there isn't a SRV record in DNS then fallback to "serverName:8448".
-				hosts[string(serverName)] = []net.SRV{net.SRV{
+				hosts[string(serverName)] = []net.SRV{{
 					Target: string(serverName),
 					Port:   8448,
 				}}
@@ -80,7 +80,7 @@ func LookupServer(serverName ServerName) (*DNSResult, error) {
 		if err != nil {
 			return nil, err
 		}
-		hosts[host] = []net.SRV{net.SRV{
+		hosts[host] = []net.SRV{{
 			Target: host,
 			Port:   uint16(port),
 		}}

vendor/src/github.com/matrix-org/gomatrixserverlib/signing_test.go

@@ -179,7 +179,7 @@ func TestSignJSONTestVectors(t *testing.T) {
 type MyMessage struct {
 	Unsigned   *json.RawMessage `json:"unsigned"`
 	Content    *json.RawMessage `json:"content"`
-	Signatures *json.RawMessage `json:"signature,omitempty"`
+	Signatures *json.RawMessage `json:"signatures,omitempty"`
 }
 
 func TestSignJSONWithUnsigned(t *testing.T) {
@@ -215,7 +215,7 @@ func TestSignJSONWithUnsigned(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = VerifyJSON(entityName, keyID, publicKey, signed)
+	err = VerifyJSON(entityName, keyID, publicKey, input)
 	if err != nil {
 		t.Errorf("VerifyJSON(%q)", signed)
 		t.Fatal(err)

vendor/src/github.com/matrix-org/gomatrixserverlib/stateresolution_test.go

@@ -12,15 +12,15 @@ const (
 
 func TestConflictEventSorter(t *testing.T) {
 	input := []Event{
-		Event{fields: eventFields{Depth: 1, EventID: "@1:a"}},
-		Event{fields: eventFields{Depth: 2, EventID: "@2:a"}},
-		Event{fields: eventFields{Depth: 2, EventID: "@3:b"}},
+		{fields: eventFields{Depth: 1, EventID: "@1:a"}},
+		{fields: eventFields{Depth: 2, EventID: "@2:a"}},
+		{fields: eventFields{Depth: 2, EventID: "@3:b"}},
 	}
 	got := sortConflictedEventsByDepthAndSHA1(input)
 	want := []conflictedEvent{
-		conflictedEvent{depth: 1, event: &input[0]},
-		conflictedEvent{depth: 2, event: &input[2]},
-		conflictedEvent{depth: 2, event: &input[1]},
+		{depth: 1, event: &input[0]},
+		{depth: 2, event: &input[2]},
+		{depth: 2, event: &input[1]},
 	}
 	copy(want[0].eventIDSHA1[:], sha1OfEventID1A)
 	copy(want[1].eventIDSHA1[:], sha1OfEventID3B)

vendor/src/github.com/matrix-org/gomatrixserverlib/transaction.go

@@ -24,7 +24,7 @@ type Transaction struct {
 }
 
 // A TransactionID identifies a transaction sent by a matrix server to another
-// matrix server. The ID must be unique amoungst the transactions sent from the
+// matrix server. The ID must be unique amongst the transactions sent from the
 // origin server to the destination, but doesn't have to be globally unique.
 // The ID must be safe to insert into a URL path segment. The ID should have a
 // format matching '^[0-9A-Za-z\-_]*$'