update version

update db-helpers
Updated drachtio version to 5.0.5 (#177 )
2026-10-04 18:44:38 +00:00 · 2025-05-14 15:42:31 -04:00 · 2025-05-13 10:36:08 -04:00 · 2025-04-22 11:05:45 -04:00 · 2025-04-18 07:50:21 -04:00 · 2025-04-14 08:22:09 -04:00
5 changed files with 72 additions and 30 deletions
@@ -7,7 +7,8 @@ const {
  isPrivateVoipNetwork,
  isBlackListedSipGateway,
  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  makePartnerFullMediaReleaseKey,
+  isValidDomainOrIP
 } = require('./utils');
 const { MediaPath } = require('./constants.json');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
@@ -342,6 +343,14 @@ class CallSession extends Emitter {
                proxy = u;
                u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${vc.register_sip_realm};transport=${transport}`;
                this.logger.debug({uri: u}, `using outbound proxy for this registered trunk: ${proxy}`);
+              } else if (vc.outbound_sip_proxy && vc.outbound_sip_proxy.length > 0) {
+                if (vc.outbound_sip_proxy.includes('sip:') || vc.outbound_sip_proxy.includes('sips:')) {
+                  proxy = vc.outbound_sip_proxy;
+                } else if (isValidDomainOrIP(vc.outbound_sip_proxy)) {
+                  proxy =
+                    `${scheme}:${prefix}${prependPlus}${calledNumber}@${vc.outbound_sip_proxy};transport=${transport}`;
+                  this.logger.debug({uri: u}, `using outbound proxy for this trunk: ${proxy}`);
+                }
              }
              mapGateways.set(u, obj);
              uris.push(u);
@@ -1009,7 +1018,8 @@ Duration=${payload.duration} `
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
              unsubscribe: this.unsubscribe,
-              headers
+              headers,
+              isSipRecCall: Array.isArray(this.req.payload) && this.req.payload.length > 1
            }));
            try {
              this._startRecordingNoAnswerTimer(res);
@@ -1163,7 +1173,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, contact: _contact,
        ...customHeaders
      } = req.headers;

@@ -1183,6 +1193,7 @@ Duration=${payload.duration} `
          headers: {
            'Refer-To': `<${stringifyUri(uri)}>`,
            'Referred-By': referredby,
+            'Contact': this.contactHeader,
            ...customHeaders
          }
        });
@@ -174,6 +174,11 @@ module.exports = (srf, logger, redisClient) => {
          });
          return req.srf.endSession(req);
        }
+        if (!account_limit && !sp_limit && process.env.JAMBONES_HOSTING) {
+          logger.info(`checkLimits: no active subscription found for account ${account_sid}, rejecting call`);
+          res.send(503, 'No Active Subscription');
+          return req.srf.endSession(req);
+        }
        if (process.env.JAMBONES_TRACK_SP_CALLS && sp_limit > 0 && callsSP > sp_limit) {
          logger.info({callsSP, sp_limit}, 'checkLimits: service provider limits exceeded');
          writeAlerts({
@@ -255,9 +260,22 @@ module.exports = (srf, logger, redisClient) => {
    else if ('sip' === desiredRouting) {
      // call that needs to be forwarded to a sip endpoint
      logger.info(`forwarding call to sip endpoint ${req.uri}`);
+
+      // check if the domain is one of ours
+      if (process.env.JAMBONES_LOCAL_SIP_DOMAINS) {
+        const allowedDomains = process.env.JAMBONES_LOCAL_SIP_DOMAINS.split(',');
+        const domain = uri.host;
+        const isLoop = allowedDomains.some((allowed) =>
+          domain === allowed.trim() || domain.endsWith(`.${allowed.trim()}`)
+        );
+        if (isLoop) {
+          logger.info({ host: domain }, `returning 482 Loop Detected for attempt to send to: ${req.uri}`);
+          res.send(482, 'Loop Detected');
+          return req.srf.endSession(req);
+        }
+      }
      req.locals.target = 'forward';
-    }
-    else if ('phone' === desiredRouting) {
+    }    else if ('phone' === desiredRouting) {
      debug('sending call to LCR');
      req.locals.target = 'lcr';
    }
@@ -323,6 +323,18 @@ const makePartnerFullMediaReleaseKey = (callId) => {
  return `a_sdp:${callId}`;
 };

+function isValidDomainOrIP(input) {
+  const domainRegex = /^(?!:\/\/)([a-zA-Z0-9.-]+)(:\d+)?$/;
+  // eslint-disable-next-line max-len
+  const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(:\d+)?$/;
+
+  if (domainRegex.test(input) || ipRegex.test(input)) {
+    return true;
+  }
+
+  return false; // Invalid input
+}
+
 module.exports = {
  makeRtpEngineOpts,
  selectHostPort,
@@ -336,5 +348,6 @@ module.exports = {
  isPrivateVoipNetwork,
  isBlackListedSipGateway,
  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  makePartnerFullMediaReleaseKey,
+  isValidDomainOrIP
 };
@@ -1,26 +1,26 @@
 {
  "name": "sbc-outbound",
-  "version": "0.9.3",
+  "version": "0.9.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "sbc-outbound",
-      "version": "0.9.3",
+      "version": "0.9.4",
      "license": "MIT",
      "dependencies": {
-        "@jambonz/db-helpers": "^0.9.7",
+        "@jambonz/db-helpers": "^0.9.12",
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/mw-registrar": "0.2.7",
-        "@jambonz/realtimedb-helpers": "^0.8.9",
+        "@jambonz/realtimedb-helpers": "^0.8.13",
        "@jambonz/rtpengine-utils": "^0.4.4",
-        "@jambonz/siprec-client-utils": "^0.2.9",
+        "@jambonz/siprec-client-utils": "^0.2.10",
        "@jambonz/stats-collector": "^0.1.10",
        "@jambonz/time-series": "^0.2.10",
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
        "drachtio-fn-b2b-sugar": "^0.2.1",
-        "drachtio-srf": "^5.0.1",
+        "drachtio-srf": "^5.0.5",
        "express": "^4.19.2",
        "pino": "^8.20.0",
        "sdp-transform": "^2.15.0"
@@ -578,9 +578,9 @@
      }
    },
    "node_modules/@jambonz/db-helpers": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.7.tgz",
-      "integrity": "sha512-5qN/CJZJXpbMkMn+8gFn8PpQ0ZImZxp1EjKyxLUlmMn+xgjeNb29c3pjeVt/6EQnBB65jAax6TNsVzVIfpvE2w==",
+      "version": "0.9.12",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.12.tgz",
+      "integrity": "sha512-cmUuh6G2yqsPZxx0v0iKq0puCaWPz6RGaHvMxBZlolEfLHxTcHshgm+Y/L7J3/4bEKaovzP4z7TXh/pab7mZig==",
      "dependencies": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
@@ -609,9 +609,9 @@
      }
    },
    "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.9.tgz",
-      "integrity": "sha512-+kVH+dgL6ZIaPDxZM9pwHGGZSYRrAZPvIMqNYd4dLrpduKxpYmdEG3ShfmFgXBZOQJq/Ysz5a75vrYCjtyBkyQ==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.13.tgz",
+      "integrity": "sha512-/7c8kCu/dMSk8CWTYdEv4xU/7+vmVL30VCjtHPRAXVBRIVejAPDf1xK5n0rXwG8Fda1Oa+0TFsymkiRpew8P6w==",
      "dependencies": {
        "debug": "^4.3.4",
        "ioredis": "^5.3.2"
@@ -628,9 +628,9 @@
      }
    },
    "node_modules/@jambonz/siprec-client-utils": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.9.tgz",
-      "integrity": "sha512-C/1UOrAvQVG0iwiSMS0MC9VHRjhg3/sOjNna+eEjHjws1SHl8NrKBoDL8uOwLqOM2ccpbqCPH9GJAxo5OnOhww==",
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.10.tgz",
+      "integrity": "sha512-Ns7rWK6cXVCr/1IoqPuVg9UKVRZNcs5EMvnhuoPhRD6L0HzLnfB0/BAq29bkHj0sr0bu0dp3hD5B+BnOcJuhaQ==",
      "license": "MIT",
      "dependencies": {
        "sdp-transform": "^2.14.1",
@@ -1589,9 +1589,9 @@
      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
    },
    "node_modules/drachtio-srf": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.1.tgz",
-      "integrity": "sha512-HMPn+xLm2TCYY6cJoRpTlhCRakyKgPD93lM1gg6nNIlO9gPSKlUjX3mxL4iaFKuh+UFMMTAoB26fj892A6Lr4Q==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.5.tgz",
+      "integrity": "sha512-dKdOf+zonTvk1eVu0IVc4a/Hdah2KspXngAeLQ3NZHdAkjQCJjYQZubVP6ho2QT1pzu8wA3U4M/atL1O99Ujzw==",
      "dependencies": {
        "debug": "^3.2.7",
        "delegates": "^0.1.0",
@@ -1605,7 +1605,7 @@
        "uuid-random": "^1.3.2"
      },
      "engines": {
-        "node": ">= 10.x"
+        "node": ">= 18.x"
      }
    },
    "node_modules/drachtio-srf/node_modules/debug": {
@@ -1,6 +1,6 @@
 {
  "name": "sbc-outbound",
-  "version": "0.9.3",
+  "version": "0.9.4",
  "main": "app.js",
  "engines": {
    "node": ">= 18.0.0"
@@ -27,18 +27,18 @@
    "jslint": "eslint app.js lib --fix"    
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.7",
-    "@jambonz/realtimedb-helpers": "^0.8.9",
+    "@jambonz/db-helpers": "^0.9.12",
+    "@jambonz/realtimedb-helpers": "^0.8.13",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "0.2.7",
    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.9",
+    "@jambonz/siprec-client-utils": "^0.2.10",
    "@jambonz/stats-collector": "^0.1.10",
    "@jambonz/time-series": "^0.2.10",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
    "drachtio-fn-b2b-sugar": "^0.2.1",
-    "drachtio-srf": "^5.0.1",
+    "drachtio-srf": "^5.0.5",
    "express": "^4.19.2",
    "pino": "^8.20.0",
    "sdp-transform": "^2.15.0"
Author	SHA1	Message	Date
Dave Horton	1a9c438321	update version	2025-05-14 15:42:31 -04:00
Dave Horton	fb62fd9bf4	update db-helpers	2025-05-13 10:36:08 -04:00
rammohan-y	e02e0fa8c1	Updated drachtio version to 5.0.5 (#177 ) https://github.com/drachtio/drachtio-server/issues/424	2025-04-22 11:05:45 -04:00
Hoan Luu Huu	dd198105e3	update drachtio srf 5.0.4 (#176 )	2025-04-18 07:50:21 -04:00
rammohan-y	a34491a356	Updated db-helper to 0.9.11 (#175 ) https://github.com/jambonz/jambonz-feature-server/issues/1151	2025-04-14 08:22:09 -04:00
Dave Horton	3a467921a6	return 482 loop detected if call to a sip uri would loop back to us (#173 ) * return 482 loop detected if call to a sip uri would loop back to us * this pr fixes #172 * typo * wip * wip	2025-03-20 11:25:08 -04:00
rammohan-y	9cb75a0b6b	updated realtimedb-helper to 0.8.13 (#169 )	2025-03-10 09:53:49 -04:00
Dave Horton	28dae50202	REFER should have sips contact if far end is using sips (#168 )	2025-02-24 09:47:47 -05:00
Dave Horton	0b45e766b9	update drachtio-srf	2025-02-20 10:16:59 -05:00
Dave Horton	7380457b5a	reject calls on hosted jambonz with no activ (#166 ) e subscriptions	2025-02-19 13:04:44 -05:00
Hoan Luu Huu	9feb6f3c8f	support voip carrier sip proxy (#165 ) * support voiip carrier sip proxy * wip * wip * wip	2025-02-17 09:47:59 -05:00
Hoan Luu Huu	c449feeb9c	support sip recording from siprec call (#164 ) * support sip recording from siprec call * update srsclient version	2025-02-12 09:24:33 -05:00