feat: enhance proxy configuration and authentication handling

Author: shenjinti

config.toml.example

@@ -52,4 +52,21 @@ users = [
 
 [callrecord]
 type = "local"
-root = "/tmp/cdr"
+root = "/tmp/cdr"
+
+[proxy.trunks.wuhoo]
+dest = "sip:123.456.789.00:1234"
+
+[[proxy.routes]]
+name = "default"
+priority = 1
+dest = "wuhoo"
+
+[proxy.routes.match]
+"to.user" = "^\\+.*"
+
+[proxy.routes.rewrite]
+"to.user" = "+{1}"
+"to.host" = "123.456.789.00:1234"
+"from.user" = "12345"
+"from.host" = "123.456.789.00:1234"

src/proxy/auth.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use super::{server::SipServerRef, user::SipUser, ProxyAction, ProxyModule};
 use crate::config::ProxyConfig;
 use crate::proxy::server::TransactionCookie;
@@ -15,6 +13,7 @@ use rsip::typed::Authorization;
 use rsip::Header;
 use rsip::Uri;
 use rsipstack::transaction::transaction::Transaction;
+use std::sync::Arc;
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, info};
 
@@ -189,18 +188,8 @@ impl ProxyModule for AuthModule {
                     _cookie.set_user(user);
                     Ok(ProxyAction::Continue)
                 } else {
-                    // Extract realm from request
-                    let from = if tx.original.method == rsip::Method::Register {
-                        tx.original.to_header()?.uri()?.to_string()
-                    } else {
-                        tx.original.uri.to_string()
-                    };
-
-                    let realm = if tx.original.method == rsip::Method::Register {
-                        tx.original.to_header()?.uri()?.host().to_string()
-                    } else {
-                        tx.original.uri.host().to_string()
-                    };
+                    let from_uri = tx.original.from_header()?.uri()?;
+                    let realm = from_uri.host().to_string();
                     let realm = ProxyConfig::normalize_realm(&realm);
                     // Check which type of authentication was attempted or send both challenges
                     let has_proxy_auth_header =
@@ -210,7 +199,8 @@ impl ProxyModule for AuthModule {
                         // Send proxy challenge if proxy auth was attempted
                         let proxy_auth = self.create_proxy_auth_challenge(&realm)?;
                         info!(
-                            from,
+                            from = from_uri.to_string(),
+                            realm = realm,
                             ?proxy_auth,
                             "Proxy authentication failed, sending proxy challenge"
                         );
@@ -222,7 +212,8 @@ impl ProxyModule for AuthModule {
                         // Send WWW challenge if WWW auth was attempted
                         let www_auth = self.create_www_auth_challenge(&realm)?;
                         info!(
-                            from,
+                            from = from_uri.to_string(),
+                            realm = realm,
                             ?www_auth,
                             "WWW authentication failed, sending WWW challenge"
                         );

src/proxy/call.rs

@@ -248,10 +248,10 @@ impl CallModule {
         }
         // Attempt outbound call
         info!(
-            "Creating outbound call: {} -> {} via {} (should_bridge_media: {}) sdp:\n {:?}",
+            "Creating outbound call: {} -> {} via {:?} (should_bridge_media: {}) sdp:\n {:?}",
             invite_option.caller,
             invite_option.callee,
-            target_location.destination,
+            invite_option.destination,
             should_bridge_media,
             outbound_sdp
         );

static/phone.html

@@ -402,8 +402,12 @@ <h3>Logs</h3>
                 log('Please enter a call target and ensure you are registered');
                 return;
             }
-
-            const targetURI = SIP.UserAgent.makeURI(`sip:${target}@${serverInput.value.replace('ws://', '').replace('wss://', '').split('/')[0]}`);
+            let targetURI = undefined;
+            if (target.startsWith('sip:')) {
+                targetURI = SIP.UserAgent.makeURI(target);
+            } else {
+                targetURI = SIP.UserAgent.makeURI(`sip:${target}@${serverInput.value.replace('ws://', '').replace('wss://', '').split('/')[0]}`);
+            }
 
             const inviteOptions = {
                 sessionDescriptionHandlerOptions: {