drachtio-srf 4.5.1 → 4.5.14

package/lib/dialog.js

@@ -331,6 +331,7 @@ class Dialog extends Emitter {
             stackDialogId: this.id,
             body: this.local.sdp,
             _socket: this.socket,
+            auth: opts.auth || this.auth,
             headers:
               opts.headers ? opts.headers : {'Contact': this.local.contact}
           }, (err, req) => {

package/lib/sip-parser/message.js

@@ -86,7 +86,12 @@ class SipMessage {
 
   getParsedHeader(hdr) {
     const name = parser.getHeaderName(hdr) ;
-    const v =  this.headers[name] ;
+    const v =  this.headers[name];
+
+    if (!v) {
+      throw new Error('header not available');
+    }
+
     const fn = parser.getParser(hdr.toLowerCase()) ;
     return fn({s:v, i:0}) ;
   }

package/lib/srf.js

@@ -25,6 +25,8 @@ DialogState.Cancelled = 'cancelled';
 DialogDirection.Initiator = 'initiator';
 DialogDirection.Recipient = 'recipient';
 
+const sleepFor = async(ms) => await new Promise((resolve) => setTimeout(resolve, ms));
+
 const noncopyableHdrs = ['via', 'from', 'to', 'call-id', 'cseq', 'contact', 'content-length', 'content-type'];
 function copyAllHeaders(msg, obj) {
   if (msg) Object.keys(msg.headers).forEach((h) => {
@@ -819,7 +821,7 @@ class Srf extends Emitter {
     if (!(opts.headers.to || opts.headers.To) && !opts.calledNumber) { opts.calledNumber = req.calledNumber; }
 
     opts.localSdp = opts.localSdpB && typeof opts.localSdpB !== 'function' ? opts.localSdpB : req.body ;
-    const is3pcc = !opts.localSdp;
+    const is3pcc = !opts.localSdp || opts.noAck;
     if (is3pcc) opts.noAck = true;
 
     let remoteSdpB, translatedRemoteSdpB ;
@@ -835,7 +837,15 @@ class Srf extends Emitter {
 
       if (remoteSdpB && remoteSdpB === sdpB) {
         // called again with same remote SDP, return previous result
-        return translatedRemoteSdpB ;
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+
+        /* race condition: we are still producing the translatedSdp from 183 */
+        await sleepFor(100);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(500);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(1000);
+        return translatedRemoteSdpB;
       }
 
       remoteSdpB = sdpB ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.1",
+  "version": "4.5.14",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {

package/test/docker-compose-testbed.yaml

@@ -161,3 +161,14 @@ services:
     networks:
       testbed:
         ipv4_address: 172.29.0.24
+
+  sipp-uas-reinvite-with-auth:
+    image: drachtio/sipp:latest
+    command: sipp -sf /tmp/uas-reinvite-with-auth.xml
+    container_name: sipp-uas-reinvite-with-auth
+    volumes:
+      - ./scenarios:/tmp
+    tty: true
+    networks:
+      testbed:
+        ipv4_address: 172.29.0.25

package/test/scenarios/uas-reinvite-with-auth.xml

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Basic UAS responder">
+  <recv request="INVITE" crlf="true">
+    <action>
+      <ereg regexp="<sip:(.*)>" search_in="hdr" header="Contact:" assign_to="3"/>
+      <log message="Contact hostport is [$3]"/>
+    </action>
+
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 407 Proxy Authentication Required
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Proxy-Authenticate: Digest realm="local", nonce="4cdbb733645816512687270b83d2ae5d11e4d9d8"
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+  </recv>
+
+
+  <recv request="INVITE" crlf="true">
+    <action>
+      <ereg regexp="<sip:(.*)>" search_in="hdr" header="Contact:" assign_to="3"/>
+      <log message="Contact hostport is [$3]"/>
+    </action>
+
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+  </recv>
+
+  <recv request="INVITE" crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 407 Proxy Authentication Required
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Proxy-Authenticate: Digest realm="local", nonce="4cdbb733645816512687270b83d2ae5d11e4d9d8"
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+  </recv>
+
+  <recv request="INVITE" crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      Subject:[$1]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="From:" assign_to="1"/>
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="2"/>
+    </action>
+  </recv>
+
+  <recv request="BYE">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Keep the call open for a while in case the 200 is lost to be     -->
+  <!-- able to retransmit it if we receive the BYE again.               -->
+  <timewait milliseconds="4000"/>
+
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+

package/test/uac.js

@@ -176,6 +176,32 @@ test('UAC', (t) => {
       srf = new Srf();
       return connect(srf);
     })
+    .then(() => {
+      return srf.createUAC('sip:172.29.0.25', {
+        method: 'INVITE',
+        headers: {
+          To: 'sip:dhorton@sip.drachtio.org',
+          From: 'sip:dhorton@sip.drachtio.org'
+        },
+        auth: {
+          username: 'foo',
+          password: 'bar'
+        }
+      });
+    })
+    .then((uac) => {
+      uacOverlap = uac;
+      return uac.modify('hold');
+    })
+    .then(() => uacOverlap.destroy())
+    .then(() => {
+      srf.disconnect();
+      return t.pass('SipDialog will handle authentication on re-invites');
+    })
+    .then(() => {
+      srf = new Srf();
+      return connect(srf);
+    })
     .then(() => {
       return srf.createUAC('sip:sipp-uas-auth', {
         method: 'INVITE',

package/test/unit-tests/parser.js

@@ -40,6 +40,10 @@ describe('Parser', function () {
     msg.set('From', '<sip:daveh@localhost>;tag=1234');
     msg.get('from').should.eql('<sip:daveh@localhost>;tag=1234');
   });
+  it('should not parse a header when not available', function () {
+    var msg = new SipMessage();
+    should.throws(msg.getParsedHeader.bind(msg, 'contact'));
+  });
   it('should parse multiple headers into an array', function () {
     var msg = new SipMessage(examples('invite'));
     var via = msg.getParsedHeader('via');
@@ -146,5 +150,11 @@ describe('Parser', function () {
     msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
     msg.callingName.should.eql('Dave');
   });
+  it('should parse calling name', function () {
+    var msg = new SipMessage();
+    msg.set('From', '"Dave" <sip:daveh@localhost>;tag=1234');
+    msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
+    msg.callingName.should.eql('Dave');
+  });
 });