mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-27 18:07:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Be able to test /login/sso/redirect in Complement (#17986)

Browse source 
Be able to test `/login/sso/redirect` in Complement

Spawning from
https://github.com/element-hq/sbg/pull/421#discussion_r1854926218 where
we have a proxy that intercepts responses to
`/_matrix/client/v3/login/sso/redirect(/{idpId})` in order to upgrade
them to use OAuth 2.0 Pushed Authorization Requests (PAR). We have some
Complement tests in that codebase that go over this flow and these
changes are required [in order for the URL's to line
up](d648c8ce3f/synapse/rest/client/login.py (L652-L673)).
This commit is contained in:
Eric Eastwood 2024-12-03 06:54:25 -06:00 committed by GitHub
parent d648c8ce3f
commit b257c7ab19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/17986.misc Normal file
View file

@ -0,0 +1 @@
Fix Docker and Complement config to be able to use `public_baseurl`.

1
docker/complement/conf/workers-shared-extra.yaml.j2
View file

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

2
docker/conf-workers/nginx.conf.j2
View file

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

4
scripts-dev/complement.sh
View file

@ -195,6 +195,10 @@ if [ -z "$skip_docker_build" ]; then
# Build the unified Complement image (from the worker Synapse image we just built). # Build the unified Complement image (from the worker Synapse image we just built).
echo_if_github "::group::Build Docker image: complement/Dockerfile" echo_if_github "::group::Build Docker image: complement/Dockerfile"
$CONTAINER_RUNTIME build -t complement-synapse \ $CONTAINER_RUNTIME build -t complement-synapse \
`# This is the tag we end up pushing to the registry (see` \
`# .github/workflows/push_complement_image.yml) so let's just label it now` \
`# so people can reference it by the same name locally.` \
-t ghcr.io/element-hq/synapse/complement-synapse \
-f "docker/complement/Dockerfile" "docker/complement" -f "docker/complement/Dockerfile" "docker/complement"
echo_if_github "::endgroup::" echo_if_github "::endgroup::"

1
synapse/config/logger.py
View file

@ -360,5 +360,6 @@ def setup_logging(
"Licensed under the AGPL 3.0 license. Website: https://github.com/element-hq/synapse" "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("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("Instance name: %s", hs.get_instance_name())
logging.info("Twisted reactor: %s", type(reactor).__name__) logging.info("Twisted reactor: %s", type(reactor).__name__)