mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-13 17:43:16 +01:00
Be able to test /login/sso/redirect
in Complement (#17986)
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:
parent
d648c8ce3f
commit
b257c7ab19
5 changed files with 8 additions and 1 deletions
1
changelog.d/17986.misc
Normal file
1
changelog.d/17986.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix Docker and Complement config to be able to use `public_baseurl`.
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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::"
|
||||||
|
|
||||||
|
|
|
@ -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__)
|
||||||
|
|
Loading…
Reference in a new issue