From f23e0f5e069e64b58acb468a0d545e966a4ce630 Mon Sep 17 00:00:00 2001
From: Brian Meek <brian@hntlabs.com>
Date: Tue, 7 Feb 2023 15:53:58 -0800
Subject: [PATCH] Logging the config in the error to debug CI

Signed-off-by: Brian Meek <brian@hntlabs.com>
---
 .gitignore                                 |  3 ++-
 build/scripts/Complement.Dockerfile        | 10 +++++-----
 clientapi/auth/login_publickey_ethereum.go |  2 +-
 cmd/dendrite-upgrade-tests/main.go         | 10 +++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f0a90ae4..9e8050c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,4 +79,5 @@ media_store/
 # Debug
 **/__debug_bin
 
-.env
\ No newline at end of file
+.env
+build/*
diff --git a/build/scripts/Complement.Dockerfile b/build/scripts/Complement.Dockerfile
index 3a00fbdf0..8e921d6d0 100644
--- a/build/scripts/Complement.Dockerfile
+++ b/build/scripts/Complement.Dockerfile
@@ -1,6 +1,6 @@
 #syntax=docker/dockerfile:1.2
 
-FROM golang:1.18-stretch as build
+FROM golang:1.19-buster as build
 RUN apt-get update && apt-get install -y sqlite3
 WORKDIR /build
 
@@ -14,10 +14,10 @@ ARG CGO
 RUN --mount=target=. \
     --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=${CGO} go build -o /dendrite ./cmd/generate-config && \
-    CGO_ENABLED=${CGO} go build -o /dendrite ./cmd/generate-keys && \
-    CGO_ENABLED=${CGO} go build -o /dendrite ./cmd/dendrite-monolith-server && \
-    CGO_ENABLED=${CGO} go test -c -cover -covermode=atomic -o /dendrite/dendrite-monolith-server-cover -coverpkg "github.com/matrix-org/..." ./cmd/dendrite-monolith-server && \
+    CGO_ENABLED=${CGO} go build --race -o /dendrite ./cmd/generate-config && \
+    CGO_ENABLED=${CGO} go build --race -o /dendrite ./cmd/generate-keys && \
+    CGO_ENABLED=${CGO} go build --race -o /dendrite ./cmd/dendrite-monolith-server && \
+    CGO_ENABLED=${CGO} go test --race -c -cover -covermode=atomic -o /dendrite/dendrite-monolith-server-cover -coverpkg "github.com/matrix-org/..." ./cmd/dendrite-monolith-server && \
     cp build/scripts/complement-cmd.sh /complement-cmd.sh
 
 WORKDIR /dendrite
diff --git a/clientapi/auth/login_publickey_ethereum.go b/clientapi/auth/login_publickey_ethereum.go
index 7b8573ab6..2ec11ed6b 100644
--- a/clientapi/auth/login_publickey_ethereum.go
+++ b/clientapi/auth/login_publickey_ethereum.go
@@ -119,7 +119,7 @@ func (pk LoginPublicKeyEthereum) ValidateLoginResponse() (bool, *jsonerror.Matri
 	// Check signature to verify message was not tempered
 	_, err = message.Verify(pk.Signature, (*string)(&pk.config.Matrix.ServerName), nil, nil)
 	if err != nil {
-		return false, jsonerror.InvalidSignature(err.Error() + " signature:" + pk.Signature + " server_name:" + string(pk.config.Matrix.ServerName) + " message:" + pk.Message)
+		return false, jsonerror.InvalidSignature(err.Error() + " signature:" + pk.Signature + " server_name:" + string(pk.config.Matrix.ServerName) + " messageDomain:" + message.GetDomain())
 	}
 
 	// Error if the user ID does not match the signed message.
diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go
index 4d0a06f16..444380fd7 100644
--- a/cmd/dendrite-upgrade-tests/main.go
+++ b/cmd/dendrite-upgrade-tests/main.go
@@ -96,7 +96,7 @@ ENV SERVER_NAME=localhost
 EXPOSE 8008 8448
 CMD /build/run_dendrite.sh `
 
-const DockerfileSQLite = `FROM golang:1.18-stretch as build
+const DockerfileSQLite = `FROM golang:1.19-buster as build
 RUN apt-get update && apt-get install -y postgresql
 WORKDIR /build
 
@@ -104,10 +104,10 @@ WORKDIR /build
 # Complement Dockerfile which wgets a branch.
 COPY . .
 
-RUN go build ./cmd/dendrite-monolith-server
-RUN go build ./cmd/generate-keys
-RUN go build ./cmd/generate-config
-RUN go build ./cmd/create-account
+RUN go build --race  ./cmd/dendrite-monolith-server
+RUN go build --race  ./cmd/generate-keys
+RUN go build --race  ./cmd/generate-config
+RUN go build --race  ./cmd/create-account
 RUN ./generate-config --ci > dendrite.yaml
 RUN ./generate-keys --private-key matrix_key.pem --tls-cert server.crt --tls-key server.key