diff --git a/Cargo.toml b/Cargo.toml index bb9db15..407a3bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ futures-util = { version = "0.3", default-features = false, features = ["async-a [features] default = ["incoming", "outgoing", "quic", "websocket", "logging"] incoming = ["tokio-rustls", "rustls-pemfile", "rustls"] -outgoing = ["tokio-rustls", "trust-dns-resolver", "rustls-native-certs", "lazy_static", "rustls", "reqwest"] +outgoing = ["tokio-rustls", "trust-dns-resolver", "rustls-native-certs", "lazy_static", "rustls", "reqwest", "rustls-pemfile"] quic = ["quinn", "rustls-pemfile", "rustls", "rustls-native-certs"] websocket = ["tokio-tungstenite", "futures-util", "tokio-rustls", "rustls-pemfile", "rustls", "rustls-native-certs"] logging = ["rand", "env_logger"] diff --git a/contrib/prosody-modules/mod_s2s_outgoing_proxy.lua b/contrib/prosody-modules/mod_s2s_outgoing_proxy.lua index 2e1dd1f..1487a8b 100644 --- a/contrib/prosody-modules/mod_s2s_outgoing_proxy.lua +++ b/contrib/prosody-modules/mod_s2s_outgoing_proxy.lua @@ -28,3 +28,10 @@ module:hook("route/remote", function(event) return true; end, -2); +-- is this the best place to do this? +module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza) + if session.type == "s2sout_unauthed" then + module:log("debug", "marking hook session.type '%s' secure!", session.type); + session.secure = true; + end +end, 3000); diff --git a/integration/25-s2s-sasl-external/example.org.zone b/integration/25-s2s-sasl-external/example.org.zone new file mode 100644 index 0000000..5abfa2f --- /dev/null +++ b/integration/25-s2s-sasl-external/example.org.zone @@ -0,0 +1,21 @@ +$TTL 300 +; example.org +@ IN SOA ns1.example.org. postmaster.example.org. ( + 2018111111 ; Serial + 28800 ; Refresh + 1800 ; Retry + 604800 ; Expire - 1 week + 86400 ) ; Negative Cache TTL + IN NS ns1 +ns1 IN A 192.5.0.10 +server1 IN A 192.5.0.20 +server2 IN A 192.5.0.30 +xp1 IN A 192.5.0.40 +xp2 IN A 192.5.0.50 +xp3 IN A 192.5.0.60 + +one IN CNAME xp1 +two IN CNAME server2 + +scansion.one IN CNAME xp3 +scansion.two IN CNAME xp3 diff --git a/integration/25-s2s-sasl-external/prosody1.cfg.lua b/integration/25-s2s-sasl-external/prosody1.cfg.lua new file mode 100644 index 0000000..d2d3c30 --- /dev/null +++ b/integration/25-s2s-sasl-external/prosody1.cfg.lua @@ -0,0 +1,251 @@ +--Important for systemd +-- daemonize is important for systemd. if you set this to false the systemd startup will freeze. +daemonize = false +run_as_root = true + +pidfile = "/run/prosody/prosody.pid" + +plugin_paths = { "/opt/xmpp-proxy/prosody-modules", "/opt/prosody-modules" } + +-- Prosody Example Configuration File +-- +-- Information on configuring Prosody can be found on our +-- website at https://prosody.im/doc/configure +-- +-- Tip: You can check that the syntax of this file is correct +-- when you have finished by running this command: +-- prosodyctl check config +-- If there are any errors, it will let you know what and where +-- they are, otherwise it will keep quiet. +-- +-- The only thing left to do is rename this file to remove the .dist ending, and fill in the +-- blanks. Good luck, and happy Jabbering! + + +---------- Server-wide settings ---------- +-- Settings in this section apply to the whole server and are the default settings +-- for any virtual hosts + +-- This is a (by default, empty) list of accounts that are admins +-- for the server. Note that you must create the accounts separately +-- (see https://prosody.im/doc/creating_accounts for info) +-- Example: admins = { "user1@example.com", "user2@example.net" } +admins = { } + +-- Enable use of libevent for better performance under high load +-- For more information see: https://prosody.im/doc/libevent +--use_libevent = true + +-- Prosody will always look in its source directory for modules, but +-- this option allows you to specify additional locations where Prosody +-- will look for modules first. For community modules, see https://modules.prosody.im/ +--plugin_paths = {} + +-- This is the list of modules Prosody will load on startup. +-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. +-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules +modules_enabled = { + + -- Generally required + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + --"tls"; -- Add support for secure TLS on c2s/s2s connections + --"dialback"; -- s2s dialback support + "disco"; -- Service discovery + + -- Not essential, but recommended + "carbons"; -- Keep multiple clients in sync + "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more + "private"; -- Private XML storage (for room bookmarks, etc.) + "blocklist"; -- Allow users to block communications with other users + "vcard4"; -- User profiles (stored in PEP) + "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard + "limits"; -- Enable bandwidth limiting for XMPP connections + + -- Nice to have + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + "register"; -- Allow users to register on this server using a client and change passwords + --"mam"; -- Store messages in an archive and allow users to access it + --"csi_simple"; -- Simple Mobile optimizations + + -- Admin interfaces + "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands + --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 + + -- HTTP modules + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"websocket"; -- XMPP over WebSockets + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality + --"groups"; -- Shared roster support + --"server_contact_info"; -- Publish contact information for this service + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts + --"watchregistrations"; -- Alert admins of registrations + --"motd"; -- Send a message to users when they log in + --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. + --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use + "net_proxy"; + "s2s_outgoing_proxy"; +} + +-- These modules are auto-loaded, but should you want +-- to disable them then uncomment them here: +modules_disabled = { + -- "offline"; -- Store offline messages + -- "c2s"; -- Handle client connections + -- "s2s"; -- Handle server-to-server connections + -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. +} + +-- Disable account creation by default, for security +-- For more information see https://prosody.im/doc/creating_accounts +allow_registration = false + +-- we don't need prosody doing any encryption, xmpp-proxy does this now +-- these are likely set to true somewhere in your file, find them, make them false +-- you can also remove all certificates from your config +s2s_require_encryption = false +s2s_secure_auth = false + +-- xmpp-proxy outgoing is listening on this port, make all outgoing s2s connections directly to here +s2s_outgoing_proxy = { "192.5.0.40", 15270 } + +-- handle PROXY protocol on these ports +proxy_port_mappings = { + [15222] = "c2s", + [15269] = "s2s" +} + +--[[ + Specifies a list of trusted hosts or networks which may use the PROXY protocol + If not specified, it will default to: 127.0.0.1, ::1 (local connections only) + An empty table ({}) can be configured to allow connections from any source. + Please read the module documentation about potential security impact. +]]-- +proxy_trusted_proxies = { + "192.5.0.40" +} + +-- don't listen on any normal c2s/s2s ports (xmpp-proxy listens on these now) +-- you might need to comment these out further down in your config file if you set them +c2s_ports = {} +legacy_ssl_ports = {} +-- you MUST have at least one s2s_ports defined if you want outgoing S2S to work, don't ask.. +s2s_ports = {15268} + +-- Force clients to use encrypted connections? This option will +-- prevent clients from authenticating unless they are using encryption. + +c2s_require_encryption = false +allow_unencrypted_plain_auth = true + +-- Some servers have invalid or self-signed certificates. You can list +-- remote domains here that will not be required to authenticate using +-- certificates. They will be authenticated using DNS instead, even +-- when s2s_secure_auth is enabled. + +--s2s_insecure_domains = { "insecure.example" } + +-- Even if you disable s2s_secure_auth, you can still require valid +-- certificates for some domains by specifying a list here. + +--s2s_secure_domains = { "jabber.org" } + +-- Enable rate limits for incoming client and server connections + +limits = { + c2s = { + rate = "10kb/s"; + }; + s2sin = { + rate = "30kb/s"; + }; +} + +-- Select the authentication backend to use. The 'internal' providers +-- use Prosody's configured data storage to store the authentication data. + +authentication = "internal_hashed" + +-- Select the storage backend to use. By default Prosody uses flat files +-- in its configured data directory, but it also supports more backends +-- through modules. An "sql" backend is included by default, but requires +-- additional dependencies. See https://prosody.im/doc/storage for more info. + +--storage = "sql" -- Default is "internal" + +-- For the "sql" backend, you can uncomment *one* of the below to configure: +--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. +--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } +--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } + + +-- Archiving configuration +-- If mod_mam is enabled, Prosody will store a copy of every message. This +-- is used to synchronize conversations between multiple clients, even if +-- they are offline. This setting controls how long Prosody will keep +-- messages in the archive before removing them. + +archive_expires_after = "1w" -- Remove archived messages after 1 week + +-- You can also configure messages to be stored in-memory only. For more +-- archiving options, see https://prosody.im/doc/modules/mod_mam + +-- Logging configuration +-- For advanced logging see https://prosody.im/doc/logging +log = { + -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging + -- error = "prosody.err"; + --info = "*syslog"; -- Uncomment this for logging to syslog + debug = "*console"; -- Log to the console, useful for debugging with daemonize=false +} + +-- Uncomment to enable statistics +-- For more info see https://prosody.im/doc/statistics +-- statistics = "internal" + +-- Certificates +-- Every virtual host and component needs a certificate so that clients and +-- servers can securely verify its identity. Prosody will automatically load +-- certificates/keys from the directory specified here. +-- For more information, including how to use 'prosodyctl' to auto-import certificates +-- (from e.g. Let's Encrypt) see https://prosody.im/doc/certificates + +-- Location of directory to find certificates in (relative to main config file): +certificates = "certs" + +-- HTTPS currently only supports a single certificate, specify it here: +--https_certificate = "/etc/prosody/certs/localhost.crt" + +----------- Virtual hosts ----------- +-- You need to add a VirtualHost entry for each domain you wish Prosody to serve. +-- Settings under each VirtualHost entry apply *only* to that host. + +VirtualHost "one.example.org" + +--VirtualHost "example.com" +-- certificate = "/path/to/example.crt" + +------ Components ------ +-- You can specify components to add hosts that provide special services, +-- like multi-user conferences, and transports. +-- For more information on components, see https://prosody.im/doc/components + +---Set up a MUC (multi-user chat) room server on conference.example.com: +--Component "conference.example.com" "muc" +--- Store MUC messages in an archive and allow users to access it +--modules_enabled = { "muc_mam" } + +---Set up an external component (default component port is 5347) +-- +-- External components allow adding various services, such as gateways/ +-- transports to other networks like ICQ, MSN and Yahoo. For more info +-- see: https://prosody.im/doc/components#adding_an_external_component +-- +--Component "gateway.example.com" +-- component_secret = "password" diff --git a/integration/25-s2s-sasl-external/prosody2.cfg.lua b/integration/25-s2s-sasl-external/prosody2.cfg.lua new file mode 100644 index 0000000..dcdb1b9 --- /dev/null +++ b/integration/25-s2s-sasl-external/prosody2.cfg.lua @@ -0,0 +1,223 @@ +--Important for systemd +-- daemonize is important for systemd. if you set this to false the systemd startup will freeze. +daemonize = false +run_as_root = true + +pidfile = "/run/prosody/prosody.pid" + +-- Prosody Example Configuration File +-- +-- Information on configuring Prosody can be found on our +-- website at https://prosody.im/doc/configure +-- +-- Tip: You can check that the syntax of this file is correct +-- when you have finished by running this command: +-- prosodyctl check config +-- If there are any errors, it will let you know what and where +-- they are, otherwise it will keep quiet. +-- +-- The only thing left to do is rename this file to remove the .dist ending, and fill in the +-- blanks. Good luck, and happy Jabbering! + + +---------- Server-wide settings ---------- +-- Settings in this section apply to the whole server and are the default settings +-- for any virtual hosts + +-- This is a (by default, empty) list of accounts that are admins +-- for the server. Note that you must create the accounts separately +-- (see https://prosody.im/doc/creating_accounts for info) +-- Example: admins = { "user1@example.com", "user2@example.net" } +admins = { } + +-- Enable use of libevent for better performance under high load +-- For more information see: https://prosody.im/doc/libevent +--use_libevent = true + +-- Prosody will always look in its source directory for modules, but +-- this option allows you to specify additional locations where Prosody +-- will look for modules first. For community modules, see https://modules.prosody.im/ +--plugin_paths = {} + +-- This is the list of modules Prosody will load on startup. +-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. +-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules +modules_enabled = { + + -- Generally required + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + "tls"; -- Add support for secure TLS on c2s/s2s connections +-- "dialback"; -- s2s dialback support + "disco"; -- Service discovery + + -- Not essential, but recommended + "carbons"; -- Keep multiple clients in sync + "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more + "private"; -- Private XML storage (for room bookmarks, etc.) + "blocklist"; -- Allow users to block communications with other users + "vcard4"; -- User profiles (stored in PEP) + "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard + "limits"; -- Enable bandwidth limiting for XMPP connections + + -- Nice to have + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + "register"; -- Allow users to register on this server using a client and change passwords + --"mam"; -- Store messages in an archive and allow users to access it + --"csi_simple"; -- Simple Mobile optimizations + + -- Admin interfaces + "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands + --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 + + -- HTTP modules + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"websocket"; -- XMPP over WebSockets + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality + --"groups"; -- Shared roster support + --"server_contact_info"; -- Publish contact information for this service + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts + --"watchregistrations"; -- Alert admins of registrations + --"motd"; -- Send a message to users when they log in + --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. + --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use +} + +-- These modules are auto-loaded, but should you want +-- to disable them then uncomment them here: +modules_disabled = { + -- "offline"; -- Store offline messages + -- "c2s"; -- Handle client connections + -- "s2s"; -- Handle server-to-server connections + -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. +} + +-- Disable account creation by default, for security +-- For more information see https://prosody.im/doc/creating_accounts +allow_registration = false + +-- Force clients to use encrypted connections? This option will +-- prevent clients from authenticating unless they are using encryption. + +c2s_require_encryption = true + +-- Force servers to use encrypted connections? This option will +-- prevent servers from authenticating unless they are using encryption. + +s2s_require_encryption = true + +-- Force certificate authentication for server-to-server connections? + +s2s_secure_auth = false + +-- Some servers have invalid or self-signed certificates. You can list +-- remote domains here that will not be required to authenticate using +-- certificates. They will be authenticated using DNS instead, even +-- when s2s_secure_auth is enabled. + +--s2s_insecure_domains = { "insecure.example" } + +-- Even if you disable s2s_secure_auth, you can still require valid +-- certificates for some domains by specifying a list here. + +--s2s_secure_domains = { "jabber.org" } + +-- Enable rate limits for incoming client and server connections + +limits = { + c2s = { + rate = "10kb/s"; + }; + s2sin = { + rate = "30kb/s"; + }; +} + +-- Select the authentication backend to use. The 'internal' providers +-- use Prosody's configured data storage to store the authentication data. + +authentication = "internal_hashed" + +-- Select the storage backend to use. By default Prosody uses flat files +-- in its configured data directory, but it also supports more backends +-- through modules. An "sql" backend is included by default, but requires +-- additional dependencies. See https://prosody.im/doc/storage for more info. + +--storage = "sql" -- Default is "internal" + +-- For the "sql" backend, you can uncomment *one* of the below to configure: +--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. +--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } +--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } + + +-- Archiving configuration +-- If mod_mam is enabled, Prosody will store a copy of every message. This +-- is used to synchronize conversations between multiple clients, even if +-- they are offline. This setting controls how long Prosody will keep +-- messages in the archive before removing them. + +archive_expires_after = "1w" -- Remove archived messages after 1 week + +-- You can also configure messages to be stored in-memory only. For more +-- archiving options, see https://prosody.im/doc/modules/mod_mam + +-- Logging configuration +-- For advanced logging see https://prosody.im/doc/logging +log = { + -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging + -- error = "prosody.err"; + --info = "*syslog"; -- Uncomment this for logging to syslog + debug = "*console"; -- Log to the console, useful for debugging with daemonize=false +} + +-- Uncomment to enable statistics +-- For more info see https://prosody.im/doc/statistics +-- statistics = "internal" + +-- Certificates +-- Every virtual host and component needs a certificate so that clients and +-- servers can securely verify its identity. Prosody will automatically load +-- certificates/keys from the directory specified here. +-- For more information, including how to use 'prosodyctl' to auto-import certificates +-- (from e.g. Let's Encrypt) see https://prosody.im/doc/certificates + +-- Location of directory to find certificates in (relative to main config file): +certificates = "certs" + +-- HTTPS currently only supports a single certificate, specify it here: +--https_certificate = "/etc/prosody/certs/localhost.crt" + +----------- Virtual hosts ----------- +-- You need to add a VirtualHost entry for each domain you wish Prosody to serve. +-- Settings under each VirtualHost entry apply *only* to that host. + +VirtualHost "two.example.org" + +--VirtualHost "example.com" +-- certificate = "/path/to/example.crt" + +------ Components ------ +-- You can specify components to add hosts that provide special services, +-- like multi-user conferences, and transports. +-- For more information on components, see https://prosody.im/doc/components + +---Set up a MUC (multi-user chat) room server on conference.example.com: +--Component "conference.example.com" "muc" +--- Store MUC messages in an archive and allow users to access it +--modules_enabled = { "muc_mam" } + +---Set up an external component (default component port is 5347) +-- +-- External components allow adding various services, such as gateways/ +-- transports to other networks like ICQ, MSN and Yahoo. For more info +-- see: https://prosody.im/doc/components#adding_an_external_component +-- +--Component "gateway.example.com" +-- component_secret = "password" diff --git a/integration/25-s2s-sasl-external/tests b/integration/25-s2s-sasl-external/tests new file mode 100644 index 0000000..e2efe61 --- /dev/null +++ b/integration/25-s2s-sasl-external/tests @@ -0,0 +1 @@ +juliet_presence.scs romeo_messages_juliet.scs romeo_presence.scs \ No newline at end of file diff --git a/integration/25-s2s-sasl-external/xmpp-proxy1.toml b/integration/25-s2s-sasl-external/xmpp-proxy1.toml new file mode 100644 index 0000000..9574f57 --- /dev/null +++ b/integration/25-s2s-sasl-external/xmpp-proxy1.toml @@ -0,0 +1,44 @@ + +# interfaces to listen for reverse proxy STARTTLS/Direct TLS XMPP connections on, should be open to the internet +incoming_listen = [ "0.0.0.0:5222", "0.0.0.0:5269" ] +# interfaces to listen for reverse proxy QUIC XMPP connections on, should be open to the internet +quic_listen = [ ] +# interfaces to listen for reverse proxy TLS WebSocket (wss) XMPP connections on, should be open to the internet +websocket_listen = [ ] +# interfaces to listen for outgoing proxy TCP XMPP connections on, should be localhost +outgoing_listen = [ "0.0.0.0:15270" ] + +# these ports shouldn't do any TLS, but should assume any connection from xmpp-proxy is secure +# prosody module: https://modules.prosody.im/mod_secure_interfaces.html + +# c2s port backend XMPP server listens on +c2s_target = "192.5.0.20:15222" + +# s2s port backend XMPP server listens on +s2s_target = "192.5.0.20:15269" + +# send PROXYv1 header to backend XMPP server +# https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt +# prosody module: https://modules.prosody.im/mod_net_proxy.html +# ejabberd config: https://docs.ejabberd.im/admin/configuration/listen-options/#use-proxy-protocol +proxy = true + +# limit incoming stanzas to this many bytes, default to ejabberd's default +# https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example#L32 +# xmpp-proxy will use this many bytes + 16k per connection +max_stanza_size_bytes = 262_144 + +# TLS key/certificate valid for all your XMPP domains, PEM format +# included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there +tls_key = "/etc/prosody/certs/one.example.org.key" +tls_cert = "/etc/prosody/certs/one.example.org.crt" + +# configure logging, defaults are commented +# can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them +# many options, trace is XML-console-level, refer to: https://docs.rs/env_logger/0.8.3/env_logger/#enabling-logging +#log_level = "info" +# for development/debugging: +log_level = "info,xmpp_proxy=trace" + +# one of auto, always, never, refer to: https://docs.rs/env_logger/0.8.3/env_logger/#disabling-colors +#log_style = "never" diff --git a/integration/25-s2s-sasl-external/xmpp-proxy3.toml b/integration/25-s2s-sasl-external/xmpp-proxy3.toml new file mode 100644 index 0000000..56fddce --- /dev/null +++ b/integration/25-s2s-sasl-external/xmpp-proxy3.toml @@ -0,0 +1,44 @@ + +# interfaces to listen for reverse proxy STARTTLS/Direct TLS XMPP connections on, should be open to the internet +incoming_listen = [ ] +# interfaces to listen for reverse proxy QUIC XMPP connections on, should be open to the internet +quic_listen = [ ] +# interfaces to listen for reverse proxy TLS WebSocket (wss) XMPP connections on, should be open to the internet +websocket_listen = [ ] +# interfaces to listen for outgoing proxy TCP XMPP connections on, should be localhost +outgoing_listen = [ "0.0.0.0:5222" ] + +# these ports shouldn't do any TLS, but should assume any connection from xmpp-proxy is secure +# prosody module: https://modules.prosody.im/mod_secure_interfaces.html + +# c2s port backend XMPP server listens on +c2s_target = "127.0.0.1:15222" + +# s2s port backend XMPP server listens on +s2s_target = "127.0.0.1:15269" + +# send PROXYv1 header to backend XMPP server +# https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt +# prosody module: https://modules.prosody.im/mod_net_proxy.html +# ejabberd config: https://docs.ejabberd.im/admin/configuration/listen-options/#use-proxy-protocol +proxy = true + +# limit incoming stanzas to this many bytes, default to ejabberd's default +# https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example#L32 +# xmpp-proxy will use this many bytes + 16k per connection +max_stanza_size_bytes = 262_144 + +# TLS key/certificate valid for all your XMPP domains, PEM format +# included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there +tls_key = "/etc/certs/rsa/one.example.org.key" +tls_cert = "/etc/certs/rsa/one.example.org.crt" + +# configure logging, defaults are commented +# can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them +# many options, trace is XML-console-level, refer to: https://docs.rs/env_logger/0.8.3/env_logger/#enabling-logging +#log_level = "info" +# for development/debugging: +log_level = "info,xmpp_proxy=trace" + +# one of auto, always, never, refer to: https://docs.rs/env_logger/0.8.3/env_logger/#disabling-colors +#log_style = "never" diff --git a/integration/Dockerfile b/integration/Dockerfile index 6b64bdf..d3c4318 100644 --- a/integration/Dockerfile +++ b/integration/Dockerfile @@ -63,7 +63,7 @@ COPY --from=build /usr/bin/true /build/target/release/xmpp-prox[y] /usr/bin/ COPY ./integration/named.conf /etc/ COPY ./integration/00-no-tls/example.org.zone /var/named/ COPY ./integration/00-no-tls/prosody1.cfg.lua /etc/prosody/prosody.cfg.lua -COPY ./contrib/prosody-modules /usr/lib/prosody/modules +COPY ./contrib/prosody-modules /opt/xmpp-proxy/prosody-modules COPY ./integration/*.scs /scansion/ ARG ECDSA=0 diff --git a/integration/test.sh b/integration/test.sh index 2718ad2..f73dfa8 100755 --- a/integration/test.sh +++ b/integration/test.sh @@ -61,9 +61,9 @@ run_container() { args+=("-d") shift fi - while [ "$1" == "-v" ] + while [ "$1" == "-v" -o "$1" == "-w" ] do - args+=("-v") + args+=("$1") shift args+=("$1") shift @@ -116,9 +116,9 @@ run_test() { set -e # run the actual tests - run_container 90 scansion scansion -d /scansion/ + tests="$(cat tests || echo "-d .")" + run_container -w /scansion/ 90 scansion scansion $tests # juliet_messages_romeo.scs juliet_presence.scs romeo_messages_juliet.scs romeo_presence.scs - #run_container 90 scansion scansion /scansion/juliet_presence.scs /scansion/romeo_presence.scs cleanup ) diff --git a/src/main.rs b/src/main.rs index e9cf9d8..97b6983 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,11 +18,11 @@ use tokio::net::TcpListener; use tokio::task::JoinHandle; #[cfg(feature = "rustls")] -use rustls::{Certificate, PrivateKey, ServerConfig}; +use rustls::{Certificate, ClientConfig, PrivateKey, ServerConfig}; #[cfg(feature = "rustls-pemfile")] use rustls_pemfile::{certs, pkcs8_private_keys}; #[cfg(feature = "tokio-rustls")] -use tokio_rustls::TlsAcceptor; +use tokio_rustls::{TlsAcceptor, TlsConnector}; use anyhow::{bail, Result}; @@ -129,8 +129,51 @@ impl Config { } } - #[cfg(all(feature = "rustls-pemfile", feature = "rustls"))] - fn server_config(&self) -> Result { + #[cfg(feature = "outgoing")] + fn get_outgoing_cfg(&self) -> OutgoingConfig { + let c2s_config = ClientConfig::builder().with_safe_defaults().with_root_certificates(root_cert_store()).with_no_client_auth(); + let s2s_config = match self.certs_key().and_then(|(tls_certs, tls_key)| { + Ok(ClientConfig::builder() + .with_safe_defaults() + .with_root_certificates(root_cert_store()) + .with_single_cert(tls_certs, tls_key)?) + }) { + Ok(s) => s, + Err(e) => { + debug!("invalid key/cert for s2s client auth: {}", e); + c2s_config.clone() + } + }; + // uncomment to disable cert auth/sasl external + //let s2s_config = c2s_config.clone(); + + let mut c2s_config_alpn = c2s_config.clone(); + let mut s2s_config_alpn = s2s_config.clone(); + c2s_config_alpn.alpn_protocols.push(ALPN_XMPP_CLIENT.to_vec()); + s2s_config_alpn.alpn_protocols.push(ALPN_XMPP_SERVER.to_vec()); + + let c2s_config_alpn = Arc::new(c2s_config_alpn); + let s2s_config_alpn = Arc::new(s2s_config_alpn); + + let c2s_connector_alpn: TlsConnector = c2s_config_alpn.clone().into(); + let s2s_connector_alpn: TlsConnector = s2s_config_alpn.clone().into(); + + let c2s_connector: TlsConnector = Arc::new(c2s_config).into(); + let s2s_connector: TlsConnector = Arc::new(s2s_config).into(); + + OutgoingConfig { + max_stanza_size_bytes: self.max_stanza_size_bytes, + c2s_config_alpn, + s2s_config_alpn, + c2s_connector_alpn, + s2s_connector_alpn, + c2s_connector, + s2s_connector, + } + } + + #[cfg(any(feature = "outgoing", feature = "incoming"))] + fn certs_key(&self) -> Result<(Vec, PrivateKey)> { let mut tls_key: Vec = pkcs8_private_keys(&mut BufReader::new(File::open(&self.tls_key)?)) .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid key")) .map(|mut keys| keys.drain(..).map(PrivateKey).collect())?; @@ -143,17 +186,66 @@ impl Config { .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid cert")) .map(|mut certs| certs.drain(..).map(Certificate).collect())?; + Ok((tls_certs, tls_key)) + } + + #[cfg(feature = "incoming")] + fn server_config(&self) -> Result { + let (tls_certs, tls_key) = self.certs_key()?; + + // todo: request client auth here let config = ServerConfig::builder().with_safe_defaults().with_no_client_auth().with_single_cert(tls_certs, tls_key)?; Ok(config) } - #[cfg(all(feature = "tokio-rustls", feature = "rustls-pemfile", feature = "rustls"))] + #[cfg(feature = "incoming")] fn tls_acceptor(&self) -> Result { Ok(TlsAcceptor::from(Arc::new(self.server_config()?))) } } +#[derive(Clone)] +#[cfg(feature = "outgoing")] +pub struct OutgoingConfig { + max_stanza_size_bytes: usize, + + c2s_config_alpn: Arc, + s2s_config_alpn: Arc, + c2s_connector_alpn: TlsConnector, + s2s_connector_alpn: TlsConnector, + + c2s_connector: TlsConnector, + s2s_connector: TlsConnector, +} + +#[cfg(feature = "outgoing")] +impl OutgoingConfig { + pub fn client_cfg_alpn(&self, is_c2s: bool) -> Arc { + if is_c2s { + self.c2s_config_alpn.clone() + } else { + self.s2s_config_alpn.clone() + } + } + + pub fn connector_alpn(&self, is_c2s: bool) -> TlsConnector { + if is_c2s { + self.c2s_connector_alpn.clone() + } else { + self.s2s_connector_alpn.clone() + } + } + + pub fn connector(&self, is_c2s: bool) -> TlsConnector { + if is_c2s { + self.c2s_connector.clone() + } else { + self.s2s_connector.clone() + } + } +} + async fn shuffle_rd_wr(in_rd: StanzaRead, in_wr: StanzaWrite, config: CloneableConfig, local_addr: SocketAddr, client_addr: &mut Context<'_>) -> Result<()> { let filter = StanzaFilter::new(config.max_stanza_size_bytes); shuffle_rd_wr_filter(in_rd, in_wr, config, local_addr, client_addr, filter).await @@ -318,7 +410,7 @@ async fn main() { handles.push(spawn_tls_listener(listener.parse().die("invalid listener address"), config.clone(), acceptor.clone())); } } - #[cfg(feature = "quic")] + #[cfg(all(feature = "quic", feature = "incoming"))] if let Some(ref listeners) = main_config.quic_listen { let quic_config = main_config.quic_server_config().die("invalid cert/key ?"); for listener in listeners { @@ -327,8 +419,9 @@ async fn main() { } #[cfg(feature = "outgoing")] if let Some(ref listeners) = main_config.outgoing_listen { + let outgoing_cfg = main_config.get_outgoing_cfg(); for listener in listeners { - handles.push(spawn_outgoing_listener(listener.parse().die("invalid listener address"), config.max_stanza_size_bytes)); + handles.push(spawn_outgoing_listener(listener.parse().die("invalid listener address"), outgoing_cfg.clone())); } } info!("xmpp-proxy started"); diff --git a/src/outgoing.rs b/src/outgoing.rs index d8da559..64cc769 100644 --- a/src/outgoing.rs +++ b/src/outgoing.rs @@ -1,9 +1,9 @@ use crate::*; -async fn handle_outgoing_connection(stream: tokio::net::TcpStream, client_addr: &mut Context<'_>, max_stanza_size_bytes: usize) -> Result<()> { +async fn handle_outgoing_connection(stream: tokio::net::TcpStream, client_addr: &mut Context<'_>, config: OutgoingConfig) -> Result<()> { info!("{} connected", client_addr.log_from()); - let mut in_filter = StanzaFilter::new(max_stanza_size_bytes); + let mut in_filter = StanzaFilter::new(config.max_stanza_size_bytes); let (in_rd, in_wr) = tokio::io::split(stream); @@ -17,7 +17,8 @@ async fn handle_outgoing_connection(stream: tokio::net::TcpStream, client_addr: // we require a valid to= here or we fail let to = std::str::from_utf8(stream_open.extract_between(b" to='", b"'").or_else(|_| stream_open.extract_between(b" to=\"", b"\""))?)?; - let (out_wr, out_rd, stream_open) = srv_connect(to, is_c2s, &stream_open, &mut in_filter, client_addr).await?; + let max_stanza_size_bytes = config.max_stanza_size_bytes; + let (out_wr, out_rd, stream_open) = srv_connect(to, is_c2s, &stream_open, &mut in_filter, client_addr, config).await?; // send server response to client in_wr.write_all(is_c2s, &stream_open, 0, client_addr.log_from()).await?; in_wr.flush().await?; @@ -26,14 +27,15 @@ async fn handle_outgoing_connection(stream: tokio::net::TcpStream, client_addr: shuffle_rd_wr_filter_only(in_rd, in_wr, out_rd, out_wr, is_c2s, max_stanza_size_bytes, client_addr, in_filter).await } -pub fn spawn_outgoing_listener(local_addr: SocketAddr, max_stanza_size_bytes: usize) -> JoinHandle> { +pub fn spawn_outgoing_listener(local_addr: SocketAddr, config: OutgoingConfig) -> JoinHandle> { tokio::spawn(async move { let listener = TcpListener::bind(&local_addr).await.die("cannot listen on port/interface"); loop { let (stream, client_addr) = listener.accept().await?; + let config = config.clone(); tokio::spawn(async move { let mut client_addr = Context::new("unk-out", client_addr); - if let Err(e) = handle_outgoing_connection(stream, &mut client_addr, max_stanza_size_bytes).await { + if let Err(e) = handle_outgoing_connection(stream, &mut client_addr, config).await { error!("{} {}", client_addr.log_from(), e); } }); diff --git a/src/quic.rs b/src/quic.rs index 8bf5f38..c66ff07 100644 --- a/src/quic.rs +++ b/src/quic.rs @@ -1,19 +1,18 @@ use crate::*; use futures::StreamExt; use quinn::{ServerConfig, TransportConfig}; -use rustls::client::ClientConfig; use std::{net::SocketAddr, sync::Arc}; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use anyhow::Result; -pub async fn quic_connect(target: SocketAddr, server_name: &str, is_c2s: bool) -> Result<(StanzaWrite, StanzaRead)> { +#[cfg(feature = "outgoing")] +pub async fn quic_connect(target: SocketAddr, server_name: &str, is_c2s: bool, config: OutgoingConfig) -> Result<(StanzaWrite, StanzaRead)> { let bind_addr = "0.0.0.0:0".parse().unwrap(); - let mut client_cfg = ClientConfig::builder().with_safe_defaults().with_root_certificates(root_cert_store()).with_no_client_auth(); // todo: for s2s do client auth - client_cfg.alpn_protocols.push(if is_c2s { ALPN_XMPP_CLIENT } else { ALPN_XMPP_SERVER }.to_vec()); + let client_cfg = config.client_cfg_alpn(is_c2s); let mut endpoint = quinn::Endpoint::client(bind_addr)?; - endpoint.set_default_client_config(quinn::ClientConfig::new(Arc::new(client_cfg))); + endpoint.set_default_client_config(quinn::ClientConfig::new(client_cfg)); // connect to server let quinn::NewConnection { connection, .. } = endpoint.connect(target, server_name)?.await?; @@ -24,6 +23,7 @@ pub async fn quic_connect(target: SocketAddr, server_name: &str, is_c2s: bool) - } impl Config { + #[cfg(feature = "incoming")] pub fn quic_server_config(&self) -> Result { let transport_config = TransportConfig::default(); // todo: configure transport_config here if needed diff --git a/src/srv.rs b/src/srv.rs index 7471746..0520365 100644 --- a/src/srv.rs +++ b/src/srv.rs @@ -51,6 +51,7 @@ impl XmppConnection { stream_open: &[u8], in_filter: &mut crate::StanzaFilter, client_addr: &mut Context<'_>, + config: OutgoingConfig, ) -> Result<(StanzaWrite, StanzaRead, SocketAddr, &'static str)> { debug!("{} attempting connection to SRV: {:?}", client_addr.log_from(), self); // todo: need to set options to Ipv4AndIpv6 @@ -60,25 +61,27 @@ impl XmppConnection { debug!("{} trying ip {}", client_addr.log_from(), to_addr); // todo: for DNSSEC we need to optionally allow target in addition to domain, but what for SNI match self.conn_type { - XmppConnectionType::StartTLS => match crate::starttls_connect(to_addr, domain, is_c2s, stream_open, in_filter).await { + XmppConnectionType::StartTLS => match crate::starttls_connect(to_addr, domain, is_c2s, stream_open, in_filter, config.clone()).await { Ok((wr, rd)) => return Ok((wr, rd, to_addr, "starttls-out")), Err(e) => error!("starttls connection failed to IP {} from SRV {}, error: {}", to_addr, self.target, e), }, - XmppConnectionType::DirectTLS => match crate::tls_connect(to_addr, domain, is_c2s).await { + XmppConnectionType::DirectTLS => match crate::tls_connect(to_addr, domain, is_c2s, config.clone()).await { Ok((wr, rd)) => return Ok((wr, rd, to_addr, "directtls-out")), Err(e) => error!("direct tls connection failed to IP {} from SRV {}, error: {}", to_addr, self.target, e), }, #[cfg(feature = "quic")] - XmppConnectionType::QUIC => match crate::quic_connect(to_addr, domain, is_c2s).await { + XmppConnectionType::QUIC => match crate::quic_connect(to_addr, domain, is_c2s, config.clone()).await { Ok((wr, rd)) => return Ok((wr, rd, to_addr, "quic-out")), Err(e) => error!("quic connection failed to IP {} from SRV {}, error: {}", to_addr, self.target, e), }, #[cfg(feature = "websocket")] // todo: when websocket is found via DNS, we need to validate cert against domain, *not* target, this is a security problem with XEP-0156, we are doing it the secure but likely unexpected way here for now - XmppConnectionType::WebSocket(ref url, ref origin, ref secure) => match crate::websocket_connect(to_addr, if *secure { &self.target } else { domain }, url, origin, is_c2s).await { - Ok((wr, rd)) => return Ok((wr, rd, to_addr, "websocket-out")), - Err(e) => error!("websocket connection failed to IP {} from TXT {}, error: {}", to_addr, url, e), - }, + XmppConnectionType::WebSocket(ref url, ref origin, ref secure) => { + match crate::websocket_connect(to_addr, if *secure { &self.target } else { domain }, url, origin, is_c2s, config.clone()).await { + Ok((wr, rd)) => return Ok((wr, rd, to_addr, "websocket-out")), + Err(e) => error!("websocket connection failed to IP {} from TXT {}, error: {}", to_addr, url, e), + } + } } } bail!("cannot connect to any IPs for SRV: {}", self.target) @@ -117,7 +120,7 @@ fn wss_to_srv(url: &str, secure: bool) -> Option { return None; } }; - let target = server_name.clone().to_string(); + let target = server_name.to_string(); let mut origin = "https://".to_string(); origin.push_str(&server_name); @@ -274,9 +277,16 @@ pub async fn get_xmpp_connections(domain: &str, is_c2s: bool) -> Result) -> Result<(StanzaWrite, StanzaRead, Vec)> { +pub async fn srv_connect( + domain: &str, + is_c2s: bool, + stream_open: &[u8], + in_filter: &mut crate::StanzaFilter, + client_addr: &mut Context<'_>, + config: OutgoingConfig, +) -> Result<(StanzaWrite, StanzaRead, Vec)> { for srv in get_xmpp_connections(domain, is_c2s).await? { - let connect = srv.connect(domain, is_c2s, stream_open, in_filter, client_addr).await; + let connect = srv.connect(domain, is_c2s, stream_open, in_filter, client_addr, config.clone()).await; if connect.is_err() { continue; } @@ -338,12 +348,12 @@ async fn collect_host_meta_json(domain: &str, rel: &str) -> Result> #[cfg(feature = "websocket")] async fn parse_host_meta(rel: &str, bytes: &[u8]) -> Result> { let mut vec = Vec::new(); - let mut stanza_reader = StanzaReader(bytes.as_ref()); + let mut stanza_reader = StanzaReader(bytes); let mut filter = StanzaFilter::new(8192); while let Some((stanza, eoft)) = stanza_reader.next_eoft(&mut filter).await? { if stanza.starts_with(b" Result<(StanzaWrite, StanzaRead)> { +pub async fn tls_connect(target: SocketAddr, server_name: &str, is_c2s: bool, config: OutgoingConfig) -> Result<(StanzaWrite, StanzaRead)> { let dnsname = ServerName::try_from(server_name)?; let stream = tokio::net::TcpStream::connect(target).await?; - let stream = if is_c2s { - CLIENT_TLS_CONFIG.connect(dnsname, stream).await? - } else { - SERVER_TLS_CONFIG.connect(dnsname, stream).await? - }; + let stream = config.connector_alpn(is_c2s).connect(dnsname, stream).await?; let (rd, wrt) = tokio::io::split(stream); Ok((StanzaWrite::new(wrt), StanzaRead::new(rd))) } #[cfg(feature = "outgoing")] -pub async fn starttls_connect(target: SocketAddr, server_name: &str, is_c2s: bool, stream_open: &[u8], in_filter: &mut StanzaFilter) -> Result<(StanzaWrite, StanzaRead)> { +pub async fn starttls_connect(target: SocketAddr, server_name: &str, is_c2s: bool, stream_open: &[u8], in_filter: &mut StanzaFilter, config: OutgoingConfig) -> Result<(StanzaWrite, StanzaRead)> { let dnsname = ServerName::try_from(server_name)?; let mut stream = tokio::net::TcpStream::connect(target).await?; let (in_rd, mut in_wr) = stream.split(); @@ -80,11 +53,7 @@ pub async fn starttls_connect(target: SocketAddr, server_name: &str, is_c2s: boo } debug!("starttls starting TLS {}", server_name); - let stream = if is_c2s { - CLIENT_TLS_CONFIG.connect(dnsname, stream).await? - } else { - SERVER_TLS_CONFIG.connect(dnsname, stream).await? - }; + let stream = config.connector(is_c2s).connect(dnsname, stream).await?; let (rd, wrt) = tokio::io::split(stream); Ok((StanzaWrite::new(wrt), StanzaRead::new(rd))) } diff --git a/src/websocket.rs b/src/websocket.rs index 8753995..1da6e9c 100644 --- a/src/websocket.rs +++ b/src/websocket.rs @@ -6,6 +6,15 @@ use tokio_tungstenite::tungstenite::protocol::WebSocketConfig; // https://datatracker.ietf.org/doc/html/rfc7395 +fn ws_cfg(max_stanza_size_bytes: usize) -> Option { + Some(WebSocketConfig { + max_send_queue: None, // unlimited + max_frame_size: Some(max_stanza_size_bytes), // this is exactly the stanza size + max_message_size: Some(max_stanza_size_bytes * 4), // this is the message size, default is 4x frame size, so I guess we'll do the same here + accept_unmasked_frames: true, + }) +} + pub async fn handle_websocket_connection( stream: BufStream>, client_addr: &mut Context<'_>, @@ -16,16 +25,7 @@ pub async fn handle_websocket_connection( // accept the websocket // todo: check SEC_WEBSOCKET_PROTOCOL or ORIGIN ? - let stream = tokio_tungstenite::accept_async_with_config( - stream, - Some(WebSocketConfig { - max_send_queue: None, // unlimited - max_frame_size: Some(config.max_stanza_size_bytes), // this is exactly the stanza size - max_message_size: Some(config.max_stanza_size_bytes * 4), // this is the message size, default is 4x frame size, so I guess we'll do the same here - accept_unmasked_frames: true, - }), - ) - .await?; + let stream = tokio_tungstenite::accept_async_with_config(stream, ws_cfg(config.max_stanza_size_bytes)).await?; let (in_wr, in_rd) = stream.split(); @@ -89,30 +89,25 @@ use rustls::ServerName; use std::convert::TryFrom; use tokio::io::BufStream; -use tokio_rustls::TlsConnector; use tokio_tungstenite::tungstenite::client::IntoClientRequest; use tokio_tungstenite::tungstenite::http::header::{ORIGIN, SEC_WEBSOCKET_PROTOCOL}; use tokio_tungstenite::tungstenite::http::Uri; -pub async fn websocket_connect(target: SocketAddr, server_name: &str, url: &Uri, origin: &str, _is_c2s: bool) -> Result<(StanzaWrite, StanzaRead)> { - // todo: WebSocketConfig - // todo: static ? alpn? client cert auth for server - let connector = rustls::ClientConfig::builder().with_safe_defaults().with_root_certificates(root_cert_store()).with_no_client_auth(); - +#[cfg(feature = "outgoing")] +pub async fn websocket_connect(target: SocketAddr, server_name: &str, url: &Uri, origin: &str, is_c2s: bool, config: OutgoingConfig) -> Result<(StanzaWrite, StanzaRead)> { let mut request = url.into_client_request()?; request.headers_mut().append(SEC_WEBSOCKET_PROTOCOL, "xmpp".parse()?); request.headers_mut().append(ORIGIN, origin.parse()?); let dnsname = ServerName::try_from(server_name)?; let stream = tokio::net::TcpStream::connect(target).await?; - let connector = TlsConnector::from(Arc::new(connector)); - let stream = connector.connect(dnsname, stream).await?; + let stream = config.connector(is_c2s).connect(dnsname, stream).await?; let stream: tokio_rustls::TlsStream = stream.into(); // todo: tokio_tungstenite seems to have a bug, if the write buffer is non-zero, it'll hang forever, even though we always flush, investigate let stream = BufStream::with_capacity(crate::IN_BUFFER_SIZE, 0, stream); - let (stream, _) = tokio_tungstenite::client_async_with_config(request, stream, None).await?; + let (stream, _) = tokio_tungstenite::client_async_with_config(request, stream, ws_cfg(config.max_stanza_size_bytes)).await?; let (wrt, rd) = stream.split();