allow SDES in sip/tls scenarios

.github/workflows/docker-publish.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/npm-ci.yml

@@ -1,13 +1,15 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: 18.x
       - run: npm ci

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.14.0-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.12.1-alpine3.16 as base
 
 RUN apk --update --no-cache add --virtual .builds-deps build-base python3
 

app.js

@@ -28,7 +28,6 @@ const {
   commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
 });
 const StatsCollector = require('@jambonz/stats-collector');
-const CIDRMatcher = require('cidr-matcher');
 const stats = new StatsCollector(logger);
 const {equalsIgnoreOrder, createHealthCheckApp, systemHealth} = require('./lib/utils');
 const {LifeCycleEvents} = require('./lib/constants');
@@ -130,6 +129,7 @@ const {
 const CallSession = require('./lib/call-session');
 
 if (process.env.DRACHTIO_HOST && !process.env.K8S) {
+  const CIDRMatcher = require('cidr-matcher');
   const cidrs = process.env.JAMBONES_NETWORK_CIDR
     .split(',')
     .map((s) => s.trim());
@@ -164,23 +164,6 @@ else {
     logger.info(`listening in outbound mode on port ${process.env.DRACHTIO_PORT}`);
   });
   srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
-  srf.on('connect', (err, hp) => {
-    if (err) return this.logger.error({err}, 'Error connecting to drachtio server');
-    logger.info(`connected to drachtio listening on ${hp}`);
-
-    if (process.env.K8S_FEATURE_SERVER_TRANSPORT === 'tcp') {
-      const matcher = new CIDRMatcher(['192.168.0.0/24', '172.16.0.0/16', '10.0.0.0/8']);
-      const hostports = hp.split(',');
-      for (const hp of hostports) {
-        const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
-        if (arr && matcher.contains(arr[2])) {
-          const hostport = `${arr[2]}:${arr[3]}`;
-          logger.info(`using sbc private address when sending to feature-server: ${hostport}`);
-          srf.locals.privateSipAddress = hostport;
-        }
-      }
-    }
-  });
 }
 if (process.env.NODE_ENV === 'test') {
   srf.on('error', (err) => {
@@ -252,6 +235,7 @@ if ('test' !== process.env.NODE_ENV) {
 }
 
 const lookupRtpServiceEndpoints = (lookup, serviceName) => {
+  logger.debug(`dns lookup for ${serviceName}..`);
   lookup(serviceName, {family: 4, all: true}, (err, addresses) => {
     if (err) {
       logger.error({err}, `Error looking up ${serviceName}`);
@@ -321,18 +305,8 @@ process.on('SIGUSR2', handle.bind(null, removeFromSet, setName));
 process.on('SIGTERM', handle.bind(null, removeFromSet, setName));
 
 function handle(removeFromSet, setName, signal) {
-  logger.info(`got signal ${signal}`);
-  if (srf.locals.privateSipAddress && setName) {
-    logger.info(`removing ${srf.locals.privateSipAddress} from set ${setName}`);
-    removeFromSet(setName, srf.locals.privateSipAddress);
-  }
-  if (process.env.K8S) {
-    lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
-    if (0 === activeCallIds.size) {
-      logger.info('exiting immediately since we have no calls in progress');
-      process.exit(0);
-    }
-  }
+  logger.info(`got signal ${signal}, removing ${srf.locals.privateSipAddress} from set ${setName}`);
+  removeFromSet(setName, srf.locals.privateSipAddress);
 }
 
 module.exports = {srf, logger};

data/srtp-transcoding.json

@@ -9,8 +9,7 @@
   "teams": {
     "transport-protocol": "RTP/SAVP",
     "ICE": "default",
-    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
+    "flags": ["generate mid", "media handover", "port latching"],
     "rtcp-mux": ["accept"]
   }
 }

lib/autoscale-manager.js

@@ -57,9 +57,6 @@ module.exports = (logger) => {
       }
     })();
   }
-  else if (process.env.K8S) {
-    lifecycleEmitter.scaleIn = () => process.exit(0);
-  }
 
   return {lifecycleEmitter};
 };

lib/call-session.js

@@ -3,7 +3,7 @@ const SrsClient = require('@jambonz/siprec-client-utils');
 const {
   makeRtpEngineOpts,
   SdpWantsSrtp,
-  SdpWantsSDES,
+  SdpDoesNotWantDTLS,
   nudgeCallCounts,
   roundTripTime,
   parseConnectionIp
@@ -85,6 +85,10 @@ class CallSession extends Emitter {
     return this.req.has('X-Five9-StreamingPairId');
   }
 
+  get isPossibleWebRtcClient() {
+    return this.req.locals.isPossibleWebRtcClient;
+  }
+
   subscribeForDTMF(dlg) {
     if (!this._subscribedForDTMF) {
       this._subscribedForDTMF = true;
@@ -149,8 +153,8 @@ class CallSession extends Emitter {
     this.logger.debug(`using feature server ${featureServer}`);
 
     const wantsSrtp = this.req.locals.possibleWebRtcClient = SdpWantsSrtp(sdp);
-    const wantsSDES = SdpWantsSDES(sdp);
-    this.rtpEngineOpts = makeRtpEngineOpts(this.req, wantsSrtp, false, this.isFromMSTeams || wantsSDES);
+    const doesNotWantDTLS = wantsSrtp && SdpDoesNotWantDTLS(sdp);
+    this.rtpEngineOpts = makeRtpEngineOpts(this.req, wantsSrtp, false, this.isFromMSTeams || doesNotWantDTLS);
     this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
     const obj = parseUri(this.req.uri);
     let proxy, host, uri;
@@ -260,7 +264,6 @@ class CallSession extends Emitter {
           };
           const startAt = process.hrtime();
           const response = await this.answer(opts);
-          this.logger.debug({response, opts}, 'response from rtpengine to answer');
           const rtt = roundTripTime(startAt);
           this.stats.histogram('app.rtpengine.response_time', rtt, [
             'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
@@ -308,7 +311,7 @@ class CallSession extends Emitter {
   _setDlgHandlers(dlg) {
     const {callId} = dlg.sip;
     this.activeCallIds.set(callId, this);
-    this.subscribeForDTMF(this.uac);
+    if (this.isPossibleWebRtcClient) this.subscribeForDTMF(dlg);
     dlg.on('destroy', () => {
       debug('call ended with normal termination');
       this.logger.info('call ended with normal termination');
@@ -331,11 +334,11 @@ class CallSession extends Emitter {
   _setHandlers({uas, uac}) {
     this.emit('connected');
     const callStart = Date.now();
-    const call_sid = uac.res?.get('X-Call-Sid');
-    const application_sid = this.application_sid || uac.res?.get('X-Application-Sid');
     const tags = ['accepted:yes', 'sipStatus:200', `originator:${this.req.locals.originator}`];
     this.stats.increment('sbc.terminations', tags);
     this.activeCallIds.set(this.req.get('Call-ID'), this);
+    const call_sid = uac.res?.get('X-Call-Sid');
+    const application_sid = this.application_sid || uac.res?.get('X-Application-Sid');
     if (this.req.locals.cdr) {
       this.req.locals.cdr = {
         ...this.req.locals.cdr,
@@ -413,7 +416,7 @@ class CallSession extends Emitter {
       });
     });
 
-    this.subscribeForDTMF(uac);
+    if (this.isPossibleWebRtcClient) this.subscribeForDTMF(uac);
 
     uas.on('modify', this._onReinvite.bind(this, uas));
     uac.on('modify', this._onReinvite.bind(this, uac));
@@ -540,7 +543,7 @@ Duration=${payload.duration} `
         req.body;
 
       const reason = req.get('X-Reason');
-      const isReleasingMedia = reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason);
+      const isReleasingMedia = reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(reason);
       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;
@@ -775,7 +778,7 @@ Duration=${payload.duration} `
         const u = parseUri(referredBy.uri);
         const leaveReferToAlone = req.has('X-Refer-To-Leave-Untouched');
         if (leaveReferToAlone) {
-          this.logger.debug({referTo}, 'passing Refer-To header through untouched');
+          this.logger.debug(`passing Refer-To header through untouched: ${referTo}`);
         }
         else {
           const isDotDecimal = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(uri.host);
@@ -804,7 +807,7 @@ Duration=${payload.duration} `
           // eslint-disable-next-line no-unused-vars
           'content-length':contentlength, 'refer-to':_referto, 'referred-by':_referredby,
           // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave,
+          'x-refer-to-leave-untouched': _leave,
           ...customHeaders
         } = req.headers;
 

lib/db-utils.js

@@ -100,7 +100,7 @@ module.exports = (srf, logger) => {
   };
 
   const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
+    const did = normalizeDID(req.calledNumber);
 
     try {
       /* straight DID match */
@@ -214,7 +214,7 @@ module.exports = (srf, logger) => {
       if (matches.length) {
         /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
         const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-        const did = normalizeDID(req.calledNumber) || 'anonymous';
+        const did = normalizeDID(req.calledNumber);
         const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
         logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
 
@@ -233,15 +233,13 @@ module.exports = (srf, logger) => {
             };
           }
           else if (accountLevelGateways.length === 1) {
-            const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
-              accountLevelGateways[0].account_sid);
             return {
               fromCarrier: true,
               gateway: accountLevelGateways[0],
               service_provider_sid: accountLevelGateways[0].service_provider_sid,
               account_sid: accountLevelGateways[0].account_sid,
               application_sid: accountLevelGateways[0].application_sid,
-              account: accounts[0]
+              account: accountLevelGateways[0]
             };
           }
           else {

lib/fs-tracking.js

@@ -15,9 +15,7 @@ module.exports = (srf, logger) => {
   return async() => {
     try {
       if (process.env.K8S) {
-        return process.env.K8S_FEATURE_SERVER_TRANSPORT ?
-          `${process.env.K8S_FEATURE_SERVER_SERVICE_NAME};transport=${process.env.K8S_FEATURE_SERVER_TRANSPORT}` :
-          process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
+        return process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
       }
       else {
         const fs = await retrieveSet(setName);

lib/utils.js

@@ -26,8 +26,7 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   }
   const common = {
     'call-id': req.get('Call-ID'),
-    'replace': ['origin', 'session-connection'],
-    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
+    'replace': ['origin', 'session-connection']
   };
   return {
     common,
@@ -42,7 +41,7 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   };
 }
 
-const SdpWantsSDES = (sdp) => {
+const SdpDoesNotWantDTLS = (sdp) => {
   return /m=audio.*\s+RTP\/SAVP/.test(sdp);
 };
 const SdpWantsSrtp = (sdp) => {
@@ -182,7 +181,7 @@ const parseConnectionIp = (sdp) => {
 module.exports = {
   isWSS,
   SdpWantsSrtp,
-  SdpWantsSDES,
+  SdpDoesNotWantDTLS,
   getAppserver,
   makeRtpEngineOpts,
   makeAccountCallCountKey,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "v0.8.0",
+  "version": "v0.7.7",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"
@@ -25,12 +25,12 @@
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.7.4",
+    "@jambonz/db-helpers": "^0.7.3",
     "@jambonz/http-authenticator": "^0.2.2",
     "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.6.3",
-    "@jambonz/rtpengine-utils": "^0.4.3",
-    "@jambonz/siprec-client-utils": "^0.2.4",
+    "@jambonz/realtimedb-helpers": "^0.5.7",
+    "@jambonz/rtpengine-utils": "^0.3.11",
+    "@jambonz/siprec-client-utils": "^0.1.4",
     "@jambonz/stats-collector": "^0.1.6",
     "@jambonz/time-series": "^0.2.5",
     "aws-sdk": "^2.1261.0",
@@ -38,9 +38,11 @@
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
     "drachtio-fn-b2b-sugar": "0.0.12",
-    "drachtio-srf": "^4.5.21",
+    "drachtio-srf": "^4.5.2",
     "express": "^4.18.1",
     "pino": "^7.11.0",
+    "sdp-transform": "^2.14.1",
+    "uuid": "^8.3.2",
     "verify-aws-sns-signature": "^0.1.0",
     "xml2js": "^0.4.23"
   },