drachtio-srf 4.5.37 → 4.5.39

package/lib/digest-client.js

@@ -1,5 +1,12 @@
 const crypto = require('crypto');
 
+function parseTransportToken(sipString) {
+  if (sipString) {
+    const match = sipString.match(/;transport=([^;\s]+)/i);
+    if (match) return match[1].toLowerCase();
+  }
+}
+
 module.exports = class DigestClient {
 
   constructor(res) {
@@ -31,17 +38,17 @@ module.exports = class DigestClient {
         return callback(err);
       }
 
-      var header = this.res.statusCode === 407 ? 'proxy-authenticate' : 'www-authenticate' ;
-      var challenge = this._parseChallenge(this.res.get(header));
+      const header = this.res.statusCode === 407 ? 'proxy-authenticate' : 'www-authenticate' ;
+      const challenge = this._parseChallenge(this.res.get(header));
 
-      var ha1 = crypto.createHash('md5');
+      const ha1 = crypto.createHash('md5');
       ha1.update([username, challenge.realm, password].join(':'));
-      var ha2 = crypto.createHash('md5');
+      const ha2 = crypto.createHash('md5');
       ha2.update([options.method, options.uri].join(':'));
 
       // bump CSeq and preserve Call-Id
-      var headers = options.headers || {};
-      var seq = this.req.getParsedHeader('cseq').seq ;
+      const headers = options.headers || {};
+      let seq = this.req.getParsedHeader('cseq').seq ;
       seq++ ;
       headers['CSeq'] = '' + seq + ' ' + this.req.method ;
       headers['call-id'] = this.req.get('call-id') ;
@@ -52,18 +59,18 @@ module.exports = class DigestClient {
 
 
       // Generate cnonce
-      var cnonce = false;
-      var nc = false;
+      let cnonce = false;
+      let nc = false;
       if (typeof challenge.qop === 'string') {
-        var cnonceHash = crypto.createHash('md5');
+        const cnonceHash = crypto.createHash('md5');
         cnonceHash.update(Math.random().toString(36));
-        cnonce = cnonceHash.digest('hex').substr(0, 8);
+        cnonce = cnonceHash.digest('hex').slice(0, 8);
         nc = this._updateNC();
       }
 
       // Generate response hash
-      var response = crypto.createHash('md5');
-      var responseParams = [
+      const response = crypto.createHash('md5');
+      const responseParams = [
         ha1.digest('hex'),
         challenge.nonce
       ];
@@ -80,7 +87,7 @@ module.exports = class DigestClient {
       response.update(responseParams.join(':'));
 
       // Setup response parameters
-      var authParams = {
+      const authParams = {
         username: username,
         realm: challenge.realm,
         nonce: challenge.nonce,
@@ -105,7 +112,9 @@ module.exports = class DigestClient {
       // we want to send our credentialled request to the same server that challenged us
       const originalUri = options.uri;
       if (!originalUri.match(/sips?:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/)) {
-        const proxy = originalUri.replace(/(sips*):[^;]*/, `$1:${this.res.source_address}:${this.res.source_port}`);
+        const transport = parseTransportToken(options.proxy);
+        let proxy = originalUri.replace(/(sips*):[^;]*/, `$1:${this.res.source_address}:${this.res.source_port}`);
+        if (transport) proxy += `;transport=${transport}`;
         Object.assign(options, {proxy});
       }
       this.agent.request(options, callback) ;

package/lib/drachtio-agent.js

@@ -526,16 +526,17 @@ class DrachtioAgent extends Emitter {
         obj.ready = true ;
         obj.hostport = response[1] ;
         obj.serverVersion = response.length > 2 ? response[2] : null;
+        obj.localHostports = response.length > 3 ? response[3] : null;
         debug('sucessfully authenticated, hostport is ', obj.hostport) ;
 
         if (this.wp.isClient) {
           this.routeVerbs(socket, obj) ;
           setImmediate(() => {
-            this.emit('connect', null, obj.hostport, obj.serverVersion);
+            this.emit('connect', null, obj.hostport, obj.serverVersion, obj.localHostports);
           });
         }
         else {
-          this.emit('connect', null, obj.hostport, obj.serverVersion);
+          this.emit('connect', null, obj.hostport, obj.serverVersion, obj.localHostports);
         }
         if (serverVersionAtLeast(obj.serverVersion, 'v0.8.2')) {
           debug(`server version ${obj.serverVersion} supports pinging`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.37",
+  "version": "4.5.39",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "types": "lib/@types/index.d.ts",