Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

web: don't proxy HTTP traffic to WS endpoints

Browse Source 
A 405 is returned if there is no upgrade request.
This commit is contained in:
Saúl Ibarra Corretgé
2022-06-14 11:28:33 +02:00
parent 7ed5063007
commit 0cbfbfd6cb
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
web/rootfs/defaults/meet.conf
View File

@@ -41,8 +41,7 @@ location = /external_api.js {
} }
# ensure all static content can always be found first # ensure all static content can always be found first
location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ {
{
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
alias /usr/share/jitsi-meet/$1/$2; alias /usr/share/jitsi-meet/$1/$2;
@@ -55,47 +54,51 @@ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.
{{ if $ENABLE_COLIBRI_WEBSOCKET }} {{ if $ENABLE_COLIBRI_WEBSOCKET }}
# colibri (JVB) websockets # colibri (JVB) websockets
location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) { location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) {
proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args; tcp_nodelay on;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection $connection_upgrade;
tcp_nodelay on;
proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args;
} }
{{ end }} {{ end }}
# BOSH # BOSH
location = /http-bind { location = /http-bind {
proxy_pass {{ $XMPP_BOSH_URL_BASE }}/http-bind;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host {{ $XMPP_DOMAIN }}; proxy_set_header Host {{ $XMPP_DOMAIN }};
proxy_pass {{ $XMPP_BOSH_URL_BASE }}/http-bind;
} }
{{ if $ENABLE_XMPP_WEBSOCKET }} {{ if $ENABLE_XMPP_WEBSOCKET }}
# xmpp websockets # xmpp websockets
location = /xmpp-websocket { location = /xmpp-websocket {
proxy_pass {{ $XMPP_BOSH_URL_BASE }}/xmpp-websocket; tcp_nodelay on;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host {{ $XMPP_DOMAIN }}; proxy_set_header Host {{ $XMPP_DOMAIN }};
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
tcp_nodelay on;
proxy_pass {{ $XMPP_BOSH_URL_BASE }}/xmpp-websocket;
} }
{{ end }} {{ end }}
{{ if .Env.ETHERPAD_URL_BASE }} {{ if .Env.ETHERPAD_URL_BASE }}
# Etherpad-lite # Etherpad-lite
location ^~ /etherpad/ { location ^~ /etherpad/ {
proxy_http_version 1.1; proxy_buffering off;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade; proxy_cache_bypass $http_upgrade;
proxy_pass {{ .Env.ETHERPAD_URL_BASE }}/; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_buffering off;
proxy_pass {{ .Env.ETHERPAD_URL_BASE }}/;
} }
{{ end }} {{ end }}
@@ -108,8 +111,7 @@ location @root_path {
} }
{{ if $ENABLE_SUBDOMAINS }} {{ if $ENABLE_SUBDOMAINS }}
location ~ ^/([^/?&:'"]+)/config.js$ location ~ ^/([^/?&:'"]+)/config.js$ {
{
set $subdomain "$1."; set $subdomain "$1.";
set $subdir "$1/"; set $subdir "$1/";

15
web/rootfs/defaults/nginx.conf
View File

@@ -51,17 +51,18 @@ http {
gzip_vary on; gzip_vary on;
gzip_min_length 860; gzip_min_length 860;
# gzip_vary on; ##
# gzip_proxied any; # Connection header for WebSocket reverse proxy
# gzip_comp_level 6; ##
# gzip_buffers 16 8k; map $http_upgrade $connection_upgrade {
# gzip_http_version 1.1; default upgrade;
# gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; '' close;
}
## ##
# Virtual Host Configs # Virtual Host Configs
## ##
include /config/nginx/site-confs/*; include /config/nginx/site-confs/*;
} }