diff options
| author | Idan Gazit <idan@gazit.me> | 2012-04-24 23:39:18 -0700 |
|---|---|---|
| committer | Idan Gazit <idan@gazit.me> | 2012-04-24 23:39:18 -0700 |
| commit | 29e9ff2188c0047d4ea1ac1c08b69fe2a6afabfc (patch) | |
| tree | 0ac5b7c80252eede470f6f86260763f103a1b839 | |
| parent | 4f3c81a194a725b7b9eea4ea6d9f663cf6b9c036 (diff) | |
| parent | 41576dbcd659dc09a042191d41f460f138b96102 (diff) | |
| download | oauthlib-29e9ff2188c0047d4ea1ac1c08b69fe2a6afabfc.tar.gz | |
Merge pull request #23 from calebbrown/bugs/broken_server
Fix the failing server tests.
| -rw-r--r-- | oauthlib/oauth1/rfc5849/__init__.py | 6 | ||||
| -rw-r--r-- | tests/oauth1/rfc5849/test_server.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/oauthlib/oauth1/rfc5849/__init__.py b/oauthlib/oauth1/rfc5849/__init__.py index abebe66..b10ff9c 100644 --- a/oauthlib/oauth1/rfc5849/__init__.py +++ b/oauthlib/oauth1/rfc5849/__init__.py @@ -308,8 +308,10 @@ class Server(object): signature_type=signature_type, verifier=verifier) - client_signature = oauth_client.get_oauth_signature(uri, - http_method=http_method, body=body, headers=headers) + request = Request(uri, http_method, body, headers) + request.oauth_params = params + + client_signature = oauth_client.get_oauth_signature(request) # FIXME: use near constant time string compare to avoid timing attacks return client_signature == request_signature diff --git a/tests/oauth1/rfc5849/test_server.py b/tests/oauth1/rfc5849/test_server.py index 73b29e5..cbb9357 100644 --- a/tests/oauth1/rfc5849/test_server.py +++ b/tests/oauth1/rfc5849/test_server.py @@ -38,7 +38,7 @@ class ServerTests(TestCase): resource_owner_secret=self.RESOURCE_OWNER_SECRET, ) - uri, body, headers = c.sign(u'http://server.example.com:80/init') + uri, headers, body = c.sign(u'http://server.example.com:80/init') s = self.TestServer() self.assertTrue(s.check_request_signature(uri, body=body, @@ -52,7 +52,7 @@ class ServerTests(TestCase): callback_uri=u'http://client.example.com/callback' ) - uri, body, headers = c.sign(u'http://server.example.com:80/init') + uri, headers, body = c.sign(u'http://server.example.com:80/init') s = self.TestServer() self.assertTrue(s.check_request_signature(uri, body=body, |