Skip to content

Commit

Permalink
fix #64
Browse files Browse the repository at this point in the history
  • Loading branch information
baiyubin2020 committed Sep 14, 2017
1 parent 13d43c9 commit a373fc3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion oss2/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Auth(object):
'response-expires', 'response-content-disposition', 'cors', 'lifecycle',
'restore', 'qos', 'referer', 'append', 'position', 'security-token',
'live', 'comp', 'status', 'vod', 'startTime', 'endTime', 'x-oss-process',
'symlink']
'symlink', 'callback', 'callback-var']
)

def __init__(self, access_key_id, access_key_secret):
Expand Down
21 changes: 21 additions & 0 deletions tests/test_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import requests
import filecmp
import calendar
import json
import base64

from oss2.exceptions import (ClientError, RequestError, NoSuchBucket,
NotFound, NoSuchKey, Conflict, PositionNotEqualToLength, ObjectNotAppendable)
Expand Down Expand Up @@ -317,6 +319,25 @@ def test_private_download_url(self):

resp = requests.get(url)
self.assertEqual(content, resp.content)

def test_sign_url_with_callback(self):
key = self.random_key()

# callback
callback_params = {}
callback_params['callbackUrl'] = 'http://cbsrv.demo.com'
callback_params['callbackBody'] = 'bucket=${bucket}&object=${object}'
encoded_callback = base64.b64encode(json.dumps(callback_params).strip())

# callback vars
callback_var_params = {'x:my_var1': 'my_val1', 'x:my_var2': 'my_val2'}
encoded_callback_var = base64.b64encode(json.dumps(callback_var_params).strip())

# put with callback
params = {'callback': encoded_callback, 'callback-var': encoded_callback_var}
url = self.bucket.sign_url('PUT', key, 60, params=params)
resp = requests.put(url)
self.assertEqual(resp.status_code, 203)

def test_copy_object(self):
source_key = self.random_key()
Expand Down

0 comments on commit a373fc3

Please sign in to comment.