From bbf65028e5bb1a302e32bbc4adceca206be3bc8a Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Wed, 2 Aug 2023 09:28:20 +0000
Subject: [PATCH] Add test to verify HTTP OPTIONS on presigned URL

Related: https://tracker.ceph.com/issues/62033

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit c0a1880d4cd3b7c7469edd5ba91def29d871e9c8)

Conflicts:
	s3tests_boto3/functional/test_s3.py: nose->pytest changes
(cherry picked from commit 8fb5d9a59c52adda9cc8172c96611398944be478)
---
 s3tests_boto3/functional/test_s3.py | 60 ++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py
index ff7453c..b6e3740 100644
--- a/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@ -3696,13 +3696,14 @@ def test_put_object_ifnonmatch_overwrite_existed_failed():
     body = _get_body(response)
     eq(body, 'bar')
 
-def _setup_bucket_object_acl(bucket_acl, object_acl):
+def _setup_bucket_object_acl(bucket_acl, object_acl, client=None):
     """
     add a foo key, and specified key and bucket acls to
     a (new or existing) bucket.
     """
+    if client is None:
+        client = get_client()
     bucket_name = get_new_bucket_name()
-    client = get_client()
     client.create_bucket(ACL=bucket_acl, Bucket=bucket_name)
     client.put_object(ACL=object_acl, Bucket=bucket_name, Key='foo')
 
@@ -3934,19 +3935,31 @@ def test_object_raw_authenticated_object_gone():
     eq(status, 404)
     eq(error_code, 'NoSuchKey')
 
+def _test_object_raw_get_x_amz_expires_not_expired(client):
+    bucket_name = _setup_bucket_object_acl('public-read', 'public-read', client=client)
+    params = {'Bucket': bucket_name, 'Key': 'foo'}
+
+    url = client.generate_presigned_url(ClientMethod='get_object', Params=params, ExpiresIn=100000, HttpMethod='GET')
+
+    res = requests.options(url, verify=get_config_ssl_verify()).__dict__
+    eq(res['status_code'], 400)
+
+    res = requests.get(url, verify=get_config_ssl_verify()).__dict__
+    eq(res['status_code'], 200)
+
 @attr(resource='object')
 @attr(method='get')
 @attr(operation='x-amz-expires check not expired')
 @attr(assertion='succeeds')
 def test_object_raw_get_x_amz_expires_not_expired():
-    bucket_name = _setup_bucket_object_acl('public-read', 'public-read')
-    client = get_client()
-    params = {'Bucket': bucket_name, 'Key': 'foo'}
+    _test_object_raw_get_x_amz_expires_not_expired(client=get_client())
 
-    url = client.generate_presigned_url(ClientMethod='get_object', Params=params, ExpiresIn=100000, HttpMethod='GET')
-
-    res = requests.get(url, verify=get_config_ssl_verify()).__dict__
-    eq(res['status_code'], 200)
+@attr(resource='object')
+@attr(method='get')
+@attr(operation='x-amz-expires check not expired')
+@attr(assertion='succeeds')
+def test_object_raw_get_x_amz_expires_not_expired_tenant():
+    _test_object_raw_get_x_amz_expires_not_expired(client=get_tenant_client())
 
 @attr(resource='object')
 @attr(method='get')
@@ -7550,6 +7563,35 @@ def test_cors_header_option():
 
     _cors_request_and_check(requests.options, obj_url, {'Origin': 'example.origin','Access-Control-Request-Headers':'x-amz-meta-header2','Access-Control-Request-Method':'GET'}, 403, None, None)
 
+def _test_cors_options_presigned_get_object(client):
+    bucket_name = _setup_bucket_object_acl('public-read', 'public-read', client=client)
+    params = {'Bucket': bucket_name, 'Key': 'foo'}
+
+    url = client.generate_presigned_url(ClientMethod='get_object', Params=params, ExpiresIn=100000, HttpMethod='GET')
+
+    res = requests.options(url, verify=get_config_ssl_verify()).__dict__
+    eq(res['status_code'], 400)
+
+    allowed_methods = ['GET']
+    allowed_origins = ['example']
+
+    cors_config ={
+        'CORSRules': [
+            {'AllowedMethods': allowed_methods,
+             'AllowedOrigins': allowed_origins,
+            },
+        ]
+    }
+
+    client.put_bucket_cors(Bucket=bucket_name, CORSConfiguration=cors_config)
+    _cors_request_and_check(requests.options, url, {'Origin': 'example', 'Access-Control-Request-Method': 'GET'}, 200, 'example', 'GET')
+
+def test_cors_presigned_get_object():
+    _test_cors_options_presigned_get_object(client=get_client())
+
+def test_cors_presigned_get_object_tenant():
+    _test_cors_options_presigned_get_object(client=get_tenant_client())
+
 @attr(resource='bucket')
 @attr(method='put')
 @attr(operation='put tags')