diff --git a/hosts/vm/coturn/coturn.nix b/hosts/vm/coturn/coturn.nix index 6f45b86..4a516df 100644 --- a/hosts/vm/coturn/coturn.nix +++ b/hosts/vm/coturn/coturn.nix @@ -28,6 +28,28 @@ verbose # ban private IP ranges no-multicast-peers + denied-peer-ip=0.0.0.0-0.255.255.255 + denied-peer-ip=10.0.0.0-10.255.255.255 + denied-peer-ip=100.64.0.0-100.127.255.255 + denied-peer-ip=127.0.0.0-127.255.255.255 + denied-peer-ip=169.254.0.0-169.254.255.255 + denied-peer-ip=172.16.0.0-172.31.255.255 + denied-peer-ip=192.0.0.0-192.0.0.255 + denied-peer-ip=192.0.2.0-192.0.2.255 + denied-peer-ip=192.88.99.0-192.88.99.255 + denied-peer-ip=192.168.0.0-192.168.255.255 + denied-peer-ip=198.18.0.0-198.19.255.255 + denied-peer-ip=198.51.100.0-198.51.100.255 + denied-peer-ip=203.0.113.0-203.0.113.255 + denied-peer-ip=240.0.0.0-255.255.255.255 + denied-peer-ip=::1 + denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff + denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255 + denied-peer-ip=100::-100::ffff:ffff:ffff:ffff + denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff ''; }; @@ -39,6 +61,7 @@ }; in { + enable = true; allowedUDPPortRanges = range; allowedUDPPorts = [ 3478 5349 ]; allowedTCPPortRanges = range; diff --git a/hosts/vm/coturn/livekit.nix b/hosts/vm/coturn/livekit.nix index 97a295b..797a85b 100644 --- a/hosts/vm/coturn/livekit.nix +++ b/hosts/vm/coturn/livekit.nix @@ -59,9 +59,9 @@ in in { allowedUDPPortRanges = range; - allowedUDPPorts = [ 8100 8101 8102 ]; + allowedUDPPorts = [ 80 443 8100 8101 8102 ]; allowedTCPPortRanges = range; - allowedTCPPorts = [ 8100 8101 8102 ]; + allowedTCPPorts = [ 80 443 8100 8101 8102 ]; }; users.users.livekit.extraGroups = [ "turnserver" ]; @@ -105,6 +105,14 @@ in locations."~ /(get_token|healthz|sfu/get)" = { proxyPass = "http://localhost:${toString config.services.lk-jwt-service.port}"; + + # TODO : Restrict CORS or study issues + extraConfig = '' + add_header 'Access-Control-Allow-Methods' 'GET' always; + add_header 'Access-Control-Allow-Methods' 'OPTIONS' always; + add_header 'Access-Control-Allow-Credentials' 'false' always; + add_header 'Vary' 'Origin' always; + ''; }; locations."/" = { diff --git a/hosts/vm/coturn/service.nix b/hosts/vm/coturn/service.nix index 8929bfe..e48420e 100644 --- a/hosts/vm/coturn/service.nix +++ b/hosts/vm/coturn/service.nix @@ -11,7 +11,7 @@ let format = pkgs.formats.json { }; settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; - isLocallyDistributed = config.services.livekit.ingress.enable; + isLocallyDistributed = cfg.ingress.enable; in { options.services.livekit' = { diff --git a/hosts/vm/reverseproxy/reverseproxy.nix b/hosts/vm/reverseproxy/reverseproxy.nix index c262998..94f5b1e 100644 --- a/hosts/vm/reverseproxy/reverseproxy.nix +++ b/hosts/vm/reverseproxy/reverseproxy.nix @@ -330,9 +330,18 @@ in services.nginx.virtualHosts = { "www-alias-crans.org".default = true; - "_crans-org".locations = { - "/_matrix/".proxyPass = "https://matrix.crans.org/_matrix/"; - "/_synapse/".proxyPass = "https://matrix.crans.org/_synapse/"; + "_crans-org" = { + locations = { + "/_matrix/".proxyPass = "https://matrix.crans.org/_matrix/"; + "/_synapse/".proxyPass = "https://matrix.crans.org/_synapse/"; + "/.well-known/matrix/".extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET' always; + add_header 'Access-Control-Allow-Credentials' 'false' always; + add_header 'Vary' 'Origin' always; + ''; + }; }; }; + }