Add conduwuit (#723)

* add conduwuit to list of runtime homeservers

Signed-off-by: strawberry <[email protected]>

* allow conduwuit to run Content-Disposition tests

we perform the checks being tested

Signed-off-by: strawberry <[email protected]>

---------

Signed-off-by: strawberry <[email protected]>

Author: x86pup

dockerfiles/README.md

@@ -8,3 +8,4 @@ duplication, we now point to dockerfiles in respective repositories rather than
 - Dendrite: https://github.com/matrix-org/dendrite/blob/v0.8.2/build/scripts/Complement.Dockerfile
 - Synapse: https://github.com/matrix-org/synapse/blob/develop/docker/complement/Dockerfile
 - Conduit: https://gitlab.com/famedly/conduit/-/blob/next/tests/Complement.Dockerfile
+- conduwuit: https://conduwuit.puppyirl.gay/development/testing.html

runtime/hs.go

@@ -8,9 +8,10 @@ import (
 )
 
 const (
-	Dendrite = "dendrite"
-	Synapse  = "synapse"
-	Conduit  = "conduit"
+	Dendrite  = "dendrite"
+	Synapse   = "synapse"
+	Conduit   = "conduit"
+	Conduwuit = "conduwuit"
 )
 
 var Homeserver string

runtime/hs_conduwuit.go

@@ -0,0 +1,10 @@
+//go:build conduwuit_blacklist || conduit_blacklist
+// +build conduwuit_blacklist conduit_blacklist
+
+// for now, a couple skipped conduit tests still apply to conduwuit. this will change in the future
+
+package runtime
+
+func init() {
+	Homeserver = Conduwuit
+}

tests/media_filename_test.go

@@ -121,11 +121,11 @@ func TestMediaFilenames(t *testing.T) {
 			})
 
 			t.Run("Will serve safe media types as inline", func(t *testing.T) {
-				if runtime.Homeserver != runtime.Synapse {
+				if runtime.Homeserver != runtime.Synapse && runtime.Homeserver != runtime.Conduwuit {
 					// We need to check that this security behaviour is being correctly run in
-					// Synapse, but since this is not part of the Matrix spec we do not assume
+					// Synapse or conduwuit, but since this is not part of the Matrix spec we do not assume
 					// other homeservers are doing so.
-					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse homeserver")
+					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse and non-conduwuit homeserver")
 				}
 				t.Parallel()
 
@@ -139,11 +139,11 @@ func TestMediaFilenames(t *testing.T) {
 			})
 
 			t.Run("Will serve safe media types with parameters as inline", func(t *testing.T) {
-				if runtime.Homeserver != runtime.Synapse {
+				if runtime.Homeserver != runtime.Synapse && runtime.Homeserver != runtime.Conduwuit {
 					// We need to check that this security behaviour is being correctly run in
-					// Synapse, but since this is not part of the Matrix spec we do not assume
+					// Synapse or conduwuit, but since this is not part of the Matrix spec we do not assume
 					// other homeservers are doing so.
-					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse homeserver")
+					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse and non-conduwuit homeserver")
 				}
 				t.Parallel()
 
@@ -158,11 +158,11 @@ func TestMediaFilenames(t *testing.T) {
 			})
 
 			t.Run("Will serve unsafe media types as attachments", func(t *testing.T) {
-				if runtime.Homeserver != runtime.Synapse {
+				if runtime.Homeserver != runtime.Synapse && runtime.Homeserver != runtime.Conduwuit {
 					// We need to check that this security behaviour is being correctly run in
-					// Synapse, but since this is not part of the Matrix spec we do not assume
+					// Synapse or conduwuit, but since this is not part of the Matrix spec we do not assume
 					// other homeservers are doing so.
-					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse homeserver")
+					t.Skip("Skipping test of Content-Disposition header requirements on non-Synapse and non-conduwuit homeserver")
 				}
 				t.Parallel()