From e71fe782fcea570d489441c73ee2493ba6682537 Mon Sep 17 00:00:00 2001
From: Werner Fleischer <70745309+wfleischer@users.noreply.github.com>
Date: Tue, 16 May 2023 17:14:59 +0200
Subject: [PATCH] jigate: add user registration

---
 jigate.env                                    | 29 +++++++++---------
 jigate.yml                                    | 29 ++++++++++++++----
 .../autoload_configs/console.conf.xml         |  6 ++--
 .../autoload_configs/event_socket.conf.xml    |  2 +-
 .../autoload_configs/sofia.conf.xml           | 27 ++++++++++-------
 .../autoload_configs/switch.conf.xml          |  6 ++--
 jigate/etc/freeswitch/directory/directory.xml | 30 +++++++++++--------
 jigate/etc/freeswitch/freeswitch.xml          | 27 ++++++++++-------
 8 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/jigate.env b/jigate.env
index 914c604..4e7ae15 100644
--- a/jigate.env
+++ b/jigate.env
@@ -1,28 +1,27 @@
 # Environment variables
 # Add them to your docker-jitsi-meet .env file to change the default settings
-# JIGASI_SIP_PASSWORD, JIGATE_ESL_PASSWORD and JIGATE_SIP_PASSWORD are mandatory
+# JIGASI_SIP_PASSWORD, JIGATE_ESL_PASSWORD and JIGATE_REGISTRATION_PASSWORD are mandatory
 
 #
 # Jigasi configuration
 #
 JIGASI_SIP_PASSWORD=
 # JIGASI_SIP_SERVER=jigate.meet.jitsi
+# JIGASI_SIP_PORT=5070
 
 #
 # Jigate configuration
 #
 JIGATE_ESL_PASSWORD=
-#JIGATE_SERVER=jigate.meet.jitsi
-JIGATE_SIP_PASSWORD=
-#JIGATE_SIP_USERNAME=jigate
-#JIGATE_SIP_SERVER=sipgw.meet.jitsi
-
-#
-# SIP Gateway configuration
-#
-#SIPGW_EXTERNAL_IP=127.0.0.1
-#SIPGW_INTERNAL_IP=interface:ipv4/eth1
-#SIPGW_EXTERNAL_SIP_PORT=5060
-#SIPGW_RTP_END_PORT=20250
-#SIPGW_RTP_START_PORT=20200
-#SIPGW_USER_PASSWORD=
+# JIGATE_EXTERNAL_IP=127.0.0.1
+# JIGATE_EXTERNAL_SIP_PORT=5060
+# JIGATE_INTERNAL_IP=interface:ipv4/eth1
+# JIGATE_REGISTRATION_PASSWORD=
+# JIGATE_REGISTRATION_USERNAME=user
+# JIGATE_RTP_END_PORT=20250
+# JIGATE_RTP_START_PORT=20200
+# SIPGW_SIP_DOMAIN=meet.jitsi
+# SIPGW_SIP_PASSWORD
+# SIPGW_SIP_PORT=5060
+# SIPGW_SIP_SERVER=sipgw.meet.jitsi
+# SIPGW_SIP_USERNAME=jigate
diff --git a/jigate.yml b/jigate.yml
index cc51097..5de0834 100644
--- a/jigate.yml
+++ b/jigate.yml
@@ -5,19 +5,33 @@ services:
   jigate:
     image: jigate/jigate:latest
     restart: ${RESTART_POLICY:-unless-stopped}
+    ports:
+      - '${JIGATE_EXTERNAL_SIP_PORT:-5060}:${JIGATE_EXTERNAL_SIP_PORT:-5060}/udp'
+      - '${JIGATE_RTP_START_PORT:-20200}-${JIGATE_RTP_END_PORT:-20250}:${JIGATE_RTP_START_PORT:-20200}-${JIGATE_RTP_END_PORT:-20250}/udp'
+    volumes:
+      - ../jigate/jigate/etc/freeswitch:/etc/freeswitch
+      - ../jigate/jigate/usr/share/freeswitch/sounds:/usr/share/freeswitch/sounds
     environment:
       - JIGASI_SIP_PASSWORD
       - JIGATE_ESL_PASSWORD
-      - JIGATE_SIP_PASSWORD
-      - JIGATE_SIP_PORT=${JIGATE_SIP_PORT:-5060}
-      - JIGATE_SIP_DOMAIN=${JIGATE_SIP_DOMAIN:-meet.jitsi}
-      - JIGATE_SIP_SERVER=${JIGATE_SIP_SERVER:-sipgw.meet.jitsi}
-      - JIGATE_SIP_USERNAME=${JIGATE_SIP_USERNAME:-jigate}
+      - JIGATE_EXTERNAL_IP=${JIGATE_EXTERNAL_IP:-127.0.0.1}
+      - JIGATE_EXTERNAL_SIP_PORT=${JIGATE_EXTERNAL_SIP_PORT:-5060}
+      - JIGATE_INTERNAL_IP=${JIGATE_INTERNAL_IP:-interface:ipv4/eth1}
+      - JIGATE_INTERNAL_SIP_PORT=${JIGASI_SIP_PORT:-5060}
+      - JIGATE_REGISTRATION_PASSWORD
+      - JIGATE_REGISTRATION_USERNAME=${JIGATE_REGISTRATION_USER:-user}
+      - JIGATE_RTP_END_PORT=${JIGATE_RTP_END_PORT:-20250}
+      - JIGATE_RTP_START_PORT=${JIGATE_RTP_START_PORT:-20200}
       - LOG_LEVEL=${LOG_LEVEL:-info}
+      - SIPGW_SIP_DOMAIN=${SIPGW_SIP_DOMAIN:-meet.jitsi}
+      - SIPGW_SIP_PASSWORD
+      - SIPGW_SIP_PORT=${SIPGW_SIP_PORT:-5060}
+      - SIPGW_SIP_SERVER=${SIPGW_SIP_SERVER:-sipgw.meet.jitsi}
+      - SIPGW_SIP_USERNAME=${SIPGW_SIP_USERNAME:-jigate}
     networks:
       jigate:
         aliases:
-          - jigate
+          - ${JIGASI_SIP_SERVER:-jigate.meet.jitsi}
       meet.jitsi:
         aliases:
           - ${JIGASI_SIP_SERVER:-jigate.meet.jitsi}
@@ -25,6 +39,8 @@ services:
   jigatecon:
     image: jigate/jigatecon:latest
     restart: ${RESTART_POLICY:-unless-stopped}
+    volumes:
+      - ../jigate:/home/node/jigatecon
     environment:
       - JIGASI_SIP_URI=jigasi@meet.jitsi
       - JIGATE_ESL_PASSWORD
@@ -38,6 +54,7 @@ services:
   jigasi:
     environment:
       - JIGASI_SIP_SERVER=${JIGASI_SIP_SERVER:-jigate.meet.jitsi}
+      - JIGASI_SIP_PORT=${JIGASI_SIP_PORT:-5060}
       - JIGASI_SIP_URI=jigasi@meet.jitsi
     depends_on:
       - jigate
diff --git a/jigate/etc/freeswitch/autoload_configs/console.conf.xml b/jigate/etc/freeswitch/autoload_configs/console.conf.xml
index 5545cda..5345918 100644
--- a/jigate/etc/freeswitch/autoload_configs/console.conf.xml
+++ b/jigate/etc/freeswitch/autoload_configs/console.conf.xml
@@ -1,9 +1,9 @@
 <configuration name="console.conf" description="Console Logger">
     <settings>
         <param name="colorize" value="true"/>
-        <param name="loglevel" value="$${loglevel}"/>
-        <param name="log_event" value="$${loglevel}"/>
-        <param name="all" value="$${loglevel}"/>
+        <param name="loglevel" value="$${log_level}"/>
+        <param name="log_event" value="$${log_level}"/>
+        <param name="all" value="$${log_level}"/>
     </settings>
     <mappings>
         <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
diff --git a/jigate/etc/freeswitch/autoload_configs/event_socket.conf.xml b/jigate/etc/freeswitch/autoload_configs/event_socket.conf.xml
index 6a3982c..db9bf00 100644
--- a/jigate/etc/freeswitch/autoload_configs/event_socket.conf.xml
+++ b/jigate/etc/freeswitch/autoload_configs/event_socket.conf.xml
@@ -3,7 +3,7 @@
     <param name="nat-map" value="false"/>
     <param name="listen-ip" value="0.0.0.0"/>
     <param name="listen-port" value="8021"/>
-    <param name="password" value="$${event_socket_password}"/>
+    <param name="password" value="$${jigate_esl_password}"/>
     <param name="apply-inbound-acl" value="rfc1918.auto"/>
     <param name="stop-on-bind-error" value="true"/>
   </settings>
diff --git a/jigate/etc/freeswitch/autoload_configs/sofia.conf.xml b/jigate/etc/freeswitch/autoload_configs/sofia.conf.xml
index 9c41ceb..0db0995 100644
--- a/jigate/etc/freeswitch/autoload_configs/sofia.conf.xml
+++ b/jigate/etc/freeswitch/autoload_configs/sofia.conf.xml
@@ -1,7 +1,7 @@
 <configuration name="sofia.conf" description="sofia Endpoint">
     <global_settings>
         <param name="auth-calls" value="true"/>
-        <param name="auth-all-packets" value="false"/>
+        <param name="auth-all-packets" value="true"/>
         <param name="challenge-realm" value="auto_from"/>
         <param name="debug" value="0"/>
         <param name="debug-presence" value="0"/>
@@ -18,16 +18,20 @@
         <param name="rfc2833-pt" value="101"/>
         <param name="rtp-timer-name" value="soft"/>
         <param name="tls" value="false"/>
-        <param name="user-agent-string" value="Jigasi Freeswitch gateway"/>
+        <param name="user-agent-string" value="Jigate"/>
     </global_settings>
     <profiles>
         <profile name="sipgw">
             <settings>
                 <param name="context" value="public"/>
                 <param name="sip-trace" value="yes"/>
-                <param name="sip-ip" value="interface:ipv4/eth0"/>
-                <param name="rtp-ip" value="interface:ipv4/eth0"/>
-                <param name="local-network-acl" value="rfc1918.auto"/>
+                <param name="sip-port" value="$${jigate_external_sip_port}"/>
+                <param name="ext-sip-ip" value="$${jigate_external_ip}"/>
+                <param name="ext-rtp-ip" value="$${jigate_external_ip}"/>
+                <param name="local-network-acl" value="none"/>
+                <param name="enable-compact-headers" value="true"/>
+                <param name="multiple-registrations" value="contact"/>
+                <param name="caller-id-type" value="pid"/>
                 <param name="disable-transcoding" value="false"/>
                 <param name="inbound-late-negotiation" value="true"/>
                 <param name="inherit_codec" value="true"/>
@@ -35,10 +39,10 @@
 
             <gateways>
                 <gateway name="sipgw">
-                    <param name="proxy" value="$${sipgw_server}:$${sipgw_port}"/>
-                    <param name="from-domain" value="$${sipgw_domain}"/>
-                    <param name="username" value="$${sipgw_username}"/>
-                    <param name="password" value="$${sipgw_password}"/>
+                    <param name="proxy" value="$${sipgw_sip_server}:$${sipgw_sip_port}"/>
+                    <param name="from-domain" value="$${sipgw_sip_domain}"/>
+                    <param name="username" value="$${sipgw_sip_username}"/>
+                    <param name="password" value="$${sipgw_sip_password}"/>
                     <param name="expire-seconds" value="60"/>
                     <param name="extension-in-contact" value="true"/>
                     <param name="caller-id-in-from" value="true"/>
@@ -53,8 +57,9 @@
             <settings>
                 <param name="context" value="default"/>
                 <param name="sip-trace" value="yes"/>
-                <param name="sip-ip" value="interface:ipv4/eth1"/>
-                <param name="rtp-ip" value="interface:ipv4/eth1"/>
+                <param name="sip-port" value="$${jigate_internal_sip_port}"/>
+                <param name="sip-ip" value="$${jigate_internal_ip}"/>
+                <param name="rtp-ip" value="$${jigate_internal_ip}"/>
                 <param name="local-network-acl" value="rfc1918.auto"/>
                 <param name="disable-transcoding" value="false"/>
                 <param name="inbound-late-negotiation" value="true"/>
diff --git a/jigate/etc/freeswitch/autoload_configs/switch.conf.xml b/jigate/etc/freeswitch/autoload_configs/switch.conf.xml
index 89f8dc9..7d2d456 100644
--- a/jigate/etc/freeswitch/autoload_configs/switch.conf.xml
+++ b/jigate/etc/freeswitch/autoload_configs/switch.conf.xml
@@ -3,11 +3,11 @@
         <param name="colorize-console" value="true"/>
         <param name="max-sessions" value="1000"/>
         <param name="sessions-per-second" value="30"/>
-        <param name="loglevel" value="$${loglevel}"/>
+        <param name="loglevel" value="$${log_level}"/>
         <param name="dump-cores" value="yes"/>
         <param name="rtp-enable-zrtp" value="false"/>
-        <param name="rtp-start-port" value="20000"/>
-        <param name="rtp-end-port" value="29998"/>
+        <param name="rtp-start-port" value="$${jigate_rtp_start_port}"/>
+        <param name="rtp-end-port" value="$${jigate_rtp_end_port}"/>
         <param name="max-audio-channels" value="1"/>
         <!-- Have RECV_INFO events include custom channel variables. -->
         <param name="verbose-channel-events" value="yes"/>
diff --git a/jigate/etc/freeswitch/directory/directory.xml b/jigate/etc/freeswitch/directory/directory.xml
index 317f7f6..bfa3e7b 100644
--- a/jigate/etc/freeswitch/directory/directory.xml
+++ b/jigate/etc/freeswitch/directory/directory.xml
@@ -1,14 +1,20 @@
 <domain name="meet.jitsi">
-    <groups>
-        <group name="200">
-            <users>
-                <user id="jigasi">
-                    <params>
-                        <param name="password" value="$${jigasi_password}" />
-                        <param name="dial-string" value="${sofia_contact(${dialed_user}@${dialed_domain})}"/>
-                    </params>
-                </user>
-            </users>
-        </group>
-    </groups>
+    <params>
+        <param name="dial-string" value="${sofia_contact(${dialed_user}@${dialed_domain})}"/>
+    </params>
+    <users>
+        <user id="$${jigate_registration_username}">
+            <params>
+                <param name="password" value="$${jigate_registration_password}"/>
+            </params>
+            <variables>
+                <variable name="sip-force-contact" value="NDLB-connectile-dysfunction-2.0"/>
+            </variables>
+        </user>
+        <user id="jigasi">
+            <params>
+                <param name="password" value="$${jigasi_sip_password}" />
+            </params>
+        </user>
+    </users>
 </domain>
diff --git a/jigate/etc/freeswitch/freeswitch.xml b/jigate/etc/freeswitch/freeswitch.xml
index a8d7985..fee2e78 100644
--- a/jigate/etc/freeswitch/freeswitch.xml
+++ b/jigate/etc/freeswitch/freeswitch.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0"?>
 <document type="freeswitch/xml">
-    <X-PRE-PROCESS cmd="env-set" data="event_socket_password=$JIGATE_ESL_PASSWORD"/>
-    <X-PRE-PROCESS cmd="env-set" data="jigasi_password=$JIGASI_SIP_PASSWORD"/>
-    <X-PRE-PROCESS cmd="env-set" data="loglevel=$LOG_LEVEL"/>
-    <X-PRE-PROCESS cmd="env-set" data="sipgw_domain=$JIGATE_SIP_DOMAIN"/>
-    <X-PRE-PROCESS cmd="env-set" data="sipgw_password=$JIGATE_SIP_PASSWORD"/>
-    <X-PRE-PROCESS cmd="env-set" data="sipgw_port=$JIGATE_SIP_PORT"/>
-    <X-PRE-PROCESS cmd="env-set" data="sipgw_server=$JIGATE_SIP_SERVER"/>
-    <X-PRE-PROCESS cmd="env-set" data="sipgw_username=$JIGATE_SIP_USERNAME"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigasi_sip_password=$JIGASI_SIP_PASSWORD"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_esl_password=$JIGATE_ESL_PASSWORD"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_external_ip=$JIGATE_EXTERNAL_IP"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_external_sip_port=$JIGATE_EXTERNAL_SIP_PORT"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_internal_ip=$JIGATE_INTERNAL_IP"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_internal_sip_port=$JIGATE_INTERNAL_SIP_PORT"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_registration_password=$JIGATE_REGISTRATION_PASSWORD"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_registration_username=$JIGATE_REGISTRATION_USERNAME"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_rtp_end_port=$JIGATE_RTP_END_PORT"/>
+    <X-PRE-PROCESS cmd="env-set" data="jigate_rtp_start_port=$JIGATE_RTP_START_PORT"/>
+    <X-PRE-PROCESS cmd="env-set" data="log_level=$LOG_LEVEL"/>
+    <X-PRE-PROCESS cmd="env-set" data="sipgw_sip_domain=$SIPGW_SIP_DOMAIN"/>
+    <X-PRE-PROCESS cmd="env-set" data="sipgw_sip_password=$SIPGW_SIP_PASSWORD"/>
+    <X-PRE-PROCESS cmd="env-set" data="sipgw_sip_port=$SIPGW_SIP_PORT"/>
+    <X-PRE-PROCESS cmd="env-set" data="sipgw_sip_server=$SIPGW_SIP_SERVER"/>
+    <X-PRE-PROCESS cmd="env-set" data="sipgw_sip_username=$SIPGW_SIP_USERNAME"/>
 
     <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,SPEEX,PCMU,PCMA,GSM"/>
-    <X-PRE-PROCESS cmd="set"
-data="outbound_codec_prefs=OPUS,G722,SPEEX,PCMU,PCMA,GSM"/>
+    <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,SPEEX,PCMU,PCMA,GSM"/>
 
     <section name="configuration" description="Various Configuration">
         <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>