XEP 0045 - Multi-User Chat

.circleci/Dockerfile-jackal

@@ -0,0 +1,6 @@
+FROM ubuntu:18.04
+
+# Jackal 
+RUN apt-get update && apt-get install --assume-yes sudo mysql-client
+COPY ./setup/wait_for_db.sh /root/
+COPY testdata/muc/server/ /root/

.circleci/Dockerfile-profanity

@@ -1,7 +1,12 @@
-FROM ubuntu:18.04
+FROM archlinux:base-20211024.0.37588
+
+# a hack required to install profanity, glibc needs to be downgraded, the issue is with the arch docker image
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
+curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
+bsdtar -C / -xvf "$patched_glibc"
 
 # Install base
-RUN apt-get update && apt-get install --assume-yes profanity
+RUN pacman -Sy --noconfirm profanity
 
 # Set up the profanity account
 RUN mkdir --parent /root/.local/share/profanity

.circleci/config.yml

@@ -20,10 +20,8 @@ version: 2
 jobs:
   unit_tests:
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/ortuman/jackal
-    environment:
-      GO111MODULE: "on"
 
     steps:
       - checkout
@@ -33,12 +31,11 @@ jobs:
             set -xe
             go test ./...
 
-  integration:
+  scion:
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     working_directory: ~/repo
     environment:
-      GO111MODULE: "on"
       BASH_ENV: "~/repo/.circleci/bash_env.sh"
       JACKAL_DIR: "/root"
       coreAS1301IP: 172.31.0.110
@@ -52,20 +49,20 @@ jobs:
          docker_layer_caching: false #not available in the free plan
 
       - run:
-          name: build
+          name: Build jackal
           command: |
             set -xe
             make build
 
-      # Start integration tests
+      # Start scion integration tests
       - run:
           name: Build containers
           command: |
             set -xe
             sudo -E docker-compose -f .circleci/docker-compose.yml kill  # stop containers
             sudo -E docker-compose -f .circleci/docker-compose.yml down  # bring composition down
             sudo -E docker-compose -f .circleci/docker-compose.yml build
-
+            
       - run:
           name: Start AS Containers
           command: |
@@ -132,9 +129,79 @@ jobs:
             set -xe
             sudo -E docker exec profanity1 /bin/bash -c 'until grep -q "user2@server2\.xmpp" /root/.local/share/profanity/logs/profanity.log; do cat /root/.local/share/profanity/logs/profanity.log; sleep 1; done;'
 
+  groupchat:
+    docker:
+      - image: circleci/golang:1.14
+    working_directory: ~/repo
+    environment:
+      BASH_ENV: "~/repo/.circleci/bash_env.sh"
+      JACKAL_DIR: "/root"
+      SERVER_IP: 172.30.0.110
+
+    steps:
+      - checkout
+
+      - setup_remote_docker:
+         docker_layer_caching: false #not available in the free plan
+
+      - run:
+          name: Build jackal
+          command: |
+            set -xe
+            make build
+
+      - run:
+          name: Build containers
+          command: |
+            set -xe
+            sudo -E docker-compose -f .circleci/docker-compose-muc.yml kill
+            sudo -E docker-compose -f .circleci/docker-compose-muc.yml down
+            sudo -E docker-compose -f .circleci/docker-compose-muc.yml build
+
+      - run:
+          name: Start server container
+          command: |
+            set -xe
+            sudo -E docker-compose -f .circleci/docker-compose-muc.yml up --no-start jackal_server
+            sudo -E docker cp ./jackal jackal_server:/root/jackal
+            sudo -E docker cp ./.circleci/setup/muc/start_server.sh jackal_server:/root/start_server.sh
+            sudo -E docker-compose -f .circleci/docker-compose-muc.yml up --no-recreate -d jackal_server
+
+      - run:
+          name: Start jackal server
+          command: |
+            set -xe
+            sudo -E docker exec jackal_server /bin/bash -c '/root/start_server.sh;'
+            sudo -E docker exec jackal_server /bin/bash -c "until grep -q 'listening\ at\ 0.0.0.0\:5222' ${JACKAL_DIR}/jackal.log; do sleep 1; done;" 
+
+      - run:
+          name: Start client containers
+          command: |
+            set -xe
+            for c in client_owner client_admin; do
+                sudo -E docker-compose -f .circleci/docker-compose-muc.yml up --no-start $c
+                sudo -E docker cp ./.circleci/setup/muc/setup_client.sh $c:/root/setup_client.sh
+                sudo -E docker-compose -f .circleci/docker-compose-muc.yml up --no-recreate -d $c
+                sudo -E docker exec $c /bin/bash -c '/root/setup_client.sh;'
+            done
+
+      - run:
+          name: Owner connects and creates a room
+          command: |
+            set -xe
+            sudo -E docker exec -it -d client_owner profanity -a alice
+
+      - run:
+          name: Admin connects, joins the room and dms the owner from the room
+          command: |
+            set -xe
+            sudo -E docker exec -it -d client_admin profanity -a bob
+            sudo -E docker exec client_owner /bin/bash -c 'until grep -q "bob\:\ Hi" /root/.local/share/profanity/chatlogs/alice_at_muc_server.xmpp/netsec_at_conference.muc_server.xmpp_bob/*\.log; do cat /root/.local/share/profanity/alice_at_muc_server.xmpp/netsec_at_conference.muc_server.xmpp_bob/*\.log; sleep 1; done;'
+
 workflows:
   version: 2
   tests:
     jobs:
       - unit_tests
-      - integration
+      - scion
+      - groupchat

.circleci/docker-compose-muc.yml

@@ -0,0 +1,69 @@
+version: "2"
+
+networks:
+  muc_net:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.30.0.0/16
+
+services:
+  jackal_db:
+    image: mysql:5.7
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: 'password'
+    networks:
+      - muc_net
+
+  jackal_server:
+    build:
+      context: .
+      dockerfile: Dockerfile-jackal
+    container_name: jackal_server
+    depends_on:
+      - jackal_db
+    networks:
+      muc_net:
+        ipv4_address: ${SERVER_IP}
+    tty: true
+    privileged: true
+    links:
+      - jackal_db:mysql_host
+
+  client_owner:
+    build:
+      context: .
+      dockerfile: Dockerfile-profanity
+    container_name: client_owner
+    networks:
+      - muc_net
+    environment:
+      CLIENT_ID: owner
+    tty: true
+    entrypoint: /bin/bash
+
+  client_admin:
+    build:
+      context: .
+      dockerfile: Dockerfile-profanity
+    container_name: client_admin
+    networks:
+      - muc_net
+    environment:
+      CLIENT_ID: admin
+    tty: true
+    entrypoint: /bin/bash
+
+  client_member:
+    build:
+      context: .
+      dockerfile: Dockerfile-profanity
+    container_name: client_member
+    networks:
+      - muc_net
+    environment:
+      CLIENT_ID: member
+    tty: true
+    entrypoint: /bin/bash

.circleci/setup/install_client.sh

@@ -5,11 +5,9 @@ set -xe
 if [ "$CLIENT_ID" == "client1" ]; then
     cp -r /root/c1_data/profanity/* /root/.local/share/profanity/
     echo "172.31.0.111 server1.xmpp" >> /etc/hosts
-    cp /root/c1_data/server1.xmpp.crt /usr/local/share/ca-certificates/
-    update-ca-certificates
+    trust anchor --store /root/c1_data/server1.xmpp.crt
 else
     cp -r /root/c2_data/profanity/* /root/.local/share/profanity/
     echo "172.31.0.112 server2.xmpp" >> /etc/hosts
-    cp /root/c2_data/server2.xmpp.crt /usr/local/share/ca-certificates/
-    update-ca-certificates
+    trust anchor --store /root/c2_data/server2.xmpp.crt
 fi

.circleci/setup/muc/setup_client.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -xe
+
+# Set up the profanity account
+cp -r /root/muc/client_${CLIENT_ID}_data/profanity/* /root/.local/share/profanity/
+
+# Add DNS records for the xmpp and muc servers
+echo "172.30.0.110 muc_server.xmpp" >> /etc/hosts
+echo "172.30.0.110 conference.muc_server.xmpp" >> /etc/hosts
+
+# Install the server certificate
+trust anchor --store /root/muc/server/ssl/muc_server.xmpp.crt

.circleci/setup/muc/start_server.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -ex
+BASE=$(dirname $0)
+cd $BASE
+
+./wait_for_db.sh
+
+# create database
+echo "GRANT ALL ON jackal.* TO 'jackal'@ IDENTIFIED BY 'password';" | mysql -h mysql_host -u root -ppassword
+echo "CREATE DATABASE jackal;" | mysql -h mysql_host -u jackal -ppassword
+
+# load user data
+mysql -h mysql_host -D jackal -u jackal -ppassword < muc_data.sql
+
+# start jackal
+./jackal -c muc_jackal.yml </dev/null &> jackal.stdout &

.circleci/setup/wait_for_db.sh

@@ -7,7 +7,7 @@ counter=1
 while ! mysql --protocol TCP -h mysql_host -u root -ppassword -e "show databases;" > /dev/null 2>&1; do
     sleep 1
     ((counter++))
-    if [ $counter -gt 10 ]; then
+    if [ $counter -gt 60 ]; then
         >&2 echo "We have been waiting for MySQL too long already; failing."
         exit 1
     fi

.circleci/testdata/muc/client_admin_data/muc_server.xmpp.crt

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyDCCAzCgAwIBAgIUEMCpBI00Dsni3OXfXTQudKAdEO4wDQYJKoZIhvcNAQEL
+BQAwXzELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB3ByaXZhdGUxETAPBgNVBAcMCHBy
+b3ZpbmNlMQ0wCwYDVQQKDARjaXR5MRwwGgYDVQQDDBNtdWNfc2VydmVyLnhtcHAu
+a2V5MB4XDTIxMTAyNTE0MjIzMFoXDTIzMTAyNTE0MjIzMFowXzELMAkGA1UEBhMC
+VVMxEDAOBgNVBAgMB3ByaXZhdGUxETAPBgNVBAcMCHByb3ZpbmNlMQ0wCwYDVQQK
+DARjaXR5MRwwGgYDVQQDDBNtdWNfc2VydmVyLnhtcHAua2V5MIIBojANBgkqhkiG
+9w0BAQEFAAOCAY8AMIIBigKCAYEApPHgFN8g7OM6jpnC+VZyjG2jksDfwQ5lqB9y
+NjBwsunjN7cayUXeTWOzdZLtfCH4umDaAn0eTBocDLmAW8KoQoZ3wtvZ6XeybVHH
+I+zpbrm6he8dg4Raz04vfGCAjLE+0fWe2oS11gBhIgdXPPlMYRNd6M/Q5gVJHLNr
+IQa8OkHDOunjEfCOghm+T1LDsPO+P3aqVT57CXBPnIujZdsm3+fVF7lmqkdS/ED4
+8weUGPVhoPF3tn+u7xupAoHRAn0M6/+CuXB34BgLuj0KtArIDlSQpGROgRGVCg1d
+gPjAMJO476ZUIClk7r7WHDEBAnGfer1bm+6pqzEafK4JWZl+hOYHrRi77nwhmzNj
+H4ClwXEleLQERQRI/d2Dmv5zDAbZZ/jXte2ZVjhZ/5heCtlMMf/Q2/Wtb6BHi1GT
+jGInBsbU6M+jFLuTAUlnREIWg/c7HC1L0IpEk0nDEpRRrfQ4UI73vRFZ19IDhofR
+HlDmVjJHos1AnXdwkUmZKO+mrvC7AgMBAAGjfDB6MB0GA1UdDgQWBBQA4X+kZ1Ve
+84r/skjK0dMVNxDetTAfBgNVHSMEGDAWgBQA4X+kZ1Ve84r/skjK0dMVNxDetTAP
+BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIFoDAaBgNVHREEEzARgg9tdWNfc2Vy
+dmVyLnhtcHAwDQYJKoZIhvcNAQELBQADggGBAC9Z1AlaNod6XUJOT8EybUAzEslV
+6Np7NFgzDK5tfCNWDdYQyO3Yb5gTTA7kz+DIU0fff6QQaXkT6kMMh7WFtb2tc6Wi
+mq6fSJ2dolBP2/Cxv59LHEO54ZiMBRrpbaA+6HqGKPTJcWOx87iExZNvlb9gQPfz
+8jx55+7lix7+IVid2wAjCZ5UE6+0vseffkBNMJ3lxOAaNJO/kp10w5vG3yz7Q8Vh
+H4iategJ2PFPNGijHr5hdxa3zji6rojxDA4CyGH10VvxdZEsZnx4Moh+CfUCgsaC
+K3iUrNu1XMkyuROpYekVOdYMTVnkZ2jYhbFNzzm0awq11zk0Di8D71xfgsHVeIbo
+8IHeDeRJxMKcK1jYbjoskzvh/vTEZK0KOK8qw/RFxQj9XP0wEVS8b7M2qkEUQbBj
+5MZv36ruwcWYNUdXI945Ie4lLGrlO6ysQhqgZgny8LqwT69w4LFOvdG48Xx3OJ8J
+GDYeGv1DEU9LOiMlO45w1TGbyMS7fpKfVqLx6g==
+-----END CERTIFICATE-----

.circleci/testdata/muc/client_admin_data/profanity/accounts

@@ -0,0 +1,14 @@
+[bob]
+enabled=true
+jid=bob@muc_server.xmpp
+resource=profanity
+muc.nick=bob
+presence.last=online
+presence.login=online
+priority.online=0
+priority.chat=0
+priority.away=0
+priority.xa=0
+priority.dnd=0
+password=asdf
+script.start=admin_script

.circleci/testdata/muc/client_admin_data/profanity/scripts/admin_script

@@ -0,0 +1,2 @@
+/join [email protected]_server.xmpp
+/msg [email protected]_server.xmpp/alice Hi

.circleci/testdata/muc/client_owner_data/muc_server.xmpp.crt

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyDCCAzCgAwIBAgIUEMCpBI00Dsni3OXfXTQudKAdEO4wDQYJKoZIhvcNAQEL
+BQAwXzELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB3ByaXZhdGUxETAPBgNVBAcMCHBy
+b3ZpbmNlMQ0wCwYDVQQKDARjaXR5MRwwGgYDVQQDDBNtdWNfc2VydmVyLnhtcHAu
+a2V5MB4XDTIxMTAyNTE0MjIzMFoXDTIzMTAyNTE0MjIzMFowXzELMAkGA1UEBhMC
+VVMxEDAOBgNVBAgMB3ByaXZhdGUxETAPBgNVBAcMCHByb3ZpbmNlMQ0wCwYDVQQK
+DARjaXR5MRwwGgYDVQQDDBNtdWNfc2VydmVyLnhtcHAua2V5MIIBojANBgkqhkiG
+9w0BAQEFAAOCAY8AMIIBigKCAYEApPHgFN8g7OM6jpnC+VZyjG2jksDfwQ5lqB9y
+NjBwsunjN7cayUXeTWOzdZLtfCH4umDaAn0eTBocDLmAW8KoQoZ3wtvZ6XeybVHH
+I+zpbrm6he8dg4Raz04vfGCAjLE+0fWe2oS11gBhIgdXPPlMYRNd6M/Q5gVJHLNr
+IQa8OkHDOunjEfCOghm+T1LDsPO+P3aqVT57CXBPnIujZdsm3+fVF7lmqkdS/ED4
+8weUGPVhoPF3tn+u7xupAoHRAn0M6/+CuXB34BgLuj0KtArIDlSQpGROgRGVCg1d
+gPjAMJO476ZUIClk7r7WHDEBAnGfer1bm+6pqzEafK4JWZl+hOYHrRi77nwhmzNj
+H4ClwXEleLQERQRI/d2Dmv5zDAbZZ/jXte2ZVjhZ/5heCtlMMf/Q2/Wtb6BHi1GT
+jGInBsbU6M+jFLuTAUlnREIWg/c7HC1L0IpEk0nDEpRRrfQ4UI73vRFZ19IDhofR
+HlDmVjJHos1AnXdwkUmZKO+mrvC7AgMBAAGjfDB6MB0GA1UdDgQWBBQA4X+kZ1Ve
+84r/skjK0dMVNxDetTAfBgNVHSMEGDAWgBQA4X+kZ1Ve84r/skjK0dMVNxDetTAP
+BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIFoDAaBgNVHREEEzARgg9tdWNfc2Vy
+dmVyLnhtcHAwDQYJKoZIhvcNAQELBQADggGBAC9Z1AlaNod6XUJOT8EybUAzEslV
+6Np7NFgzDK5tfCNWDdYQyO3Yb5gTTA7kz+DIU0fff6QQaXkT6kMMh7WFtb2tc6Wi
+mq6fSJ2dolBP2/Cxv59LHEO54ZiMBRrpbaA+6HqGKPTJcWOx87iExZNvlb9gQPfz
+8jx55+7lix7+IVid2wAjCZ5UE6+0vseffkBNMJ3lxOAaNJO/kp10w5vG3yz7Q8Vh
+H4iategJ2PFPNGijHr5hdxa3zji6rojxDA4CyGH10VvxdZEsZnx4Moh+CfUCgsaC
+K3iUrNu1XMkyuROpYekVOdYMTVnkZ2jYhbFNzzm0awq11zk0Di8D71xfgsHVeIbo
+8IHeDeRJxMKcK1jYbjoskzvh/vTEZK0KOK8qw/RFxQj9XP0wEVS8b7M2qkEUQbBj
+5MZv36ruwcWYNUdXI945Ie4lLGrlO6ysQhqgZgny8LqwT69w4LFOvdG48Xx3OJ8J
+GDYeGv1DEU9LOiMlO45w1TGbyMS7fpKfVqLx6g==
+-----END CERTIFICATE-----

.circleci/testdata/muc/client_owner_data/profanity/accounts

@@ -0,0 +1,14 @@
+[alice]
+enabled=true
+jid=alice@muc_server.xmpp
+resource=profanity
+muc.nick=alice
+presence.last=online
+presence.login=online
+priority.online=0
+priority.chat=0
+priority.away=0
+priority.xa=0
+priority.dnd=0
+password=asdf
+script.start=owner_script

.circleci/testdata/muc/client_owner_data/profanity/scripts/owner_script

@@ -0,0 +1,2 @@
+/logging chat on
+/join [email protected]_server.xmpp