Merge branch 'main' into anoa/stop_using_logging_context_directly

Author: anoadragon453

.github/workflows/test.yml

@@ -15,9 +15,12 @@ jobs:
       with:
         python-version: "3.x"
     - name: Run synapse
-      uses: michaelkaye/setup-matrix-synapse@v1.0.1
+      uses: michaelkaye/setup-matrix-synapse@v1.0.5
       with: 
-        uploadLogs: true
+        # This is turned off as it currently breaks runs. Can be re-enabled once
+        # `setup-matrix-synapse` updates its `@actions/artifact` to
+        # v2.x. See https://github.com/michaelkaye/setup-matrix-synapse/issues/102
+        uploadLogs: false
         httpPort: 8008
         customModules: "synapse-s3-storage-provider"
         customConfig: |
@@ -58,7 +61,7 @@ jobs:
         server_name=`echo $mxc | sed 's^mxc://\(.*\)/.*^\1^'`
         media_id=`echo $mxc | sed 's^mxc://.*/\(.*\)^\1^'`
         #Downloading uploaded file
-        curl -q -o round_trip http://127.0.0.1:8008/_matrix/media/v3/download/${server_name}/${media_id}/
+        curl -q -o round_trip -H "Authorization: Bearer $access_token" http://127.0.0.1:8008/_matrix/client/v1/media/download/${server_name}/${media_id}
         #Verify file against original
         diff round_trip s3_storage_provider.py
         #Verify file against minio data store

README.md

@@ -48,6 +48,15 @@ media_storage_providers:
     # to S3. Each thread manages a single connection. Default is 40.
     #
     #threadpool_size: 20
+
+    # Set request_checksum_calculation or response_checksum_validation. 
+    # Depending on your S3 provider you may need to set these values,
+    # especially if you are using a self-hosted system that does not
+    # support the functionality provided by AWS.
+    # Default is 'when_required'
+    # request_checksum_calculation: "when_supported" | "when_required"
+    # response_checksum_validation: "when_supported" | "when_required"
+    
 ```
 
 This module uses `boto3`, and so the credentials should be specified as

s3_storage_provider.py

@@ -22,6 +22,7 @@
 
 import boto3
 import botocore
+from botocore.config import Config
 
 from twisted.internet import defer, reactor
 from twisted.python.failure import Failure
@@ -79,6 +80,11 @@ def __init__(self, hs, config):
         if "session_token" in config:
             self.api_kwargs["aws_session_token"] = config["session_token"]
 
+        self.api_kwargs["config"] = Config(
+            response_checksum_validation=config.get("response_checksum_validation", "when_required"),
+            request_checksum_calculation=config.get("request_checksum_calculation", "when_required")
+        )
+
         self._s3_client = None
         self._s3_client_lock = threading.Lock()
 
@@ -153,13 +159,13 @@ def parse_config(config):
         }
 
         if "region_name" in config:
-            result["region_name"] = config["region_name"]
+            result["region_name"] = str(config["region_name"])
 
         if "endpoint_url" in config:
             result["endpoint_url"] = config["endpoint_url"]
 
         if "access_key_id" in config:
-            result["access_key_id"] = config["access_key_id"]
+            result["access_key_id"] = str(config["access_key_id"])
 
         if "secret_access_key" in config:
             result["secret_access_key"] = config["secret_access_key"]

scripts/s3_media_upload

@@ -415,15 +415,19 @@ def get_homeserver_db_conn(parser, homeserver_config_path):
         parser.error("%s is not valid yaml: %s" % (homeserver_config_path, e,))
 
     try:
-        database_name = homeserver_yaml["database"]["name"]
+        database_engine_name = homeserver_yaml["database"]["name"]
         database_args = homeserver_yaml["database"]["args"]
-        if database_name == "sqlite3":
-            synapse_db_conn = sqlite3.connect(database=database_args["database"])
+        if database_engine_name == "sqlite3":
+            database_path = database_args["database"]
+            synapse_db_conn = sqlite3.connect(database=database_path)
         else:
+            # Determine the database name. "database" is a deprecated form of
+            # the option name. See https://www.psycopg.org/docs/module.html
+            database_name = database_args.get("dbname", database_args["database"])
             synapse_db_conn = psycopg2.connect(
                 user=database_args["user"],
                 password=database_args["password"],
-                database=database_args["database"],
+                database=database_name,
                 host=database_args["host"],
                 port=database_args["port"],
             )