Added flag to enable converting ingress numbers to e164 format

linlin2018 · Mar 14, 2021 · 2636daf · 2636daf
1 parent a21884e
commit 2636daf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/.helm/templates/deployment.yaml b/.helm/templates/deployment.yaml
@@ -32,6 +32,8 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+        - name: EX_CONVERT_TEL_TO_E164
+          value: {{ .Values.routr.ex_convertTelToE164 | quote }}
         - name: EX_UNIQUE_GATEWAY_PER_HOST_PORT
           value: {{ .Values.routr.ex_uniqueGatewayPerHostPort | quote }}
         - name: EX_RTP_ENGINE_ENABLED

diff --git a/.helm/values.yaml b/.helm/values.yaml
@@ -52,6 +52,9 @@ routr:
   patchRequestURI: false
   registrarIntf: External
   ex_uniqueGatewayPerHostPort: false
+  ex_convertTelToE164: false
+  ex_rtpEngine:
+    enabled: false  
   accessControlList:
     deny: []
     allow: []
@@ -66,8 +69,6 @@ routr:
     trustStore: ""
     keyStorePassword: ""
     trustStorePassword: ""
-  ex_rtpEngine:
-    enabled: false
   securityContext:
     keyStore: ""
     trustStore: ""

diff --git a/etc/schemas/config_schema.json b/etc/schemas/config_schema.json
@@ -18,6 +18,9 @@
                 "ex_uniqueGatewayPerHostPort": {
                     "type": "boolean"
                 },
+                "ex_convertTelToE164": {
+                    "type": "boolean"
+                },
                 "registrarIntf": {
                     "enum": ["Internal", "External", "internal", "external"]
                 },

diff --git a/mod/core/config/config_defaults.js b/mod/core/config/config_defaults.js
@@ -15,6 +15,7 @@ module.exports = upSince => {
     },
     spec: {
       ex_uniqueGatewayPerHostPort: false,
+      ex_convertTelToE164: false,
       bindAddr: InetAddress.getLocalHost().getHostAddress(),
       localnets: [],
       transport: [

diff --git a/mod/core/config/config_from_env.js b/mod/core/config/config_from_env.js
@@ -49,10 +49,12 @@ envsMap.set('EX_RTP_ENGINE_ENABLED', 'spec.ex_rtpEngine.enabled')
 envsMap.set('EX_RTP_ENGINE_PROTO', 'spec.ex_rtpEngine.proto')
 envsMap.set('EX_RTP_ENGINE_HOST', 'spec.ex_rtpEngine.host')
 envsMap.set('EX_RTP_ENGINE_PORT', 'spec.ex_rtpEngine.port')
+envsMap.set('EX_CONVERT_TEL_TO_E164', 'spec.ex_convertTelToE164')
 envsMap.set(
   'EX_UNIQUE_GATEWAY_PER_HOST_PORT',
   'spec.ex_uniqueGatewayPerHostPort'
 )
+
 envsMap.set('LOG4J', '')
 envsMap.set('CONFIG_FILE', '')
 envsMap.set('SALT', '')

diff --git a/mod/location/locator.js b/mod/location/locator.js
@@ -14,6 +14,7 @@ const StoreAPI = require('@routr/data_api/store_api')
 const postal = require('postal')
 const { Status } = require('@routr/core/status')
 const phone = require('phone')
+const config = require('@routr/core/config_util')()
 
 const LogManager = Java.type('org.apache.logging.log4j.LogManager')
 const LOG = LogManager.getLogger()
@@ -78,11 +79,13 @@ class Locator {
     } else {
       try {
         const tel = LocatorUtils.aorAsObj(addressOfRecord).getUser()
-        const telE164 = phone(tel)[0]
+        const telE164 = config.spec.ex_convertTelToE164
+          ? phone('+' + tel, '', true)[0]
+          : tel
         const response = this.findEndpointByTelUrl(`tel:${telE164}`)
         if (response.status === Status.OK) return response
       } catch (e) {
-        // Ignore
+        LOG.warning(`Tel '${tel}' not a valid e164`)
       }
     }