jitsi · emrahcom · Sep 29, 2023 · Oct 17, 2023 · Oct 17, 2023 · Oct 17, 2023
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ JITSI_BUILD ?= unstable
 JITSI_REPO ?= jitsi
 NATIVE_ARCH ?= $(shell uname -m)
 
-JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri
+JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri sip-jibri
 
 ifeq ($(NATIVE_ARCH),x86_64)
 	TARGETPLATFORM := linux/amd64

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -265,6 +265,8 @@ services:
             - PROSODY_VISITOR_INDEX
             - PROSODY_VISITORS_MUC_PREFIX
             - PUBLIC_URL
+            - SIP_JIBRI_XMPP_USER
+            - SIP_JIBRI_XMPP_PASSWORD
             - STUN_HOST
             - STUN_PORT
             - TURN_CREDENTIALS

diff --git a/env.example b/env.example
@@ -211,6 +211,9 @@ JIBRI_RECORDER_PASSWORD=
 # XMPP password for Jibri client connections
 JIBRI_XMPP_PASSWORD=
 
+# XMPP password for Sip-Jibri client connections
+SIP_JIBRI_XMPP_PASSWORD=
+
 #
 # Docker Compose options
 #

diff --git a/gen-passwords.sh b/gen-passwords.sh
@@ -9,11 +9,13 @@ JVB_AUTH_PASSWORD=$(generatePassword)
 JIGASI_XMPP_PASSWORD=$(generatePassword)
 JIBRI_RECORDER_PASSWORD=$(generatePassword)
 JIBRI_XMPP_PASSWORD=$(generatePassword)
+SIP_JIBRI_XMPP_PASSWORD=$(generatePassword)
 
 sed -i.bak \
     -e "s#JICOFO_AUTH_PASSWORD=.*#JICOFO_AUTH_PASSWORD=${JICOFO_AUTH_PASSWORD}#g" \
     -e "s#JVB_AUTH_PASSWORD=.*#JVB_AUTH_PASSWORD=${JVB_AUTH_PASSWORD}#g" \
     -e "s#JIGASI_XMPP_PASSWORD=.*#JIGASI_XMPP_PASSWORD=${JIGASI_XMPP_PASSWORD}#g" \
     -e "s#JIBRI_RECORDER_PASSWORD=.*#JIBRI_RECORDER_PASSWORD=${JIBRI_RECORDER_PASSWORD}#g" \
     -e "s#JIBRI_XMPP_PASSWORD=.*#JIBRI_XMPP_PASSWORD=${JIBRI_XMPP_PASSWORD}#g" \
+    -e "s#SIP_JIBRI_XMPP_PASSWORD=.*#SIP_JIBRI_XMPP_PASSWORD=${SIP_JIBRI_XMPP_PASSWORD}#g" \
     "$(dirname "$0")/.env"
diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
@@ -13,6 +13,7 @@
 {{ $ENABLE_JVB_XMPP_SERVER := .Env.ENABLE_JVB_XMPP_SERVER | default "0" | toBool -}}
 {{ $HEALTH_CHECKS_USE_PRESENCE := .Env.JICOFO_HEALTH_CHECKS_USE_PRESENCE | default "0" | toBool -}}
 {{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}}
+{{ $SIP_JIBRI_BREWERY_MUC := .Env.SIP_JIBRI_BREWERY_MUC | default "sipbrewery" -}}
 {{ $JIGASI_BREWERY_MUC := .Env.JIGASI_BREWERY_MUC | default "jigasibrewery" -}}
 {{ $JVB_BREWERY_MUC := .Env.JVB_BREWERY_MUC | default "jvbbrewery" -}}
 {{ $JIBRI_PENDING_TIMEOUT := .Env.JIBRI_PENDING_TIMEOUT | default "90 seconds" -}}
@@ -196,9 +197,9 @@ jicofo {
     }
     {{ end }}
 
-    {{ if .Env.JIBRI_SIP_BREWERY_MUC }}
+    {{ if $SIP_JIBRI_BREWERY_MUC }}
     jibri-sip {
-      brewery-jid = "{{ .Env.JIBRI_SIP_BREWERY_MUC }}"
+      brewery-jid = "{{ $SIP_JIBRI_BREWERY_MUC }}@{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
     }
     {{ end }}
 

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -41,7 +41,9 @@
 {{ $XMPP_MUC_DOMAIN := .Env.XMPP_MUC_DOMAIN | default "muc.meet.jitsi" -}}
 {{ $XMPP_MUC_DOMAIN_PREFIX := (split "." $XMPP_MUC_DOMAIN)._0 -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
+{{ $XMPP_SIP_DOMAIN := .Env.XMPP_SIP_DOMAIN | default "sip.meet.jitsi" -}}
 {{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
+{{ $SIP_JIBRI_XMPP_USER := .Env.SIP_JIBRI_XMPP_USER | default "sip" -}}
 {{ $JIGASI_TRANSCRIBER_USER := .Env.JIGASI_TRANSCRIBER_USER | default "transcriber" -}}
 {{ $DISABLE_POLLS := .Env.DISABLE_POLLS | default "false" | toBool -}}
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
@@ -232,7 +234,9 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     {{ if $ENABLE_LOBBY }}
     lobby_muc = "lobby.{{ $XMPP_DOMAIN }}"
     {{ if $ENABLE_RECORDING }}
-    muc_lobby_whitelist = { "{{ $XMPP_RECORDER_DOMAIN }}" }
+    muc_lobby_whitelist = { "{{ $XMPP_SIP_DOMAIN }}, {{ $XMPP_RECORDER_DOMAIN }}" }
+    {{ else }}
+    muc_lobby_whitelist = { "{{ $XMPP_SIP_DOMAIN }}" }
     {{ end }}
     {{ end }}
 
@@ -258,7 +262,7 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     c2s_require_encryption = false
 
     {{ if $ENABLE_VISITORS -}}
-    visitors_ignore_list = { "{{ $XMPP_RECORDER_DOMAIN }}" }
+    visitors_ignore_list = { "{{ $XMPP_SIP_DOMAIN }}, {{ $XMPP_RECORDER_DOMAIN }}" }
     {{ end }}
 
     {{ if .Env.XMPP_CONFIGURATION -}}
@@ -302,6 +306,15 @@ VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}"
     authentication = "internal_hashed"
 {{ end }}
 
+{{ if $XMPP_SIP_DOMAIN }}
+VirtualHost "{{ $XMPP_SIP_DOMAIN }}"
+    modules_enabled = {
+      "ping";
+      "smacks";
+    }
+    authentication = "internal_hashed"
+{{ end }}
+
 Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
     storage = "memory"
     modules_enabled = {
@@ -364,7 +377,8 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
 
     rate_limit_whitelist_jids = {
         "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
-        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}"    
+        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
+        "{{ $SIP_JIBRI_XMPP_USER }}@{{ $XMPP_SIP_DOMAIN }}"
     }
     {{ end -}}
 

diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -4,6 +4,7 @@
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}}
 {{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
+{{ $SIP_JIBRI_XMPP_USER := .Env.SIP_JIBRI_XMPP_USER | default "sip" -}}
 {{ $JIGASI_TRANSCRIBER_USER := .Env.JIGASI_TRANSCRIBER_USER | default "transcriber" -}}
 {{ $LIMIT_MESSAGES_CHECK_TOKEN := .Env.PROSODY_LIMIT_MESSAGES_CHECK_TOKEN | default "0" | toBool -}}
 {{ $RATE_LIMIT_LOGIN_RATE := .Env.PROSODY_RATE_LIMIT_LOGIN_RATE | default "3" -}}
@@ -35,6 +36,7 @@
 {{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
 {{ $XMPP_SERVER_S2S_PORT := .Env.XMPP_SERVER_S2S_PORT | default $S2S_PORT -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
+{{ $XMPP_SIP_DOMAIN := .Env.XMPP_SIP_DOMAIN | default "sip.meet.jitsi" -}}
 
 plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
 
@@ -190,7 +192,8 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO
 
     rate_limit_whitelist_jids = {
         "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
-        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}"    
+        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
+        "{{ $SIP_JIBRI_XMPP_USER }}@{{ $XMPP_SIP_DOMAIN }}",
     }
     {{ end -}}
 

diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config
@@ -72,9 +72,11 @@ fi
 [ -z "${JIBRI_XMPP_USER}" ] && export JIBRI_XMPP_USER=jibri
 [ -z "${JIGASI_XMPP_USER}" ] && export JIGASI_XMPP_USER=jigasi
 [ -z "${JVB_AUTH_USER}" ] && export JVB_AUTH_USER=jvb
+[ -z "${SIP_JIBRI_XMPP_USER}" ] && export SIP_JIBRI_XMPP_USER=sip
 [ -z "${XMPP_DOMAIN}" ] && export XMPP_DOMAIN=meet.jitsi
 [ -z "${XMPP_AUTH_DOMAIN}" ] && export XMPP_AUTH_DOMAIN=auth.meet.jitsi
 [ -z "${XMPP_RECORDER_DOMAIN}" ] && export XMPP_RECORDER_DOMAIN=recorder.meet.jitsi
+[ -z "${XMPP_SIP_DOMAIN}" ] && export XMPP_SIP_DOMAIN=sip.meet.jitsi
 
 prosodyctl --config $PROSODY_CFG register focus $XMPP_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD
 
@@ -116,6 +118,15 @@ if [[ "$PROSODY_MODE" == "client" ]]; then
     fi
 fi
 
+if [[ ! -z $SIP_JIBRI_XMPP_PASSWORD ]]; then
+    OLD_SIP_JIBRI_XMPP_PASSWORD=passw0rd
+    if [[ "$SIP_JIBRI_XMPP_PASSWORD" == "$OLD_SIP_JIBRI_XMPP_PASSWORD" ]]; then
+        echo 'FATAL ERROR: Sip-Jibri XMPP password must be changed, check the README'
+        exit 1
+    fi
+    prosodyctl --config $PROSODY_CFG register $SIP_JIBRI_XMPP_USER $XMPP_SIP_DOMAIN $SIP_JIBRI_XMPP_PASSWORD
+fi
+
 if [[ ! -z $JIGASI_XMPP_PASSWORD ]]; then
     OLD_JIGASI_XMPP_PASSWORD=passw0rd
     if [[ "$JIGASI_XMPP_PASSWORD" == "$OLD_JIGASI_XMPP_PASSWORD" ]]; then

diff --git a/sip-jibri.yml b/sip-jibri.yml
@@ -0,0 +1,66 @@
+version: '3.5'
+
+services:
+    sip-jibri:
+        image: jitsi/sip-jibri:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
+        ports:
+            - '${SIP_JIBRI_PORT:-5060}:5060/udp'
+            - '${SIP_JIBRI_PORT:-5060}:5060'
+        volumes:
+            - ${CONFIG}/sip-jibri:/config:Z
+        shm_size: '2gb'
+        cap_add:
+            - SYS_ADMIN
+        devices:
+            - /dev/snd:/dev/snd
+            - /dev/video2:/dev/video0
+            - /dev/video3:/dev/video1
+        environment:
+            - AUTOSCALER_SIDECAR_KEY_FILE
+            - AUTOSCALER_SIDECAR_KEY_ID
+            - AUTOSCALER_SIDECAR_GROUP_NAME
+            - AUTOSCALER_SIDECAR_HOST_ID
+            - AUTOSCALER_SIDECAR_INSTANCE_ID
+            - AUTOSCALER_SIDECAR_PORT
+            - AUTOSCALER_SIDECAR_REGION
+            - AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL
+            - AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL
+            - AUTOSCALER_URL
+            - CHROMIUM_FLAGS
+            - DISPLAY0=:0
+            - DISPLAY1=:1
+            - ENABLE_STATS_D
+            - JIBRI_WEBHOOK_SUBSCRIBERS
+            - JIBRI_HTTP_API_EXTERNAL_PORT
+            - JIBRI_HTTP_API_INTERNAL_PORT
+            - JIBRI_USAGE_TIMEOUT
+            - JIBRI_XMPP_USER
+            - JIBRI_XMPP_PASSWORD
+            - JIBRI_BREWERY_MUC
+            - JIBRI_STRIP_DOMAIN_JID
+            - JIBRI_STATSD_HOST
+            - JIBRI_STATSD_PORT
+            - LOCAL_ADDRESS
+            - PUBLIC_URL
+            - SIP_JIBRI_BREWERY_MUC
+            - SIP_JIBRI_BREWERY_MUC_DUMMY
+            - SIP_JIBRI_RESOLUTION
+            - SIP_JIBRI_USAGE_TIMEOUT
+            - SIP_JIBRI_XMPP_USER
+            - SIP_JIBRI_XMPP_PASSWORD
+            - SIP_JIBRI_SINGLE_USE_MODE
+            - SIP_JIBRI_STRIP_DOMAIN_JID
+            - TZ
+            - XMPP_AUTH_DOMAIN
+            - XMPP_DOMAIN
+            - XMPP_INTERNAL_MUC_DOMAIN
+            - XMPP_MUC_DOMAIN
+            - XMPP_SERVER
+            - XMPP_SIP_DOMAIN
+            - XMPP_PORT
+            - XMPP_TRUST_ALL_CERTS
+        depends_on:
+            - jicofo
+        networks:
+            meet.jitsi:
diff --git a/sip-jibri/Dockerfile b/sip-jibri/Dockerfile
@@ -0,0 +1,66 @@
+# ------------------------------------------------------------------------------
+# builder
+# ------------------------------------------------------------------------------
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base:${BASE_TAG} as builder
+
+ARG PROJECT_REPO=https://github.com/jitsi/pjproject
+ARG PROJECT_BRANCH=jibri-2.13-dev1
+
+RUN apt-dpkg-wrap apt-get update && \
+    apt-dpkg-wrap apt-get install -y \
+        -o Dpkg::Options::="--force-confdef" \
+        -o Dpkg::Options::="--force-confold" \
+        build-essential git \
+        libv4l-dev libsdl2-dev libavcodec-dev libavdevice-dev libavfilter-dev \
+        libavformat-dev libavresample-dev libavutil-dev libswresample-dev \
+        libswscale-dev libasound2-dev libopus-dev libvpx-dev && \
+    cd /tmp && \
+    git clone -b $PROJECT_BRANCH $PROJECT_REPO && \
+    cd pjproject && ./configure && make dep && make && \
+    cp pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu /tmp/pjsua && \
+    apt-cleanup
+
+# ------------------------------------------------------------------------------
+# sip-jibri
+# ------------------------------------------------------------------------------
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base-java:${BASE_TAG}
+
+LABEL org.opencontainers.image.title="Jitsi Video-SIP-Gateway (sip-jibri)"
+LABEL org.opencontainers.image.description="Components for joining a conference from a SIP device."
+LABEL org.opencontainers.image.url="https://github.com/jitsi/jibri"
+LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
+LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
+
+ARG TARGETPLATFORM
+ARG USE_CHROMIUM=0
+#ARG CHROME_RELEASE=latest
+# https://googlechromelabs.github.io/chrome-for-testing/
+ARG CHROME_RELEASE=116.0.5845.96
+
+COPY --from=builder /tmp/pjsua /usr/local/bin/pjsua
+COPY rootfs/ /
+
+RUN apt-dpkg-wrap apt-get update && \
+    apt-dpkg-wrap apt-get install -y \
+        -o Dpkg::Options::="--force-confdef" \
+        -o Dpkg::Options::="--force-confold" \
+        jibri libgl1-mesa-dri jitsi-autoscaler-sidecar jq dbus dbus-x11 rtkit \
+        unzip fonts-noto && \
+    apt-dpkg-wrap apt-get install -y \
+        -o Dpkg::Options::="--force-confdef" \
+        -o Dpkg::Options::="--force-confold" \
+        libv4l-0 unclutter && \
+    /usr/bin/install-chrome.sh && \
+    /usr/bin/install-pjsua.sh && \
+    apt-cleanup && \
+    adduser jibri rtkit && \
+    update-alternatives --install /usr/bin/google-chrome google-chrome \
+        /usr/local/bin/google-chrome 300
+
+EXPOSE 5060
+
+VOLUME /config
diff --git a/sip-jibri/rootfs/defaults/asoundrc b/sip-jibri/rootfs/defaults/asoundrc
@@ -0,0 +1,67 @@
+{{ $LOOPBACK0 := .Env.LOOPBACK0 | default "Loopback" -}}
+{{ $LOOPBACK1 := .Env.LOOPBACK1 | default "Loopback_1" -}}
+
+pcm.amix {
+  type dmix
+  ipc_key 219345
+  slave.pcm "hw:{{ $LOOPBACK0 }},0,0"
+}
+
+pcm.asnoop {
+  type dsnoop
+  ipc_key 219346
+  slave.pcm "hw:{{ $LOOPBACK1 }},1,0"
+}
+
+pcm.aduplex {
+  type asym
+  playback.pcm "amix"
+  capture.pcm "asnoop"
+}
+
+pcm.bmix {
+  type dmix
+  ipc_key 219347
+  slave.pcm "hw:{{ $LOOPBACK1 }},0,0"
+}
+
+pcm.bsnoop {
+  type dsnoop
+  ipc_key 219348
+  slave.pcm "hw:{{ $LOOPBACK0 }},1,0"
+}
+
+pcm.bduplex {
+  type asym
+  playback.pcm "bmix"
+  capture.pcm "bsnoop"
+}
+
+pcm.pjsua {
+  type plug
+  slave.pcm "bduplex"
+}
+
+# capture device for pjsua, --capture-dev=7 if there is no sound card
+pcm.pjsua_capture {
+  type plug
+  slave.pcm "hw:{{ $LOOPBACK0 }},1,0"
+}
+
+# playback device for pjsua, --playback-dev=8 if there is no sound card
+pcm.pjsua_playback {
+  type plug
+  slave.pcm "hw:{{ $LOOPBACK1 }},0,0"
+}
+
+# capture device for chrome
+pcm.chrome_capture {
+  type plug
+  slave.pcm "hw:{{ $LOOPBACK1 }},1,0"
+}
+
+# playback device for chrome (since this is the default option)
+pcm.!default {
+  type plug
+  slave.pcm "aduplex"
+}
diff --git a/sip-jibri/rootfs/defaults/autoscaler-sidecar.config b/sip-jibri/rootfs/defaults/autoscaler-sidecar.config
@@ -0,0 +1,18 @@
+{{ $JIBRI_HTTP_API_EXTERNAL_PORT := .Env.JIBRI_HTTP_API_EXTERNAL_PORT | default "2222" -}}
+{{ $SHUTDOWN_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL | default "60" -}}
+{{ $STATS_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL | default "30" -}}
+export SHUTDOWN_POLLING_INTERVAL={{ $SHUTDOWN_POLLING_INTERVAL }}
+export STATS_POLLING_INTERVAL={{ $STATS_POLLING_INTERVAL }}
+export PORT={{ .Env.AUTOSCALER_SIDECAR_PORT }}
+export GRACEFUL_SHUTDOWN_SCRIPT="/opt/jitsi/jibri/wait_graceful_shutdown.sh"
+export TERMINATE_SCRIPT="/opt/jitsi/jibri/shutdown.sh"
+export ENABLE_REPORT_STATS=true
+export POLLING_URL="{{ .Env.AUTOSCALER_URL  }}/sidecar/poll"
+export STATUS_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/status"
+export STATS_RETRIEVE_URL="http://localhost:{{ $JIBRI_HTTP_API_EXTERNAL_PORT }}/jibri/api/v1.0/health"
+export STATS_REPORT_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/stats"
+export ASAP_SIGNING_KEY_FILE="{{ .Env.AUTOSCALER_SIDECAR_KEY_FILE }}"
+export ASAP_JWT_KID="{{ .Env.AUTOSCALER_SIDECAR_KEY_ID }}"
+export INSTANCE_TYPE="sip-jibri"
+export INSTANCE_ID="{{ .Env.AUTOSCALER_SIDECAR_INSTANCE_ID }}"
+export INSTANCE_METADATA='{"environment":"{{ .Env.XMPP_ENV_NAME }}","region":"{{ .Env.AUTOSCALER_SIDECAR_REGION }}","group":"{{ .Env.AUTOSCALER_SIDECAR_GROUP_NAME }}","name":"{{ .Env.SIP_JIBRI_INSTANCE_ID }}","version":"{{ .Env.JIBRI_VERSION }}","privateIp":"{{ .Env.LOCAL_ADDRESS }}","hostId":"{{ .Env.AUTOSCALER_SIDECAR_HOST_ID }}"}'