Be able to test /login/sso/redirect in Complement

docker/complement/conf/workers-shared-extra.yaml.j2

@@ -7,6 +7,7 @@
 #}
 
 ## Server ##
+public_baseurl: http://127.0.0.1:8008/
 report_stats: False
 trusted_key_servers: []
 enable_registration: true

docker/conf-workers/nginx.conf.j2

@@ -42,6 +42,6 @@ server {
 {% endif %}
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Host $host;
+        proxy_set_header Host $host:$server_port;
     }
 }

scripts-dev/complement.sh

@@ -194,7 +194,7 @@ if [ -z "$skip_docker_build" ]; then
 
         # Build the unified Complement image (from the worker Synapse image we just built).
         echo_if_github "::group::Build Docker image: complement/Dockerfile"
-        $CONTAINER_RUNTIME build -t complement-synapse \
+        $CONTAINER_RUNTIME build -t ghcr.io/element-hq/synapse/complement-synapse \
             -f "docker/complement/Dockerfile" "docker/complement"
         echo_if_github "::endgroup::"
 

synapse/config/logger.py

@@ -360,5 +360,6 @@ def setup_logging(
         "Licensed under the AGPL 3.0 license. Website: https://github.com/element-hq/synapse"
     )
     logging.info("Server hostname: %s", config.server.server_name)
+    logging.info("Public Base URL: %s", config.server.public_baseurl)
     logging.info("Instance name: %s", hs.get_instance_name())
     logging.info("Twisted reactor: %s", type(reactor).__name__)

synapse/http/__init__.py

@@ -18,15 +18,19 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
 import re
 from typing import Union
 
 from twisted.internet import address, task
 from twisted.web.client import FileBodyProducer
 from twisted.web.iweb import IRequest
 
 from synapse.api.errors import SynapseError
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 class RequestTimedOutError(SynapseError):
     """Exception representing timeout of an outbound request"""
@@ -72,13 +76,16 @@
 def _get_requested_host(request: IRequest) -> bytes:
     hostname = request.getHeader(b"host")
     if hostname:
+        logger.info("asdf _get_requested_host hostname from Host header %s", hostname)
         return hostname
 
     # no Host header, use the address/port that the request arrived on
     host: Union[address.IPv4Address, address.IPv6Address] = request.getHost()
 
     hostname = host.host.encode("ascii")
 
+    logger.info("asdf _get_requested_host %s %s", hostname, host.port)
+
     if request.isSecure() and host.port == 443:
         # default port for https
         return hostname

synapse/rest/client/login.py

@@ -653,6 +653,11 @@ async def on_GET(
         # get our cookies back.
         requested_uri = get_request_uri(request)
         baseurl_bytes = self._public_baseurl.encode("utf-8")
+        logger.info(
+            "asdf _public_baseurl=%s requested_uri=%s",
+            self._public_baseurl,
+            requested_uri.decode("utf-8"),
+        )
         if not requested_uri.startswith(baseurl_bytes):
             # swap out the incorrect base URL for the right one.
             #