Merge branch 'dev'

KnugiHK · KnugiHK · commit 7e2430978948 · 2023-03-07T15:07:04.000+08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2
@@ -25,12 +25,14 @@ jobs:
       run: |
         sudo apt install build-essential python3-dev libffi-dev \
                          sqlite3 libssl-dev libjpeg-dev libxslt1-dev \
-                         python3-venv libyaml-dev
+                         python3-venv libyaml-dev -y
                      
-        mkdir -p synapse_test
-        python3 -m venv synapse_test/env
-        source synapse_test/env/bin/activate
-        pip install --upgrade pip setuptools wheel flake8 pytest matrix-synapse pytest-rerunfailures .
+        if [ ! -d synapse_test ]; then
+            mkdir -p synapse_test
+            python3 -m venv synapse_test/env
+            source synapse_test/env/bin/activate
+            pip install --upgrade flake8 pytest matrix-synapse .
+        fi
         cd synapse_test
         python -m synapse.app.homeserver \
             --server-name localhost \
@@ -42,18 +44,24 @@ jobs:
         sudo wget -qO /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/$latest_yq/yq_linux_amd64" && sudo chmod +x /usr/bin/yq
 
         # Enable server notices
-        sed -i '/#server_notices:/s/^#//' homeserver.yaml
-        sed -i '/#  system_mxid_localpart: notices/s/^#//' homeserver.yaml
-        sed -i '/#  system_mxid_display_name: "Server Notices"/s/^#//' homeserver.yaml
-        sed -i '/#  system_mxid_avatar_url:.*/s/^#//' homeserver.yaml
-        sed -i '/#  room_name: "Server Notices"/s/^#//' homeserver.yaml
-        yq e -i '.rc_login.address.per_second = 0.1' homeserver.yaml
-        yq e -i '.rc_login.address.burst_count = 20' homeserver.yaml
-        yq e -i '.rc_login.account.per_second = 0.1' homeserver.yaml
-        yq e -i '.rc_login.account.burst_count = 20' homeserver.yaml
-        yq e -i '.rc_login.failed_attempts.per_second = 0.1' homeserver.yaml
-        yq e -i '.rc_login.failed_attempts.burst_count = 20' homeserver.yaml
-        echo -e "experimental_features:\n groups_enabled: true" >> homeserver.yaml
+        cat << EOF >> homeserver.yaml
+
+        server_notices:
+          system_mxid_localpart: notices
+          system_mxid_display_name: "Server Notices"
+          system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ"
+          room_name: "Server Notices"
+        rc_login:
+          address:
+            per_second: 0.1
+            burst_count: 20
+          account:
+            per_second: 0.1
+            burst_count: 20
+          failed_attempts:
+            per_second: 0.1
+            burst_count: 20
+        EOF
 
         synctl start
 
@@ -74,6 +82,7 @@ jobs:
         "initial_device_display_name":"Testing curl"}')
         echo "$login2" | grep -oP '(?<="access_token":").*?(?=")' > admin.token
         if [ ! -s admin.token ] | [ ! -s user.token ]; then
+            echo "Error in retrieving access tokens. Could there be a Synapse instance running?"
             synctl stop
             exit 2
         fi
@@ -87,4 +96,4 @@ jobs:
     - name: Unit test
       run: |
         source synapse_test/env/bin/activate
-        pytest -v --reruns 5
+        pytest -v
diff --git a/TODO.md b/TODO.md
@@ -20,3 +20,7 @@ This document describes what need to be changed or added due to the changes made
 ### 1.68.0
 1. Add an admin API endpoint to fetch messages within a particular window of time. ([#13672](https://github.com/matrix-org/synapse/issues/13672))
 2. Add an admin API endpoint to find a user based on their external ID in an auth provider. ([#13810](https://github.com/matrix-org/synapse/issues/13810))
+
+### 1.72.0
+1. Add an Admin API endpoint for user lookup based on third-party ID (3PID). Contributed by @ashfame. ([#14405](https://github.com/matrix-org/synapse/issues/14405))
+
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-httpx>=0.21.1
+httpx>=0.23.3
diff --git a/setup.py b/setup.py
@@ -23,6 +23,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Development Status :: 4 - Beta",
@@ -33,6 +34,6 @@
     ],
     python_requires='>=3.7',
     install_requires=[
-       'httpx>=0.21.1'
+       'httpx>=0.23.3'
     ]
 )
diff --git a/synapse_admin/base.py b/synapse_admin/base.py
@@ -27,6 +27,7 @@
 from datetime import datetime
 from getpass import getpass
 from pathlib import Path
+from stat import S_IREAD, S_IWRITE
 from typing import Tuple, Any, Union
 
 
@@ -395,6 +396,35 @@ def _save_config(
         }
         with open(self.config_path, 'w') as configfile:
             config.write(configfile)
+
+        if os.name == "nt":
+            import subprocess
+            command = (
+                "icacls <file> /reset && "
+                "icacls <file> /grant <user:permission> && "
+                "icacls <file> /inheritance:d && "
+                "icacls <file> /remove *S-1-1-0 *S-1-5-11 "
+                "*S-1-5-32-544 *S-1-5-32-545 *S-1-5-18"
+            ).split(" ")
+            # Handle space
+            command[7] = f"{os.getlogin()}:rw"
+            command[1] = command[5] = self.config_path
+            command[10] = command[14] = command[1]
+            result = subprocess.run(command, shell=True)
+            if result.returncode != 0:
+                print(
+                    "[WARN] Error occur while setting "
+                    "configurion file's permission."
+                )
+        else:
+            try:
+                os.chmod(self.config_path, S_IREAD ^ S_IWRITE)
+            except PermissionError:
+                print(
+                    "[WARN] Got permission denied while "
+                    "setting configurion file's permission."
+                )
+
         return True
 
     def modify_config(
diff --git a/synapse_admin/management.py b/synapse_admin/management.py
@@ -134,7 +134,7 @@ def announce(
             raise ValueError("Argument must be a non-empty str or True")
         if announcement is None and attachment is None:
             raise ValueError(
-                "You must at least specify"
+                "You must at least specify "
                 "announcement or attachment"
             )
         userid = self.validate_username(userid)
diff --git a/synapse_admin/media.py b/synapse_admin/media.py
@@ -377,6 +377,7 @@ def delete_local_media(
         Returns:
             str: the deletion is success or not
         """
+        # TODO: remove quarantine if needed
         if server_name is None:
             server_name = self.server_addr
         mediaid = self.extract_media_id(mediaid)
@@ -430,8 +431,8 @@ def delete_local_media_by_condition(
         resp = self.connection.request(
             "POST",
             self.admin_patterns(
-                f"/media/{server_name}/delete?before_ts="
-                f"{timestamp}&size_gt={size_gt}{optional_str}", 1
+                f"/media/delete?before_ts={timestamp}"
+                f"&size_gt={size_gt}{optional_str}", 1
             ),
             json={},
         )
diff --git a/testing_env.sh b/testing_env.sh
@@ -4,11 +4,12 @@ sudo apt install build-essential python3-dev libffi-dev \
                  sqlite3 libssl-dev libjpeg-dev libxslt1-dev \
                  python3-venv libyaml-dev -y
 
-mkdir -p synapse_test
-pip3 install --upgrade virtualenv
-python3 -m venv synapse_test/env
-source synapse_test/env/bin/activate
-pip install --upgrade pip setuptools wheel flake8 pytest matrix-synapse .
+if [ ! -d synapse_test ]; then
+	mkdir -p synapse_test
+	python3 -m venv synapse_test/env
+	source synapse_test/env/bin/activate
+	pip install --upgrade flake8 pytest matrix-synapse .
+fi
 cd synapse_test
 python -m synapse.app.homeserver \
     --server-name localhost \
@@ -21,18 +22,24 @@ latest_yq=$(wget -qO- https://github.com/mikefarah/yq/releases/latest | egrep -o
 sudo wget -qO /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/$latest_yq/yq_linux_amd64" && sudo chmod +x /usr/bin/yq
 
 # Enable server notices
-sed -i '/#server_notices:/s/^#//' homeserver.yaml
-sed -i '/#  system_mxid_localpart: notices/s/^#//' homeserver.yaml
-sed -i '/#  system_mxid_display_name: "Server Notices"/s/^#//' homeserver.yaml
-sed -i '/#  system_mxid_avatar_url:.*/s/^#//' homeserver.yaml
-sed -i '/#  room_name: "Server Notices"/s/^#//' homeserver.yaml
-yq e -i '.rc_login.address.per_second = 0.1' homeserver.yaml
-yq e -i '.rc_login.address.burst_count = 20' homeserver.yaml
-yq e -i '.rc_login.account.per_second = 0.1' homeserver.yaml
-yq e -i '.rc_login.account.burst_count = 20' homeserver.yaml
-yq e -i '.rc_login.failed_attempts.per_second = 0.1' homeserver.yaml
-yq e -i '.rc_login.failed_attempts.burst_count = 20' homeserver.yaml
-echo -e "experimental_features:\n groups_enabled: true" >> homeserver.yaml
+cat << EOF >> homeserver.yaml
+
+server_notices:
+  system_mxid_localpart: notices
+  system_mxid_display_name: "Server Notices"
+  system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ"
+  room_name: "Server Notices"
+rc_login:
+  address:
+    per_second: 0.1
+    burst_count: 20
+  account:
+    per_second: 0.1
+    burst_count: 20
+  failed_attempts:
+    per_second: 0.1
+    burst_count: 20
+EOF
 
 
 synctl start
@@ -54,6 +61,7 @@ login2=$(curl -s 'http://localhost:8008/_matrix/client/r0/login' --compressed \
 "initial_device_display_name":"Testing curl"}')
 echo "$login2" | grep -oP '(?<="access_token":").*?(?=")' > admin.token
 if [ ! -s admin.token ] | [ ! -s user.token ]; then
+    echo "Error in retrieving access tokens. Could there be a Synapse instance running?"
     synctl stop
     exit 2
 fi
diff --git a/tests/test_1_user.py b/tests/test_1_user.py
@@ -324,9 +324,9 @@ def test_user_registration_tokens_lists():
         assert user_handler.registration_tokens.create()
     assert len(user_handler.registration_tokens.lists()) == 2
     assert user_handler.registration_tokens.create(
-        expiry_time=Utility.get_current_time(10)
+        expiry_time=Utility.get_current_time(3000)
     )
-    time.sleep(10)
+    time.sleep(5)
     assert len(user_handler.registration_tokens.lists(True)) == 2
     assert len(user_handler.registration_tokens.lists(False)) == 1
     assert len(user_handler.registration_tokens.lists()) == 3
@@ -358,7 +358,7 @@ def test_user_registration_tokens_create():
     )
     assert len(result["token"]) == 10
     assert result["uses_allowed"] == 10
-    expiry = Utility.get_current_time(10)
+    expiry = Utility.get_current_time(1000)
     result = user_handler.registration_tokens.create(
         expiry_time=expiry
     )
diff --git a/tests/test_2_management.py b/tests/test_2_management.py
@@ -138,28 +138,6 @@ def test_management_purge_history_status():
         mgt_handler.purge_history_status("invalid")
 
 
-def create_group():
-    resp = mgt_handler.connection.request(
-        "POST",
-        "/_matrix/client/r0/create_group",
-        {"localpart": "test1", "profile": {"name": "Test"}}
-    )
-    return resp.json().get("group_id", None)
-
-
-def test_management_delete_group():
-    groupid = create_group()
-    assert isinstance(groupid, str)
-    _groupid = groupid[1:].replace(":localhost", "")
-    assert mgt_handler.delete_group(_groupid)
-    assert test1_conn.request(
-        "GET",
-        f"/_matrix/client/r0/groups/{groupid}/summary"
-    ).status_code == 404
-    with pytest.raises(SynapseException):
-        mgt_handler.delete_group("+invalid:localhost")
-
-
 def test_management_background_updates_get():
     enabled, _ = mgt_handler.background_updates_get()
     assert enabled
@@ -178,10 +156,12 @@ def test_management_background_updates_set():
 def todo_test_management_federation_list():
     ...
 
+
 def test_management_reset_connection():
     with pytest.raises(SynapseException):
         mgt_handler.reset_connection("matrix.org")
 
+
 def test_management_federation_room():
     with pytest.raises(SynapseException):
         mgt_handler.federation_room("matrix.org", _dir="b")
diff --git a/tests/test_4_media.py b/tests/test_4_media.py
@@ -244,7 +244,7 @@ def test_media_delete_local_media_by_condition():
     deleted_media = media_id[-1]
     assert query_media(deleted_media).status_code == 200
 
-    delete_time = Utility.get_current_time() + 1000
+    delete_time = Utility.get_current_time(10000)
 
     assert media_handler.delete_local_media_by_condition(
         delete_time,
@@ -257,6 +257,8 @@ def test_media_delete_local_media_by_condition():
         10000000
     ) == []
 
+    media_handler.quarantine_remove(media_id[1])
+    media_handler.quarantine_remove(media_id[3])
     deletion = media_handler.delete_local_media_by_condition(delete_time)
     assert deletion.total == 2
     for media in media_id:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build-system]`
	`2`	`+requires = ["setuptools"]`
	`3`	`+build-backend = "setuptools.build_meta"`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ def announce(`
`134`	`134`	`raise ValueError("Argument must be a non-empty str or True")`
`135`	`135`	`if announcement is None and attachment is None:`
`136`	`136`	`raise ValueError(`
`137`		`- "You must at least specify"`
	`137`	`+ "You must at least specify "`
`138`	`138`	`"announcement or attachment"`
`139`	`139`	`)`
`140`	`140`	`userid = self.validate_username(userid)`