diff options
| author | Chris Meyers <chris.meyers.fsu@gmail.com> | 2024-02-13 17:28:12 +0100 |
|---|---|---|
| committer | Dave <dmz.oneill@gmail.com> | 2024-02-14 14:50:51 +0100 |
| commit | f66cde51d7db0e47a0decedea3796759a2cb495c (patch) | |
| tree | a093d2b4f0954bb87dedf0f952cc535da4f7494f /tools | |
| parent | remove the ldap volume when cleaning all volumes (diff) | |
| download | awx-f66cde51d7db0e47a0decedea3796759a2cb495c.tar.xz awx-f66cde51d7db0e47a0decedea3796759a2cb495c.zip | |
More locked down websocket path
* Previously, the nginx location would match on /foo/websocket... or
/foo/api/websocket... Now, we require these two paths to start at the
root i.e. <host>/websocket/... /api/websocket/...
* Note: We now also require an ending / and do NOT support
<host>/websocket_foobar but DO support <host>/websocket/foobar. This
was always the intended behavior. We want to keep
<host>/api/websocket/... "open" and routing to daphne in case we want
to add more websocket urls in the future.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 b/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 index 95c86cb9ee..fd2b89a691 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 @@ -10,7 +10,7 @@ location {{ (ingress_path + '/favicon.ico').replace('//', '/') }} { alias /awx_devel/awx/public/static/favicon.ico; } -location ~ ({{ (ingress_path + '/websocket').replace('//', '/') }}|{{ (ingress_path + '/api/websocket').replace('//', '/') }}) { +location ~ ^({{ (ingress_path + '/websocket/').replace('//', '/') }}|{{ (ingress_path + '/api/websocket/').replace('//', '/') }}) { # Pass request to the upstream alias proxy_pass http://daphne; # Require http version 1.1 to allow for upgrade requests |