Skip to content

Commit e8bd0e7

Browse files
ebozdumanharshavardhana
authored andcommitted
Adds debug code to diagnose Issue#755 (#758)
1 parent 7107c84 commit e8bd0e7

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

minio/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ def presigned_post_policy(self, post_policy):
14131413
('eq', '$x-amz-credential', credential_string),
14141414
]
14151415
if self._session_token:
1416-
policy.add(('eq', '$x-amz-security-token', self._session_token))
1416+
policy.append(('eq', '$x-amz-security-token', self._session_token))
14171417

14181418
post_policy_base64 = post_policy.base64(extras=policy)
14191419
signature = post_presign_signature(date, region,

tests/functional/tests.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,16 @@ def test_presigned_get_object_expiry_5sec(client, log_output):
12131213
presigned_get_object_url = client.presigned_get_object(bucket_name,
12141214
object_name,
12151215
timedelta(seconds=5))
1216+
1217+
log_output.args['presigned_get_object_url'] = presigned_get_object_url
1218+
12161219
response = _http.urlopen('GET', presigned_get_object_url)
1220+
1221+
log_output.args['response.status'] = response.status
1222+
log_output.args['response.reason'] = response.reason
1223+
log_output.args['response.headers'] = json.dumps(response.headers.__dict__)
1224+
log_output.args['response._body'] = response._body.decode('utf-8')
1225+
12171226
if response.status != 200:
12181227
raise ResponseError(response,
12191228
'GET',
@@ -1222,6 +1231,12 @@ def test_presigned_get_object_expiry_5sec(client, log_output):
12221231
# Wait for 5 seconds for the presigned url to expire
12231232
time.sleep(5)
12241233
response = _http.urlopen('GET', presigned_get_object_url)
1234+
1235+
log_output.args['response.status-2'] = response.status
1236+
log_output.args['response.reason-2'] = response.reason
1237+
log_output.args['response.headers-2'] = json.dumps(response.headers.__dict__)
1238+
log_output.args['response._body-2'] = response._body.decode('utf-8')
1239+
12251240
# Success with an expired url is considered to be a failure
12261241
if response.status == 200:
12271242
raise ValueError('Presigned get url failed to expire!')
@@ -1262,9 +1277,21 @@ def test_presigned_get_object_response_headers(client, log_output):
12621277
object_name,
12631278
timedelta(seconds=5),
12641279
response_headers)
1280+
log_output.args['presigned_get_object_url'] = presigned_get_object_url
1281+
12651282
response = _http.urlopen('GET', presigned_get_object_url)
12661283
returned_content_type = response.headers['Content-Type']
12671284
returned_content_language = response.headers['Content-Language']
1285+
1286+
log_output.args['response.status'] = response.status
1287+
log_output.args['response.reason'] = response.reason
1288+
log_output.args['response.headers'] = json.dumps(response.headers.__dict__)
1289+
log_output.args['response._body'] = response._body.decode('utf-8')
1290+
log_output.args['returned_content_type'] = returned_content_type
1291+
log_output.args['content_type'] = content_type
1292+
log_output.args['returned_content_language'] = returned_content_language
1293+
log_output.args['content_language'] = content_language
1294+
12681295
if response.status != 200 or returned_content_type != content_type or\
12691296
returned_content_language != content_language:
12701297
raise ResponseError(response,

0 commit comments

Comments
 (0)