bugfix: re-invite handling from UAC side now handled properly

Updated Dockerfile

.eslintrc.json

@@ -8,7 +8,7 @@
       "jsx": false,
       "modules": false
     },
-    "ecmaVersion": 2017 
+    "ecmaVersion": 2018
   },
   "plugins": ["promise"],
   "rules": {

.github/workflows/build.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm run jslint
+      - run: npm test
+
+ 

.travis.yml

@@ -1,10 +0,0 @@
-sudo: required
-language: node_js
-node_js:
-  - "lts/*"
-services:
-  - docker
-  - mysql
-script:
-  - npm test
-  

Dockerfile

@@ -1,13 +1,15 @@
-FROM node:lts-alpine
+FROM node:alpine as builder
+WORKDIR /opt/app/
+COPY package.json ./
+RUN npm install
+RUN npm prune --production
 
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
+FROM node:alpine as app
+WORKDIR /opt/app
+COPY . /opt/app
+COPY --from=builder /opt/app/node_modules ./node_modules
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
-COPY package.json /usr/src/app/
-RUN npm install
-COPY . /usr/src/app
-
 CMD [ "npm", "start" ]

README.md

@@ -1,80 +1,76 @@
-# sbc-outbound [![Build Status](https://secure.travis-ci.org/jambonz/sbc-outbound.png)](http://travis-ci.org/jambonz/sbc-outbound)
+# sbc-outbound ![Build Status](https://github.com/jambonz/sbc-outbound/workflows/CI/badge.svg)
 
 This application provides a part of the SBC (Session Border Controller) functionality of jambonz.  It handles outbound INVITE requests from the cpaas application server that is going to carrier sip trunks or registered sip users/devices, including webrtc applications. 
 
 ## Configuration
 
-Configuration is provided via the [npmjs config](https://www.npmjs.com/package/config) package.  Much of the configuration is standard "where is drachtio?, where is rtpengine?, where is redis?" type of thing.  This application also needs information about the sip trunk to send PSTN calls out on.  In the initial release, only a single outbound SIP trunk is supported.
+Configuration is provided via environment variables:
 
-The following elements make up the configuration for the application:
-##### outbound sip trunk
-```
-"trunks": {
-  "outbound": {
-    "name": "carrier1",
-    "host": "sip:172.39.0.20"
-  }
-},
-```
-The sip uri specifies the sip trunk uri to send PSTN calls to.  All outbound PSTN calls from the cpaas application server are expected to be in E.164 format with a leading plus (+) sign.  Outbound sip uris that do not begin with a '+' are assumed to be calls to registered devices/users.
+| variable | meaning | required?|
+|----------|----------|---------|
+|DRACHTIO_HOST| ip address of drachtio server (typically '127.0.0.1')|yes|
+|DRACHTIO_PORT| listening port of drachtio server for control connections (typically 9022)|yes|
+|DRACHTIO_SECRET| shared secret|yes|
+|ENABLE_METRICS| if 1, metrics will be generated|no|
+|JAMBONES_LOGLEVEL| log level for application, 'info' or 'debug'|no|
+|JAMBONES_MYSQL_HOST| mysql host|yes|
+|JAMBONES_MYSQL_USER| mysql username|yes|
+|JAMBONES_MYSQL_PASSWORD|  mysql password|yes|
+|JAMBONES_MYSQL_DATABASE| mysql data|yes|
+|JAMBONES_MYSQL_CONNECTION_LIMIT| mysql connection limit |no|
+|JAMBONES_NETWORK_CIDR| CIDR of private network that feature server is running in (e.g. '172.31.0.0/16')|yes|
+|JAMBONES_REDIS_HOST| redis host|yes|
+|JAMBONES_REDIS_PORT|redis port|yes|
+|JAMBONES_RTPENGINES| commans-separated list of ip:ng-port for rtpengines (e.g. '172.31.32.10:22222')|yes|
+|JAMBONES_SBCS| list of IP addresses (on the internal network) of SBCs, comma-separated|yes|
+|STATS_HOST| ip address of metrics host (usually '127.0.0.1' since telegraf is installed locally|no|
+|STATS_PORT| listening port for metrics host|no|
+|STATS_PROTOCOL| 'tcp' or 'udp'|no|
+|STATS_TELEGRAF| if 1, metrics will be generated in telegraf format|no|
 
-##### drachtio server location
+### running under pm2
+Typically, this application runs under [pm2](https://pm2.io) using an [ecosystem.config.js](https://pm2.keymetrics.io/docs/usage/application-declaration/) file similar to this:
+```js
+module.exports = {
+  apps : [
+  {
+    name: 'sbc-outbound',
+    cwd: '/home/admin/apps/sbc-outbound',
+    script: 'app.js',
+    instance_var: 'INSTANCE_ID',
+    out_file: '/home/admin/.pm2/logs/jambonz-sbc-outbound.log',
+    err_file: '/home/admin/.pm2/logs/jambonz-sbc-outbound.log',
+    exec_mode: 'fork',
+    instances: 1,
+    autorestart: true,
+    watch: false,
+    max_memory_restart: '1G',    env: {
+     NODE_ENV: 'production',
+      JAMBONES_LOGLEVEL: 'info',
+      DRACHTIO_HOST: '127.0.0.1',
+      DRACHTIO_PORT: 9022,
+      DRACHTIO_SECRET: 'cymru',
+      JAMBONES_RTPENGINES: '172.31.32.10:22222',
+      JAMBONES_MYSQL_HOST: 'aurora-cluster-jambonz.cluster-xxxxxxxxxxxxx.us-west-1.rds.amazonaws.com',
+      JAMBONES_MYSQL_USER: 'admin',
+      JAMBONES_MYSQL_PASSWORD: 'JambonzR0ck$',
+      JAMBONES_MYSQL_DATABASE: 'jambones',
+      JAMBONES_MYSQL_CONNECTION_LIMIT: 10,
+      JAMBONES_REDIS_HOST: 'jambonz.zzzzzzz.0001.usw1.cache.amazonaws.com',
+      JAMBONES_REDIS_PORT: 6379,
+      ENABLE_METRICS: 1,
+      STATS_HOST: '127.0.0.1',
+      STATS_PORT: 8125,
+      STATS_PROTOCOL: 'tcp',
+      STATS_TELEGRAF: 1,
+    }
+  }]
+};
 ```
-"drachtio": {
-  "port": 3001,
-  "secret": "cymru"
-},
-```
-the `drachtio` object specifies the port to listen on for tcp connections from drachtio servers as well as the shared secret that is used to authenticate to the server.
 
-> Note: either inbound or [outbound connections](https://drachtio.org/docs#outbound-connections) may be used, depending on the configuration supplied.  In production, it is the intent to use outbound connections for easier centralization and clustering of application logic, while inbound connections are used for the automated test suite.
 
-##### rtpengine location
-```
-  "rtpengine": {
-    "host": "127.0.0.1",
-    "port": 22222
-  },
-```
-the `rtpengine` object specifies the location of the rtpengine, which will typically be running on the same server as drachtio.
-
-##### redis location
-```
-  "redis": {
-    "port": 6379,
-    "host": "127.0.0.1"
-  },
-```
-the `redis` object specifies the ip/dns and port that redis is listening on.
-
-##### application log level
-```
-  "logging": {
-    "level": "info"
-  }
-```
-##### transcoding options
-The transcoding options for rtpengine are found in the configuration file, however these should not need to be modified.
-```
-  "transcoding": {
-  "rtpCharacteristics" : {
-      "transport protocol": "RTP/AVP",
-      "DTLS": "off",
-      "SDES": "off",
-      "ICE": "remove",
-      "rtcp-mux": ["demux"]
-  },
-  "srtpCharacteristics": {
-      "transport-protocol": "UDP/TLS/RTP/SAVPF",
-      "ICE": "force",
-      "SDES": "off",
-      "flags": ["generate mid", "SDES-no"],
-      "rtcp-mux": ["require"]
-  } 
-}
-```
 #### Running the test suite
-To run the included test suite, you will need to have a mysql server installed on your laptop/server. You will need to set the MYSQL_ROOT_PASSWORD env variable to the mysql root password before running the tests.  The test suite creates a database named 'jambones_test' in your mysql server to run the tests against, and removes it when done.
+To run the included test suite, you will need to have docker installed on your laptop.
 ```
-MYSQL_ROOT_PASSWORD=foobar npm test
+npm test
 ```

app.js

@@ -26,6 +26,12 @@ const {performLcr, lookupAllTeamsFQDNs, lookupAccountBySipRealm} = require('@jam
   connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
 }, logger);
 srf.locals.dbHelpers = {performLcr, lookupAllTeamsFQDNs, lookupAccountBySipRealm};
+const {createHash, retrieveHash} = require('@jambonz/realtimedb-helpers')({
+  host: process.env.JAMBONES_REDIS_HOST || 'localhost',
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);
+srf.locals.realtimeDbHelpers = {createHash, retrieveHash};
+
 const {getRtpEngine} = require('@jambonz/rtpengine-utils')(process.env.JAMBONES_RTPENGINES.split(','), logger, {
   emitter: srf.locals.stats
 });

lib/call-session.js

@@ -2,9 +2,10 @@ const Emitter = require('events');
 const {makeRtpEngineOpts} = require('./utils');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {SipError} = require('drachtio-srf');
-const {parseUri} = require('drachtio-srf');
+const {parseUri, stringifyUri} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-outbound');
 
+const makeInviteInProgressKey = (callid) => `sbc-out-iip${callid}`;
 /**
  * this is to make sure the outgoing From has the number in the incoming From
  * and not the incoming PAI
@@ -48,6 +49,7 @@ class CallSession extends Emitter {
     }
     debug(`got engine: ${JSON.stringify(engine)}`);
     const {offer, answer, del} = engine;
+    const {createHash, retrieveHash} = this.srf.locals.realtimeDbHelpers;
     this.offer = offer;
     this.answer = answer;
     this.del = del;
@@ -55,6 +57,7 @@ class CallSession extends Emitter {
     this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, this.useWss || teams, teams);
     this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
     let proxy, uris;
+    const mapGateways = new Map();
 
     try {
       // determine where to send the call
@@ -66,14 +69,22 @@ class CallSession extends Emitter {
       };
 
       if (this.req.locals.registration) {
-        debug(`sending call to user ${JSON.stringify(this.req.locals.registration)}`);
+        debug(`sending call to registered user ${JSON.stringify(this.req.locals.registration)}`);
         const contact = this.req.locals.registration.contact;
+        let destUri = this.req.uri;
+        if (this.req.has('X-Override-To')) {
+          const dest = this.req.get('X-Override-To');
+          const uri = parseUri(contact);
+          uri.user = dest;
+          destUri = stringifyUri(uri);
+          this.logger.info(`overriding destination user with ${dest}, so final uri is ${destUri}`);
+        }
         if (contact.includes('transport=ws')) {
           uris = [contact];
         }
         else {
-          proxy = this.req.locals.registration.contact;
-          uris = [this.req.uri];
+          proxy = this.req.locals.registration.proxy;
+          uris = [destUri];
         }
       }
       else if (this.req.locals.target === 'forward') {
@@ -100,8 +111,12 @@ class CallSession extends Emitter {
           const routableNumber = this.req.calledNumber.startsWith('+') ?
             this.req.calledNumber.slice(1) :
             this.req.calledNumber;
-          uris = await this.performLcr(routableNumber);
-          if (!uris || uris.length === 0) throw new Error('no routes found');
+          //uris = await this.performLcr(routableNumber);
+          const gateways = await this.performLcr(routableNumber);
+          if (!gateways || gateways.length === 0) throw new Error('no routes found');
+          debug(`got gateways: ${JSON.stringify(gateways)}`);
+          gateways.forEach((gw) => mapGateways.set(gw.uri, gw.auth));
+          uris = gateways.map((gw) => gw.uri);
         } catch (err) {
           debug(err);
           this.logger.error(err, 'Error performing lcr');
@@ -114,9 +129,16 @@ class CallSession extends Emitter {
 
       // rtpengine 'offer'
       debug('sending offer command to rtpengine');
-      const response = await this.offer(this.rtpEngineOpts.offer, {sdp: this.req.body});
+      const opts = {
+        ...this.rtpEngineOpts.common,
+        ...this.rtpEngineOpts.uac.mediaOpts,
+        'from-tag': this.rtpEngineOpts.uas.tag,
+        direction:  ['private', 'public'],
+        sdp: this.req.body
+      };
+      const response = await this.offer(opts);
       debug(`response from rtpengine to offer ${JSON.stringify(response)}`);
-      this.logger.debug({offer: this.rtpEngineOpts.offer, response}, 'initial offer to rtpengine');
+      this.logger.debug({offer: opts, response}, 'initial offer to rtpengine');
       if ('ok' !== response.result) {
         this.logger.error(`rtpengine offer failed with ${JSON.stringify(response)}`);
         throw new Error('rtpengine failed: answer');
@@ -125,22 +147,45 @@ class CallSession extends Emitter {
       // crank through the list of gateways until connected, exhausted or caller hangs up
       let earlyMedia = false;
       while (uris.length) {
+        const hdrs = { ...headers};
         const uri = uris.shift();
+        const auth = mapGateways.get(uri);
         const passFailure = 0 === uris.length;  // only a single target
+        if (0 === uris.length) {
+          try {
+            const key = makeInviteInProgressKey(this.req.get('Call-ID'));
+            const obj = await retrieveHash(key);
+            if (obj && obj.callId && obj.cseq) {
+              Object.assign(hdrs, {
+                'Call-ID': obj.callId,
+                'CSeq': `${obj.cseq} INVITE`
+              });
+            }
+          } catch (err) {
+            this.logger.info({err}, 'Error retrieving iip key');
+          }
+        }
         debug(`sending INVITE to ${uri} via ${proxy})`);
         this.logger.info(`sending INVITE to ${uri}`);
         try {
           const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
             proxy,
             passFailure,
-            proxyRequestHeaders: ['all', '-X-MS-Teams-FQDN', '-X-MS-Teams-Tenant-FQDN', '-Allow',
-              '-Session-Expires', 'Min-SE'],
-            proxyResponseHeaders: ['all', '-Allow'],
-            headers,
+            proxyRequestHeaders: ['all', '-X-MS-Teams-FQDN', '-X-MS-Teams-Tenant-FQDN', 'X-CID', '-Allow',
+              '-X-Account-Sid', '-Session-Expires', 'Min-SE'],
+            proxyResponseHeaders: ['all', '-Allow', '-Session-Expires'],
+            headers: hdrs,
+            auth,
             localSdpB: response.sdp,
             localSdpA: async(sdp, res) => {
-              this.toTag = res.getParsedHeader('To').params.tag;
-              const opts = Object.assign(this.rtpEngineOpts.answer, {sdp, 'to-tag': this.toTag});
+              this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
+              const opts = {
+                ...this.rtpEngineOpts.common,
+                ...this.rtpEngineOpts.uas.mediaOpts,
+                'from-tag': this.rtpEngineOpts.uas.tag,
+                'to-tag': this.rtpEngineOpts.uac.tag,
+                sdp
+              };
               const response = await this.answer(opts);
               this.logger.debug({answer: opts, response}, 'rtpengine answer');
               if ('ok' !== response.result) {
@@ -150,6 +195,18 @@ class CallSession extends Emitter {
               return response.sdp;
             }
           }, {
+            cbRequest: async(err, inv) => {
+              const opts = {
+                callId: inv.get('Call-ID'),
+                cseq: ++inv.getParsedHeader('CSeq').seq
+              };
+              try {
+                const key = makeInviteInProgressKey(this.req.get('Call-ID'));
+                await createHash(key, opts, 5);
+              } catch (err) {
+                this.logger.error({err}, 'Error saving Call-ID/CSeq');
+              }
+            },
             cbProvisional: (response) => {
               if (!earlyMedia && [180, 183].includes(response.status) && response.body) earlyMedia = true;
             }
@@ -210,8 +267,8 @@ class CallSession extends Emitter {
     });
 
     uas.on('modify', this._onReinvite.bind(this, uas));
+    uac.on('modify', this._onReinvite.bind(this, uac));
 
-    uac.on('modify', this._onNetworkReinvite.bind(this, uac));
     uas.on('refer', this._onFeatureServerTransfer.bind(this, uas));
 
 
@@ -221,13 +278,33 @@ class CallSession extends Emitter {
 
   async _onReinvite(dlg, req, res) {
     try {
-      let response = await this.offer(Object.assign(this.rtpEngineOpts.offer, {sdp: req.body}));
+      const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
+      const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
+      const offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
+      const answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
+      const direction =  dlg.type === 'uas' ? ['private', 'public'] : ['public', 'private'];
+      let opts = {
+        ...this.rtpEngineOpts.common,
+        ...offerMedia,
+        'from-tag': fromTag,
+        'to-tag': toTag,
+        direction,
+        sdp: req.body,
+      };
+
+      let response = await this.offer(opts);
       if ('ok' !== response.result) {
         res.send(488);
         throw new Error(`_onReinvite: rtpengine failed: offer: ${JSON.stringify(response)}`);
       }
       const sdp = await dlg.other.modify(response.sdp);
-      const opts = Object.assign(this.rtpEngineOpts.answer, {sdp, 'to-tag': res.getParsedHeader('To').params.tag});
+      opts = {
+        ...this.rtpEngineOpts.common,
+        ...answerMedia,
+        'from-tag': fromTag,
+        'to-tag': toTag,
+        sdp
+      };
       response = await this.answer(opts);
       if ('ok' !== response.result) {
         res.send(488);
@@ -239,32 +316,6 @@ class CallSession extends Emitter {
     }
   }
 
-  async _onNetworkReinvite(dlg, req, res) {
-    try {
-      const newAnswerOpts = Object.assign({}, this.rtpEngineOpts.answer, {sdp: req.body});
-      let response = await this.answer(newAnswerOpts);
-      this.logger.debug({answer: newAnswerOpts, response}, '_onNetworkReinvite: answer to rtpengine');
-      if ('ok' !== response.result) {
-        res.send(488);
-        throw new Error(`_onReinvite: rtpengine failed: offer: ${JSON.stringify(response)}`);
-      }
-
-      // reinvite feature server
-      const sdp = await dlg.other.modify(response.sdp);
-
-      const newOfferOpts = Object.assign({}, this.rtpEngineOpts.offer, {sdp, 'to-tag': this.toTag});
-      response = await this.offer(newOfferOpts);
-      this.logger.debug({answer: newOfferOpts, response}, '_onNetworkReinvite: offer to rtpengine');
-      if ('ok' !== response.result) {
-        res.send(488);
-        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
-      }
-      res.send(200, {body: response.sdp});
-    } catch (err) {
-      this.logger.error(err, 'Error handling reinvite');
-    }
-  }
-
   async _onFeatureServerTransfer(dlg, req, res) {
     try {
       const referTo = req.getParsedHeader('Refer-To');

lib/middleware.js

@@ -59,11 +59,11 @@ function route(opts) {
         // other sbc => proxy the call there
         logger.info({details: reg}, `sending call to registered user ${aor}`);
         if (req.server.hostport !== reg.sbcAddress) {
-          //proxy
-          const proxyAddress = selectHostPort(reg.sbcAddress, 'udp');
-          logger.info(`proxying call to SBC at ${proxyAddress}`);
-          req.proxy(`sip:${proxyAddress[1]}`);
-          return;
+          /* redirect to the correct SBC where this user is connected */
+          const proxyAddress = selectHostPort(reg.sbcAddress, 'tcp');
+          const redirectUri =  `<sip:${proxyAddress[1]}>`;
+          logger.info(`redirecting call to SBC at ${redirectUri}`);
+          return res.send(302, {headers: {Contact: redirectUri}});
         }
         req.locals.registration = reg;
         req.locals.target = 'user';
@@ -73,7 +73,7 @@ function route(opts) {
         // if the sip domain is one of ours return 404
         const account = await lookupAccountBySipRealm(uri.host);
         if (account) {
-          logger.info(`returning 404 to unregistered user in valid domain: ${req.uri}`);
+          logger.info({host: uri.host, account}, `returning 404 to unregistered user in valid domain: ${req.uri}`);
           res.send(404);
           return;
         }

lib/utils.js

@@ -5,18 +5,22 @@ const debug = require('debug')('jambonz:sbc-outbound');
 function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   const from = req.getParsedHeader('from');
   const srtpOpts = teams ? srtpCharacteristics['teams'] : srtpCharacteristics['default'];
-  const common = {'call-id': req.get('Call-ID'), 'from-tag': from.params.tag};
+  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+  const srctOpts = srcIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+  const common = {
+    'call-id': req.get('Call-ID'),
+    'replace': ['origin', 'session-connection']
+  };
   return {
     common,
-    offer: Object.assign(
-      {'sdp': req.body, 'replace': ['origin', 'session-connection']},
-      {'direction': [ 'private', 'public']},
-      common,
-      dstIsUsingSrtp ? srtpOpts : rtpCharacteristics),
-    answer: Object.assign(
-      {'replace': ['origin', 'session-connection']},
-      common,
-      srcIsUsingSrtp ? srtpOpts : rtpCharacteristics)
+    uas: {
+      tag: from.params.tag,
+      mediaOpts: srctOpts
+    },
+    uac: {
+      tag: null,
+      mediaOpts: dstOpts
+    }
   };
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-outbound",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "main": "app.js",
   "engines": {
     "node": ">= 8.10.0"
@@ -22,27 +22,26 @@
   "description": "jambonz session border controller application for outbound calls",
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_MYSQL_HOST=localhost JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ | ./node_modules/.bin/tap-spec",
+    "test": "NODE_ENV=test JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ | ./node_modules/.bin/tap-spec",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.4.2",
-    "@jambonz/rtpengine-utils": "^0.1.7",
-    "@jambonz/stats-collector": "0.0.4",
-    "debug": "^4.1.1",
+    "@jambonz/db-helpers": "^0.5.10",
+    "@jambonz/realtimedb-helpers": "^0.2.22",
+    "@jambonz/rtpengine-utils": "^0.1.8",
+    "@jambonz/stats-collector": "^0.1.5",
+    "debug": "^4.3.1",
     "drachtio-fn-b2b-sugar": "^0.0.12",
-    "drachtio-srf": "^4.4.37",
+    "drachtio-srf": "^4.4.46",
     "jambonz-mw-registrar": "^0.1.3",
-    "pino": "^6.5.1",
-    "rtpengine-client": "^0.1.1"
+    "pino": "^6.11.0"
   },
   "devDependencies": {
     "blue-tape": "^1.0.0",
-    "eslint": "^7.7.0",
+    "eslint": "^7.18.0",
     "eslint-plugin-promise": "^4.2.1",
     "nyc": "^15.1.0",
-    "tap-dot": "^2.0.0",
     "tap-spec": "^5.0.0"
   }
 }

test/create-test-db.js

@@ -1,10 +1,10 @@
 const test = require('blue-tape');
 //const test = require('tape').test ;
 const exec = require('child_process').exec ;
-const pwd = process.env.TRAVIS ? '' : '-p$MYSQL_ROOT_PASSWORD';
+const pwd = '-p$MYSQL_ROOT_PASSWORD';
 
 test('creating jambones_test database', (t) => {
-  exec(`mysql -h localhost -u root ${pwd} < ${__dirname}/db/create_test_db.sql`, (err, stdout, stderr) => {
+  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp < ${__dirname}/db/create_test_db.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('database successfully created');
     t.end();
@@ -12,7 +12,7 @@ test('creating jambones_test database', (t) => {
 });
 
 test('creating schema', (t) => {
-  exec(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/jambones-sql.sql`, (err, stdout, stderr) => {
+  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('schema successfully created');
     t.end();
@@ -20,7 +20,7 @@ test('creating schema', (t) => {
 });
 
 test('populating test case data', (t) => {
-  exec(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/populate-test-data.sql`, (err, stdout, stderr) => {
+  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('test data set created');
     t.end();

test/db/create_test_db.sql

@@ -1,3 +1,3 @@
 create database jambones_test;
-create user jambones_test@localhost IDENTIFIED WITH mysql_native_password by 'jambones_test';
-grant all on jambones_test.* to jambones_test@localhost;
+create user jambones_test@'%' IDENTIFIED WITH mysql_native_password by 'jambones_test';
+grant all on jambones_test.* to jambones_test@'%';

test/db/jambones-sql.sql

@@ -55,8 +55,8 @@ api_key_sid CHAR(36) NOT NULL UNIQUE ,
 token CHAR(36) NOT NULL UNIQUE ,
 account_sid CHAR(36),
 service_provider_sid CHAR(36),
-expires_at TIMESTAMP NULL,
-last_used TIMESTAMP NULL,
+expires_at TIMESTAMP NULL  DEFAULT NULL,
+last_used TIMESTAMP NULL  DEFAULT NULL,
 created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (api_key_sid)
 ) ENGINE=InnoDB COMMENT='An authorization token that is used to access the REST api';
@@ -98,6 +98,10 @@ description VARCHAR(255),
 account_sid CHAR(36) COMMENT 'if provided, indicates this entity represents a customer PBX that is associated with a specific account',
 application_sid CHAR(36) COMMENT 'If provided, all incoming calls from this source will be routed to the associated application',
 e164_leading_plus BOOLEAN NOT NULL DEFAULT false,
+requires_register BOOLEAN NOT NULL DEFAULT false,
+register_username VARCHAR(64),
+register_sip_realm VARCHAR(64),
+register_password VARCHAR(64),
 PRIMARY KEY (voip_carrier_sid)
 ) ENGINE=InnoDB COMMENT='A Carrier or customer PBX that can send or receive calls';
 
@@ -148,8 +152,9 @@ CREATE TABLE applications
 application_sid CHAR(36) NOT NULL UNIQUE ,
 name VARCHAR(64) NOT NULL,
 account_sid CHAR(36) NOT NULL COMMENT 'account that this application belongs to',
-call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls to phone numbers owned by this account',
+call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
+messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
@@ -242,6 +247,8 @@ ALTER TABLE applications ADD FOREIGN KEY call_hook_sid_idxfk (call_hook_sid) REF
 
 ALTER TABLE applications ADD FOREIGN KEY call_status_hook_sid_idxfk (call_status_hook_sid) REFERENCES webhooks (webhook_sid);
 
+ALTER TABLE applications ADD FOREIGN KEY messaging_hook_sid_idxfk (messaging_hook_sid) REFERENCES webhooks (webhook_sid);
+
 CREATE INDEX service_provider_sid_idx ON service_providers (service_provider_sid);
 CREATE INDEX name_idx ON service_providers (name);
 CREATE INDEX root_domain_idx ON service_providers (root_domain);

test/db/populate-test-data4.sql

@@ -6,6 +6,7 @@ insert into accounts(account_sid, service_provider_sid, name, sip_realm, registr
 values ('ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'test account', 'sip.example.com', '90dda62e-0ea2-47d1-8164-5bd49003476c');
 
 -- one carrier, uas script expecting a reinvite
-insert into voip_carriers (voip_carrier_sid, name) values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco');
+insert into voip_carriers (voip_carrier_sid, name, e164_leading_plus, requires_register, register_username, register_sip_realm, register_password) 
+values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 0, 1, 'foo', 'jambonz.org', 'bar');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('124a5339-c62c-4075-9e19-f4de70a96597', '287c1452-620d-4195-9f19-c9814ef90d78', '172.39.0.23', true, true);

test/docker-compose-testbed.yaml

@@ -8,6 +8,20 @@ networks:
         - subnet: 172.39.0.0/16
 
 services:
+  mysql:
+    image: mysql:5.7
+    ports:
+      - "3306:3306"
+    environment: 
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--protocol", "tcp"]
+      timeout: 5s
+      retries: 10    
+    networks:
+      sbc-outbound:
+        ipv4_address: 172.39.0.2
+
   sbc:
     image: drachtio/drachtio-server:latest
     command: drachtio --contact "sip:*;transport=udp" --loglevel debug --sofia-loglevel 9
@@ -16,6 +30,9 @@ services:
     networks:
       sbc-outbound:
         ipv4_address: 172.39.0.10
+    depends_on:
+      mysql:
+        condition: service_healthy
 
   redis:
     image: redis:5-alpine
@@ -89,3 +106,13 @@ services:
     networks:
       sbc-outbound:
         ipv4_address: 172.39.0.23
+
+  sip-uri-auth:
+    image: drachtio/sipp:latest
+    command: sipp -sf /tmp/uas-auth.xml
+    volumes:
+      - ./scenarios:/tmp
+    tty: true
+    networks:
+      sbc-outbound:
+        ipv4_address: 172.39.0.24

test/docker_start.js

@@ -5,7 +5,7 @@ const exec = require('child_process').exec ;
 test('starting docker network..', (t) => {
   exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err, stdout, stderr) => {
     t.pass('docker started');
-    t.end(err);
+    t.end(err);  
   });
 });
 

test/docker_stop.js

@@ -2,16 +2,6 @@ const test = require('blue-tape');
 //const test = require('tape').test ;
 const exec = require('child_process').exec ;
 
-/*
-test('docker logs', (t) => {
-  exec('docker logs test_sbc_1', (err, stdout, stderr) => {
-    console.log(stdout);
-    console.log(stderr);
-    t.end();
-  });
-});
-*/
-
 test('stopping docker network..', (t) => {
   t.timeoutAfter(10000);
   exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml down`, (err, stdout, stderr) => {

test/index.js

@@ -1,5 +1,4 @@
 require('./docker_start');
 require('./create-test-db');
 require('./sip-tests');
-require('./remove-test-db');
 require('./docker_stop');

test/remove-test-db.js

@@ -1,11 +0,0 @@
-const test = require('blue-tape') ;
-const exec = require('child_process').exec ;
-const pwd = process.env.TRAVIS ? '' : '-p$MYSQL_ROOT_PASSWORD';
-
-test('dropping jambones_test database', (t) => {
-  exec(`mysql -h localhost -u root ${pwd} < ${__dirname}/db/remove_test_db.sql`, (err, stdout, stderr) => {
-    if (err) return t.end(err);
-    t.pass('database successfully dropped');
-    t.end();
-  });
-});

test/scenarios/uac-sip-uri-auth-success.xml

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
+<!--                                                                    -->
+
+<scenario name="UAC with media">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:john@172.39.0.24 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:john@172.39.0.24>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-sip-uri-auth-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+</recv>
+
+  <recv response="401" auth="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      ACK sip:sip:john@172.39.0.24 SIP/2.0
+      [last_Via:]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:sip:john@jambonz.org>[peer_tag_param]
+      [last_Call-ID:]
+      CSeq: 1 ACK
+      Subject: uac-sip-uri-auth-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:john@172.39.0.24 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]xx
+      To: <sip:john@172.39.0.24>
+      [last_Call-ID:]
+      CSeq: 2 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      [authentication username=foo password=bar]
+      Max-Forwards: 70
+      Subject: uac-sip-uri-auth-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="200">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:john@172.39.0.24 SIP/2.0
+      [last_Via:]
+      [last_From:]
+      To: <sip:sip:john@jambonz.org>[peer_tag_param]
+      [last_Call-ID:]
+      CSeq: 2 ACK
+      Subject: uac-sip-uri-auth-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="2000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:john@172.39.0.24 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      CSeq: 3 BYE
+      Max-Forwards: 70
+      Subject: uac-sip-uri-auth-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- 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>

test/scenarios/uas-auth.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uas' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic UAS responder">
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 401 Unauthorized
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      WWW-Authenticate: Digest realm="jambonz.org", nonce="4cdbb733645816512687270b83d2ae5d11e4d9d8"
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <recv request="INVITE" crlf="true">
+   <action>
+      <verifyauth assign_to="authvalid" username="foo" password="bar" />
+    </action>
+  </recv>
+  <nop hide="true" test="authvalid" next="goodauth" />
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 403 Forbidden
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>;expires=60
+      Content-Type: application/sdp
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK" next="endit"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <label id="goodauth"/>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      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"
+        optional="true"
+        rtd="true"
+        crlf="true">
+  </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>
+
+  <label id="endit"/>
+
+  <!-- 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>
+

test/scenarios/uas-reinvite.xml

@@ -2,14 +2,60 @@
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
 <scenario name="Basic UAS responder">
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 401 Unauthorized
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      WWW-Authenticate: Digest realm="jambonz.org", nonce="4cdbb733645816512687270b83d2ae5d11e4d9d8"
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+  </recv>
+  
+  
   <recv request="INVITE" crlf="true">
     <action>
       <ereg regexp=".*" search_in="hdr" header="Subject:" assign_to="1" />
+      <verifyauth assign_to="authvalid" username="foo" password="bar" />
     </action>
   </recv>
+  <nop hide="true" test="authvalid" next="goodauth" />
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 403 Forbidden
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>;expires=60
+      Content-Type: application/sdp
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK" next="endit"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <label id="goodauth"/>
 
   <send>
     <![CDATA[
@@ -93,7 +139,7 @@
   <recv request="BYE">
   </recv>
 
-  <send next="2">
+  <send>
     <![CDATA[
 
       SIP/2.0 200 OK
@@ -108,23 +154,7 @@
     ]]>
   </send>
 
-  <label id="1"/>
-  <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>
-
-<label id="2"/>
+<label id="endit"/>
 
 </scenario>
 

test/sip-tests.js

@@ -1,8 +1,8 @@
 const test = require('blue-tape');
 const { output, sippUac } = require('./sipp')('test_sbc-outbound');
 const {execSync} = require('child_process');
-const pwd = process.env.TRAVIS ? '' : '-p$MYSQL_ROOT_PASSWORD';
 const debug = require('debug')('jambonz:sbc-outbound');
+const pwd = '-p$MYSQL_ROOT_PASSWORD';
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -23,6 +23,7 @@ test('sbc-outbound tests', async(t) => {
     await connect(srf);
   
     /* call to unregistered user */
+    debug('successfully connected to drachtio server');
     await sippUac('uac-pcap-device-404.xml');
     t.pass('return 404 to outbound attempt to unregistered user/device');
 
@@ -31,29 +32,33 @@ test('sbc-outbound tests', async(t) => {
     t.pass('successfully completed outbound call to configured sip trunk');
 
     // re-rack test data
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/populate-test-data2.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data2.sql`);
 
     /* call to PSTN with lcr configured */
     await sippUac('uac-pcap-carrier-success.xml');
     t.pass('successfully completed outbound lcr carrier with crankback after failure');
 
     // re-rack test data
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/populate-test-data3.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data3.sql`);
 
     /* call to PSTN where caller hangs up during outdial */
     await sippUac('uac-cancel.xml');
     t.pass('successfully handled caller hangup during lcr outdial');
 
     // re-rack test data
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
-    execSync(`mysql -h localhost -u root ${pwd} -D jambones_test < ${__dirname}/db/populate-test-data4.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
+    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data4.sql`);
 
     /* reinvite after call established */
     await sippUac('uac-pcap-carrier-success-reinvite.xml');
     t.pass('successfully handled reinvite during lcr outdial');
 
+    /* invite to sipUri that challenges */
+    await sippUac('uac-sip-uri-auth-success.xml');
+    t.pass('successfully connected to sip uri that requires auth');
+    
     srf.disconnect();
   } catch (err) {
     console.error(err);

test/sipp.js

@@ -1,5 +1,5 @@
 const { spawn } = require('child_process');
-const debug = require('debug')('test:sipp');
+const debug = require('debug')('jambonz:ci');
 let network;
 const obj = {};
 let output = '';
@@ -28,7 +28,7 @@ obj.sippUac = (file, opts) => {
   opts = opts || {};
   const cmd = 'docker';
   let args = [
-    'run', '-ti', '--rm', '--net', `${network}`
+    'run', '--rm', '--net', `${network}`
   ]
   .concat(opts.ip ? ['--ip', opts.ip] : [])
   .concat([
@@ -46,7 +46,7 @@ obj.sippUac = (file, opts) => {
     'sbc'
   ]);
 
-  //console.log(`args: ${args}`);
+  debug(`args: ${args}`);
   clearOutput();
 
   return new Promise((resolve, reject) => {
@@ -67,8 +67,8 @@ obj.sippUac = (file, opts) => {
       debug(`stdout: ${data}`);
       addOutput(data.toString());
     });
-    child_process.stdout.on('data', (data) => {
-      debug(`stdout: ${data}`);
+    child_process.stderr.on('data', (data) => {
+      debug(`stderr: ${data}`);
       addOutput(data.toString());
     });
   });