aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2020-06-25 18:05:41 +0100
committerKegan Dougal <kegan@matrix.org>2020-06-25 18:05:41 +0100
commitc1d2382e6d7f459ddf911a16aac7d4e63d50838b (patch)
treeec8910d07c666a0620b79d91ea322f1a2f66041d
parent7a8282fccfc435e20f3fd2763745dbd3b0de2bed (diff)
Reject non-numeric ports (done in GMSL)
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--sytest-whitelist1
3 files changed, 4 insertions, 1 deletions
diff --git a/go.mod b/go.mod
index 7d968b23..b37a662a 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4
github.com/matrix-org/go-sqlite3-js v0.0.0-20200522092705-bc8506ccbcf3
github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26
- github.com/matrix-org/gomatrixserverlib v0.0.0-20200625153204-0f1026cd05d1
+ github.com/matrix-org/gomatrixserverlib v0.0.0-20200625170349-8ebb44e6775d
github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f
github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
github.com/mattn/go-sqlite3 v2.0.2+incompatible
diff --git a/go.sum b/go.sum
index 5a9547ef..bfe5533d 100644
--- a/go.sum
+++ b/go.sum
@@ -375,6 +375,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200625121044-e5d892cd30c1 h1:3y
github.com/matrix-org/gomatrixserverlib v0.0.0-20200625121044-e5d892cd30c1/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200625153204-0f1026cd05d1 h1:QDOdGCfrzuVLEess3id2a2B29oVZ9JXgJmUfwE7r/iI=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200625153204-0f1026cd05d1/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200625170349-8ebb44e6775d h1:v1JS+JZWwAsqAc22TGWPbRDc6O5D6geSfV5Bb5wvYIs=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200625170349-8ebb44e6775d/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU=
github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f h1:pRz4VTiRCO4zPlEMc3ESdUOcW4PXHH4Kj+YDz1XyE+Y=
github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f/go.mod h1:y0oDTjZDv5SM9a2rp3bl+CU+bvTRINQsdb7YlDql5Go=
github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo=
diff --git a/sytest-whitelist b/sytest-whitelist
index 1628a635..47fabc8a 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -377,3 +377,4 @@ Outbound federation passes make_join failures through to the client
Outbound federation correctly handles unsupported room versions
Remote users may not join unfederated rooms
Guest users denied access over federation if guest access prohibited
+Non-numeric ports in server names are rejected