Skip to content

Fix for utf-8 URLs and for URLs with multiple instance of the same param #66

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.

Sign up for GitHub

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

Closed
Guillaumito wants to merge 3 commits into from
Closed

Fix for utf-8 URLs and for URLs with multiple instance of the same param #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c628208
Encode parse_qs input in utf-8 so we make sure the output will be
Apr 13, 2011
27d1366
Modified _split_url_string to handle multiple instances of the
Apr 13, 2011
cb87298
Fixed double decoding of url parameters.
Guillaumito Jan 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions oauth2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def to_url(self):
except AttributeError:
# must be python <2.5
query = base_url[4]
query = parse_qs(query)
query = parse_qs(query.encode('utf-8'))
for k, v in self.items():
query.setdefault(k, []).append(v)

Expand Down Expand Up @@ -469,7 +469,7 @@ def get_normalized_parameters(self):
# Include any query string parameters from the provided URL
query = urlparse.urlparse(self.url)[4]

url_items = self._split_url_string(query).items()
url_items = self._split_url_string(query)
url_items = [(to_utf8(k), to_utf8(v)) for k, v in url_items if k != 'oauth_signature' ]
items.extend(url_items)

Expand Down Expand Up @@ -606,9 +606,11 @@ def _split_header(header):
@staticmethod
def _split_url_string(param_str):
"""Turn URL string into parameters."""
parameters = parse_qs(param_str.encode('utf-8'), keep_blank_values=True)
for k, v in parameters.iteritems():
parameters[k] = urllib.unquote(v[0])
parsed = parse_qs(param_str.encode('utf-8'), keep_blank_values=True)
parameters = []
for k, v in parsed.iteritems():
for w in v:
parameters.append((k, w))
return parameters


Expand Down
10 changes: 9 additions & 1 deletion tests/test_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ def test_from_request(self):

exp = parse_qs(qs, keep_blank_values=False)
for k, v in exp.iteritems():
exp[k] = urllib.unquote(v[0])
exp[k] = v[0]

self.assertEquals(exp, req.copy())

Expand Down Expand Up @@ -924,6 +924,14 @@ def test_from_consumer_and_token(self):
self.assertEquals(req['oauth_consumer_key'], con.key)
self.assertEquals(tok.verifier, req['oauth_verifier'])

def test_split_url_string(self):
param_str = u"foo=bar&bar=édulcoré&baz=%25de"

params = oauth.Request._split_url_string(param_str)
params.sort()
self.assertEquals(params, [('bar', 'édulcoré'), ('baz', '%de'), ('foo', 'bar')])


class SignatureMethod_Bad(oauth.SignatureMethod):
name = "BAD"

Expand Down