Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use swiftclient.utils.generate_temp_url #80

Merged
merged 7 commits into from
Feb 11, 2017
Merged

Conversation

einarf
Copy link
Contributor

@einarf einarf commented Feb 8, 2017

Suggestion for #79

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

6 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 96.537% when pulling 043fabe on ZettaIO:temp-url into 157b1ca on blacktorn:master.

swift/storage.py Outdated
@@ -360,7 +361,8 @@ def _path(self, name):
path = urlparse.urlsplit(url).path
msg = ('%s\n%s\n%s' % (method, expires, path)).encode()
sig = hmac.new(self.temp_url_key, msg, sha1).hexdigest()
url = url + '?temp_url_sig=%s&temp_url_expires=%s' % (sig, expires)
tmp_path = generate_temp_url(path, expires, sig, method, absolute=True)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should not pass sig here, but self.temp_url_key, according to the docs.

@coveralls
Copy link

coveralls commented Feb 9, 2017

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling a35f437 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

swift/storage.py Outdated
@@ -357,11 +355,8 @@ def _path(self, name):
# Are we building a temporary url?
if self.use_temp_urls:
expires = int(time() + int(self.temp_url_duration))
method = 'GET'
path = urlparse.urlsplit(url).path
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be :

path = urlparse.unquote(urlparse.urlsplit(url).path)

..because name was quoted above (line 355).

@coveralls
Copy link

coveralls commented Feb 9, 2017

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 8d51d96 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 8d51d96 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 8d51d96 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 8d51d96 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

coveralls commented Feb 9, 2017

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 338c902 on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

coveralls commented Feb 9, 2017

Coverage Status

Coverage decreased (-0.05%) to 96.46% when pulling 4fa8fcc on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

coveralls commented Feb 9, 2017

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 12f49bf on ZettaIO:temp-url into 157b1ca on blacktorn:master.

4 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 12f49bf on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 12f49bf on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 12f49bf on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 12f49bf on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@einarf
Copy link
Contributor Author

einarf commented Feb 9, 2017

@Blacktorn This one is more than ready now 😃

@coveralls
Copy link

coveralls commented Feb 11, 2017

Coverage Status

Coverage increased (+1.3%) to 97.788% when pulling 9fa2f0c on ZettaIO:temp-url into 157b1ca on blacktorn:master.

@einarf
Copy link
Contributor Author

einarf commented Feb 11, 2017

@Blacktorn Once again ready for merge.

@dennisv dennisv merged commit e2618ea into dennisv:master Feb 11, 2017
Roadmaster added a commit to Roadmaster/django-storage-swift that referenced this pull request Jun 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants