Merge lp:~ssweeny/friends/fix-lp1258657 into lp:friends

[Scott Sweeny]

Flickr: Fix oauth signing for a GET request.

According to [1] the base string for the OAuth signature must include all of the parameters, but oauthlib won't sign a GET request that includes a body. Instead pass the parameters as part of the URL.

[1] https://secure.flickr.com/services/api/auth.oauth.html

Flickr: Fix oauth signing for a GET request.

According to [1] the base string for the OAuth signature must include all of the parameters, but oauthlib won't sign a GET request that includes a body. Instead pass the parameters as part of the URL.

[1] https://secure.flickr.com/services/api/auth.oauth.html

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:253
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ssweeny/friends/fix-lp1258657/+merge/206650/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-trusty-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/friends-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-trusty-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-ci/57/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Buh. I've been putting this off because I was worried the fix would be harder than this (I forgot you could just do the urlencode before the signing, I thought I was going to have to tear up the Downloader class, and also oauthlib is generally a nightmare to deal with).

Thanks!

review: Approve

=== modified file 'friends/protocols/flickr.py'
--- friends/protocols/flickr.py	2013-06-18 22:00:44 +0000
+++ friends/protocols/flickr.py	2014-02-17 03:59:18 +0000
@@ -25,6 +25,8 @@
 import time
 import logging
 
+from urllib.parse import urlencode
+
 from friends.utils.base import Base, feature
 from friends.utils.http import Downloader, Uploader
 from friends.utils.time import iso8601utc, parsetime
@@ -65,8 +67,7 @@
         method = 'GET'
         headers = self._get_oauth_headers(
             method=method,
-            url=REST_SERVER,
-            data=params or {},
+            url='{}?{}'.format(REST_SERVER, urlencode(params)),
             )
 
         response = Downloader(