Verify param in url

Sage-Bionetworks · Sep 27, 2024 · dea9244 · dea9244
1 parent 1918ec2
commit dea9244
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/synapseclient/core/download/download_functions.py b/synapseclient/core/download/download_functions.py
@@ -743,7 +743,10 @@ def _ftp_report_hook(
             )
 
             try:
-                url_has_expiration = "Expires" in urllib_urlparse.urlparse(url).query
+                url_query = urllib_urlparse.urlparse(url).query
+                url_has_expiration = (
+                    "Expires" in url_query and "X-Amz-Expires" in url_query
+                )
                 url_is_expired = False
                 if url_has_expiration:
                     url_is_expired = datetime.datetime.now(
@@ -773,8 +776,9 @@ def _ftp_report_hook(
                 exceptions._raise_for_status(response, verbose=client.debug)
             except SynapseHTTPError as err:
                 if err.response.status_code == 403:
+                    url_query = urllib_urlparse.urlparse(url).query
                     url_has_expiration = (
-                        "Expires" in urllib_urlparse.urlparse(url).query
+                        "Expires" in url_query and "X-Amz-Expires" in url_query
                     )
                     url_is_expired = False
                     if url_has_expiration: