Matrix v2

README.md

@@ -37,4 +37,4 @@ sudo yunohost app upgrade synapse -u https://github.com/YunoHost-Apps/synapse_yn
 
 ### 📚 App packaging documentation
 
-Please see <https://doc.yunohost.org/packaging_apps> for more information.
+Please see <https://doc.yunohost.org/packaging_apps> for more information.

auto_update/auto_update.sh

@@ -20,11 +20,14 @@ json_str = json.dumps(loaded_toml)
 print(json_str)
 EOL
     )
-    echo $result | jq -r "$1"
+    echo "$result" | jq -r "$1"
 }
 
 check_app_version() {
-    local app_remote_version=$(curl 'https://api.github.com/repos/element-hq/synapse/releases/latest' -H 'Host: api.github.com' --compressed | jq -r ".tag_name" | cut -dv -f2)
+    local app_remote_version
+    app_remote_version=$(curl 'https://api.github.com/repos/element-hq/synapse/releases/latest' -H 'Host: api.github.com' --compressed | jq -r ".tag_name" | cut -dv -f2)
+    lk_jwt_version=$(curl 'https://api.github.com/repos/element-hq/lk-jwt-service/releases/latest' -H 'Host: api.github.com' --compressed | jq -r ".tag_name" | cut -dv -f2)
+    livekit_version=$(curl 'https://api.github.com/repos/livekit/livekit/releases/latest' -H 'Host: api.github.com' --compressed | jq -r ".tag_name" | cut -dv -f2)
 
     ## Check if new build is needed
     if [[ "$app_version" != "$app_remote_version" ]]
@@ -39,6 +42,8 @@ check_app_version() {
 upgrade_app() {
     (
         set -eu
+        local new_checksum
+        local prev_checksum
 
         # Define output file name
         # arm build: ${result_prefix_name_deb_1}-bin1_armv7l.tar.gz
@@ -48,29 +53,48 @@ upgrade_app() {
         readonly result_prefix_name_deb_2="matrix-synapse_${app_version}-$debian_version_name_2"
 
         # Build armv7 build
-        build_cmd_deb_1 $app_version $result_prefix_name_deb_1
-        build_cmd_deb_2 $app_version $result_prefix_name_deb_2
+        build_cmd_deb_1 "$app_version" "$result_prefix_name_deb_1"
+        build_cmd_deb_2 "$app_version" "$result_prefix_name_deb_2"
         push_armv7_build
 
         # Update python requirement
         cp "$build_result_path_deb_1/${result_prefix_name_deb_1}"-build1_requirement.txt ../conf/requirement_"$debian_version_name_1".txt
         cp "$build_result_path_deb_2/${result_prefix_name_deb_2}"-build1_requirement.txt ../conf/requirement_"$debian_version_name_2".txt
 
         # Update manifest
-        sed -r -i 's|version = "[[:alnum:].]{4,8}~ynh[[:alnum:].]{1,2}"|version = "'${app_version}'~ynh1"|' ../manifest.toml
+        sed -r -i 's|version = "[[:alnum:].]{4,8}~ynh[[:alnum:].]{1,2}"|version = "'"${app_version}"'~ynh1"|' ../manifest.toml
 
-        # Update this link
+        # Update synapse link
         sed -r -i "s|armhf.url\s*=(.*)/releases/download/v[[:alnum:].]{4,10}/matrix-synapse_[[:alnum:].]{4,10}-$debian_version_name_1-bin[[:digit:]]_armv7l.tar.gz|armhf.url =\1/releases/download/v${app_version}/matrix-synapse_${app_version}-$debian_version_name_1-bin1_armv7l.tar.gz|"  ../manifest.toml
-        sed -r -i "s|armhf.url\s*=(.*)/releases/download/v[[:alnum:].]{4,10}/matrix-synapse_[[:alnum:].]{4,10}-$debian_version_name_2-bin[[:digit:]]_armv7l.tar.gz|armhf.url =\1/releases/download/v${app_version}/matrix-synapse_${app_version}-$debian_version_name_2-bin1_armv7l.tar.gz|"  ../manifest.toml
+        sed -r -i "s|armhf.url\s*=(.*)/releases/download/v[[:alnum:].]{4,10}/matrix-synapse_[[:alnum:].]{4,10}-$debian_version_name_2-bin[[:digit:]]_armv7l\.tar\.gz|armhf.url =\1/releases/download/v${app_version}/matrix-synapse_${app_version}-$debian_version_name_2-bin1_armv7l.tar.gz|"  ../manifest.toml
 
-        # Update checksum
-        sha256sum_arm_archive_deb_1=$(cat $build_result_path_deb_1/${result_prefix_name_deb_1}-bin1_armv7l-sha256.txt)
-        sha256sum_arm_archive_deb_2=$(cat $build_result_path_deb_2/${result_prefix_name_deb_2}-bin1_armv7l-sha256.txt)
+        # Update synapse link checksum
+        sha256sum_arm_archive_deb_1=$(cat "$build_result_path_deb_1/${result_prefix_name_deb_1}-bin1_armv7l-sha256.txt")
+        sha256sum_arm_archive_deb_2=$(cat "$build_result_path_deb_2/${result_prefix_name_deb_2}-bin1_armv7l-sha256.txt")
         prev_sha256sum_arm_archive_deb_1=$(get_from_manifest ".resources.sources.${app_name}_prebuilt_armv7_$debian_version_name_1.armhf.sha256")
         prev_sha256sum_arm_archive_deb_2=$(get_from_manifest ".resources.sources.${app_name}_prebuilt_armv7_$debian_version_name_2.armhf.sha256")
         sed -r -i "s|$prev_sha256sum_arm_archive_deb_1|$sha256sum_arm_archive_deb_1|" ../manifest.toml
         sed -r -i "s|$prev_sha256sum_arm_archive_deb_2|$sha256sum_arm_archive_deb_2|" ../manifest.toml
 
+        # Update lk-jwt
+        wget -O archive.tar.gz "https://github.com/element-hq/lk-jwt-service/archive/refs/tags/v${lk_jwt_version}.tar.gz"
+        new_checksum=$(sha256sum archive.tar.gz | cut -d' ' -f1)
+        rm archive.tar.gz
+
+        sed -r -i "s|url\s*=(.*)/element-hq/lk-jwt-service/archive/refs/tags/v[[:alnum:].]{4,10}\.tar\.gz|url =\1/element-hq/lk-jwt-service/archive/refs/tags/v${lk_jwt_version}.tar.gz|"  ../manifest.toml
+        prev_checksum=$(get_from_manifest ".resources.sources.lk_jwt.sha256")
+        sed -r -i "s|$prev_checksum|$new_checksum|" ../manifest.toml
+
+        # Update livekit
+        wget -O checksums.txt "https://github.com/livekit/livekit/releases/download/v${livekit_version}/checksums.txt"
+        for arch in amd64 arm64 armhf; do
+            sed -r -i "s|${arch}\.url\s*=(.*)/livekit/livekit/releases/download/v[[:alnum:].]{4,10}/livekit_[[:alnum:].]{4,10}_linux_${arch}.tar.gz|${arch}.url =\1/livekit/livekit/releases/download/v${livekit_version}/livekit_${livekit_version}_linux_${arch}.tar.gz|"  ../manifest.toml
+            prev_checksum="$(get_from_manifest ".resources.sources.livekit.${arch}.sha256")"
+            new_checksum="$(grep -F "livekit_${livekit_version}_linux_${arch}.tar.gz" checksums.txt | cut -d' ' -f1)"
+            sed -r -i "s|$prev_checksum|$new_checksum|" ../manifest.toml
+        done
+        rm checksums.txt
+
         git commit -a -m "Upgrade $app_name to $app_version"
         git push gitea auto_update:auto_update
     ) 2>&1 | tee "${app_name}_build_temp.log"

conf/homeserver.yaml

@@ -84,7 +84,6 @@ allow_public_rooms_over_federation: {{ allow_public_rooms_over_federation }}
 # Note: The value is ignored when an HTTP proxy is in use
 #
 ip_range_blacklist:
- - '127.0.0.0/8'
  - '10.0.0.0/8'
  - '172.16.0.0/12'
  - '192.168.0.0/16'
@@ -97,12 +96,15 @@ ip_range_blacklist:
  - '198.51.100.0/24'
  - '203.0.113.0/24'
  - '224.0.0.0/4'
- - '::1/128'
  - 'fe80::/10'
  - 'fc00::/7'
  - '2001:db8::/32'
  - 'ff00::/8'
  - 'fec0::/10'
+{%- if allow_to_send_request_to_localhost != 'true' %}
+ - '127.0.0.0/8'
+ - '::1/128'
+{% endif %}
 
 # List of ports that Synapse should listen on, their purpose and their
 # configuration.
@@ -717,7 +719,7 @@ sso:
     # By default, this list contains only the login fallback page.
     #
     client_whitelist:
-{%- for domain in domain_whitelist_client.splitlines() %}
+{%- for domain in domains_list.splitlines() %}
       - {{ domain }}
 {%- endfor %}
 
@@ -1004,3 +1006,30 @@ encryption_enabled_by_default_for_room_type: {{ e2e_enabled_by_default }}
 # Uncomment to allow non-server-admin users to create groups on this server
 #
 enable_group_creation: {{ enable_group_creation }}
+
+#
+# Used for element call
+#
+experimental_features:
+    # MSC3266: Room summary API. Used for knocking over federation
+    msc3266_enabled: true
+    # MSC4222: needed for syncv2 state_after. This allows clients to
+    # correctly track the state of the room.
+    msc4222_enabled: true
+    # MSC4140: Delayed events are required for proper call participation signalling. If disabled it is very likely that you end up with stuck calls in Matrix rooms
+    msc4140_enabled: true
+
+# The maximum allowed duration by which sent events can be delayed, as
+# per MSC4140.
+max_event_delay_duration: 24h
+
+rc_message:
+  # This needs to match at least e2ee key sharing frequency plus a bit of headroom
+  # Note key sharing events are bursty
+  per_second: 0.5
+  burst_count: 30
+  # This needs to match at least the heart-beat frequency plus a bit of headroom
+  # Currently the heart-beat is every 5 seconds which translates into a rate of 0.2s
+rc_delayed_event_mgmt:
+  per_second: 1
+  burst_count: 20