From 4b3234f4e436dffc2c6622b06b85cc9ca228ced8 Mon Sep 17 00:00:00 2001 From: Hoan Luu Huu <110280845+xquanluu@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:59:01 +0700 Subject: [PATCH] feat disable direct p2p call by env variable (#514) * feat disable direct p2p call by env variable * wip * wip --- lib/config.js | 4 +++- lib/middleware.js | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/config.js b/lib/config.js index 5c84abdc..2436a256 100644 --- a/lib/config.js +++ b/lib/config.js @@ -151,6 +151,7 @@ const JAMBONZ_RECORD_WS_BASE_URL = process.env.JAMBONZ_RECORD_WS_BASE_URL || pro const JAMBONZ_RECORD_WS_USERNAME = process.env.JAMBONZ_RECORD_WS_USERNAME || process.env.JAMBONES_RECORD_WS_USERNAME; const JAMBONZ_RECORD_WS_PASSWORD = process.env.JAMBONZ_RECORD_WS_PASSWORD || process.env.JAMBONES_RECORD_WS_PASSWORD; const JAMBONZ_DISABLE_DIAL_PAI_HEADER = process.env.JAMBONZ_DISABLE_DIAL_PAI_HEADER || false; +const JAMBONES_DISABLE_DIRECT_P2P_CALL = process.env.JAMBONES_DISABLE_DIRECT_P2P_CALL || false; module.exports = { JAMBONES_MYSQL_HOST, @@ -233,5 +234,6 @@ module.exports = { JAMBONZ_RECORD_WS_BASE_URL, JAMBONZ_RECORD_WS_USERNAME, JAMBONZ_RECORD_WS_PASSWORD, - JAMBONZ_DISABLE_DIAL_PAI_HEADER + JAMBONZ_DISABLE_DIAL_PAI_HEADER, + JAMBONES_DISABLE_DIRECT_P2P_CALL }; diff --git a/lib/middleware.js b/lib/middleware.js index 61dc3d56..840239e2 100644 --- a/lib/middleware.js +++ b/lib/middleware.js @@ -11,7 +11,8 @@ const dbUtils = require('./utils/db-utils'); const RootSpan = require('./utils/call-tracer'); const listTaskNames = require('./utils/summarize-tasks'); const { - JAMBONES_MYSQL_REFRESH_TTL + JAMBONES_MYSQL_REFRESH_TTL, + JAMBONES_DISABLE_DIRECT_P2P_CALL } = require('./config'); const { createJambonzApp } = require('./dynamic-apps'); @@ -65,7 +66,7 @@ module.exports = function(srf, logger) { req.locals.queue_name = queue_name; } // check for call to registered user - if (req.locals.originatingUser) { + if (!JAMBONES_DISABLE_DIRECT_P2P_CALL && req.locals.originatingUser) { const arr = /^(.*)@(.*)/.exec(req.locals.originatingUser); if (arr) { const sipRealm = arr[2];