1
=== added file '.bzrignore'
2
--- .bzrignore	1970-01-01 00:00:00 +0000
3
+++ .bzrignore	2012-05-21 13:12:18 +0000
4
@@ -0,0 +1,7 @@
5
1
__pycache__/
6
2
build/
7
3
dist/
8
4
*.egg-info/
9
5
10
6
MANIFEST
11
7
12
0
8
13
=== modified file 'COPYING'
14
--- COPYING	2009-08-28 18:58:58 +0000
15
+++ COPYING	2012-05-21 13:12:18 +0000
16
@@ -1,7 +1,7 @@
17
1
The MIT License
1
The MIT License
18
2
2
19
3
Copyright (c) 2007 Leah Culver
3
Copyright (c) 2007 Leah Culver
21
4
Copyright (c) 2009 Canonical, Ltd.
4
Copyright (c) 2009-2012 Canonical, Ltd.
22
5
5
23
6
Permission is hereby granted, free of charge, to any person obtaining a copy
6
Permission is hereby granted, free of charge, to any person obtaining a copy
24
7
of this software and associated documentation files (the "Software"), to deal
7
of this software and associated documentation files (the "Software"), to deal
25
8
8
26
=== modified file 'MANIFEST.in'
27
--- MANIFEST.in	2009-08-31 14:26:36 +0000
28
+++ MANIFEST.in	2012-05-21 13:12:18 +0000
29
@@ -1,1 +1,2 @@
30
1
include COPYING README
1
include COPYING README
31
2
include run-tests
32
2
3
33
=== modified file 'poauth/client.py'
34
--- poauth/client.py	2009-08-31 18:54:22 +0000
35
+++ poauth/client.py	2012-05-21 13:12:18 +0000
36
@@ -24,35 +24,46 @@
37
24
OAuth Client interface
24
OAuth Client interface
38
25
'''
25
'''
39
26
import random
26
import random
42
27
import urllib
27
43
28
import urlparse
28
quoteurl = None
44
29
parseurl = None
45
30
try:
46
31
    import urllib.parse
47
32
    quoteurl = urllib.parse.quote
48
33
    parseurl = urllib.parse.urlparse
49
34
except ImportError:
50
35
    import urllib
51
36
    import urlparse
52
37
    quoteurl = urllib.quote
53
38
    parseurl = urlparse.urlparse
54
29
39
55
30
from warnings import warn
40
from warnings import warn
56
31
41
57
42
58
32
def escape(s):
43
def escape(s):
59
33
    '''Escape a URL including any /.'''
44
    '''Escape a URL including any /.'''
61
34
    return urllib.quote(s, safe='~')
45
    return quoteurl(s, safe='~')
62
46
63
35
47
64
36
def generate_nonce(length=8):
48
def generate_nonce(length=8):
65
37
    '''Generate pseudorandom number.'''
49
    '''Generate pseudorandom number.'''
66
38
    return ''.join([str(random.randint(0, 9)) for i in range(length)])
50
    return ''.join([str(random.randint(0, 9)) for i in range(length)])
67
39
51
68
52
69
40
def _utf8_str(s):
53
def _utf8_str(s):
70
41
    """Convert unicode to utf-8."""
54
    """Convert unicode to utf-8."""
75
42
    if isinstance(s, unicode):
55
    return s.encode("utf-8")
76
43
        return s.encode("utf-8")
56
73
44
    else:
74
45
        return str(s)
77
46
57
78
47
class OAuthRequest(object):
58
class OAuthRequest(object):
79
48
    '''OAuthRequest represents the request and can be serialized.
59
    '''OAuthRequest represents the request and can be serialized.
80
49
60
81
50
    OAuth parameters:
61
    OAuth parameters:
83
51
        - oauth_consumer_key 
62
        - oauth_consumer_key
84
52
        - oauth_token
63
        - oauth_token
85
53
        - oauth_signature_method
64
        - oauth_signature_method
88
54
        - oauth_signature 
65
        - oauth_signature
89
55
        - oauth_timestamp 
66
        - oauth_timestamp
90
56
        - oauth_nonce
67
        - oauth_nonce
91
57
        - oauth_version
68
        - oauth_version
92
58
        ... any additional parameters, as defined by the Service Provider.
69
        ... any additional parameters, as defined by the Service Provider.
93
@@ -77,7 +88,7 @@
94
77
            self.parameters['oauth_verifier'] = self.verifier
88
            self.parameters['oauth_verifier'] = self.verifier
95
78
        if self.callback:
89
        if self.callback:
96
79
            self.parameters['oauth_callback'] = self.callback
90
            self.parameters['oauth_callback'] = self.callback
98
80
        
91
99
81
    def set_parameter(self, parameter, value):
92
    def set_parameter(self, parameter, value):
100
82
        self.parameters[parameter] = value
93
        self.parameters[parameter] = value
101
83
94
102
@@ -98,7 +109,7 @@
103
98
            pass
109
            pass
104
99
        # Escape key values before sorting.
110
        # Escape key values before sorting.
105
100
        key_values = [(escape(_utf8_str(k)), escape(_utf8_str(v))) \
111
        key_values = [(escape(_utf8_str(k)), escape(_utf8_str(v))) \
107
101
            for k,v in params.items()]
112
            for k, v in params.items()]
108
102
        # Sort lexicographically, first after key, then after value.
113
        # Sort lexicographically, first after key, then after value.
109
103
        key_values.sort()
114
        key_values.sort()
110
104
        # Combine key value pairs into a string.
115
        # Combine key value pairs into a string.
111
@@ -110,7 +121,7 @@
112
110
121
113
111
    def get_normalized_http_url(self):
122
    def get_normalized_http_url(self):
114
112
        """Parses the URL and rebuilds it to be scheme://host/path."""
123
        """Parses the URL and rebuilds it to be scheme://host/path."""
116
113
        parts = urlparse.urlparse(self.http_url)
124
        parts = parseurl(self.http_url)
117
114
        scheme, netloc, path = parts[:3]
125
        scheme, netloc, path = parts[:3]
118
115
        # Exclude default port numbers.
126
        # Exclude default port numbers.
119
116
        if scheme == 'http' and netloc[-3:] == ':80':
127
        if scheme == 'http' and netloc[-3:] == ':80':
120
@@ -135,7 +146,7 @@
121
135
        auth_header = 'OAuth realm="%s"' % realm
146
        auth_header = 'OAuth realm="%s"' % realm
122
136
        # Add the oauth parameters.
147
        # Add the oauth parameters.
123
137
        if self.parameters:
148
        if self.parameters:
125
138
            for k, v in self.parameters.iteritems():
149
            for k, v in self.parameters.items():
126
139
                if k.startswith('oauth_'):
150
                if k.startswith('oauth_'):
127
140
                    auth_header += ', %s="%s"' % (k, escape(str(v)))
151
                    auth_header += ', %s="%s"' % (k, escape(str(v)))
128
141
        return {'Authorization': auth_header}
152
        return {'Authorization': auth_header}
129
@@ -143,7 +154,7 @@
130
143
    def to_postdata(self):
154
    def to_postdata(self):
131
144
        """Serialize as post data for a POST request."""
155
        """Serialize as post data for a POST request."""
132
145
        return '&'.join(['%s=%s' % (escape(str(k)), escape(str(v))) \
156
        return '&'.join(['%s=%s' % (escape(str(k)), escape(str(v))) \
134
146
            for k, v in self.parameters.iteritems()])
157
            for k, v in self.parameters.items()])
135
147
158
136
148
    def to_url(self):
159
    def to_url(self):
137
149
        """Serialize as a URL for a GET request."""
160
        """Serialize as a URL for a GET request."""
138
@@ -193,7 +204,6 @@
139
193
        return OAuthRequest(token=token, *args, **newargs)
204
        return OAuthRequest(token=token, *args, **newargs)
140
194
205
141
195
206
142
196
143
197
class OAuthClient(object):
207
class OAuthClient(object):
144
198
    '''OAuthClient is a worker to attempt to execute a request.'''
208
    '''OAuthClient is a worker to attempt to execute a request.'''
145
199
209
146
200
210
147
=== modified file 'poauth/oauth.py'
148
--- poauth/oauth.py	2009-09-24 14:54:57 +0000
149
+++ poauth/oauth.py	2012-05-21 13:12:18 +0000
150
@@ -1,7 +1,7 @@
151
1
# The MIT License
1
# The MIT License
152
2
#
2
#
153
3
# Copyright (c) 2007 Leah Culver
3
# Copyright (c) 2007 Leah Culver
155
4
# Copyright (c) 2009 Canonical, Ltd.
4
# Copyright (c) 2009-2012 Canonical, Ltd.
156
5
#
5
#
157
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
158
7
# of this software and associated documentation files (the "Software"), to deal
7
# of this software and associated documentation files (the "Software"), to deal
159
@@ -20,13 +20,18 @@
160
20
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
161
21
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
162
22
# THE SOFTWARE.
22
# THE SOFTWARE.
166
23
'''
23
"""OAuth common interface."""
164
24
OAuth common interface
165
25
'''
167
26
import binascii
24
import binascii
168
27
import cgi
25
import cgi
169
28
import hmac
26
import hmac
171
29
import urllib
27
172
28
encodeurl = None
173
29
try:
174
30
    from urllib.parse import urlencode
175
31
    encodeurl = urlencode
176
32
except ImportError:
177
33
    import urllib
178
34
    encodeurl = urllib.urlencode
179
30
35
180
31
# For compatibility
36
# For compatibility
181
32
from poauth import client
37
from poauth import client
182
@@ -45,6 +50,7 @@
183
45
        self.key = key
50
        self.key = key
184
46
        self.secret = secret
51
        self.secret = secret
185
47
52
186
53
187
48
class OAuthToken(object):
54
class OAuthToken(object):
188
49
    '''
55
    '''
189
50
    OAuthToken is the data type for storing the token in memory.
56
    OAuthToken is the data type for storing the token in memory.
190
@@ -59,9 +65,9 @@
191
59
        '''
65
        '''
192
60
        Returns a form encoded string with the token and secret
66
        Returns a form encoded string with the token and secret
193
61
        '''
67
        '''
197
62
        return urllib.urlencode({'oauth_token': self.key,
68
        return encodeurl({'oauth_token': self.key,
198
63
                                 'oauth_token_secret': self.secret})
69
                          'oauth_token_secret': self.secret})
199
64
 
70
200
65
    @staticmethod
71
    @staticmethod
201
66
    def from_string(s):
72
    def from_string(s):
202
67
        '''
73
        '''
203
@@ -71,8 +77,8 @@
204
71
        params = cgi.parse_qs(s, keep_blank_values=False)
77
        params = cgi.parse_qs(s, keep_blank_values=False)
205
72
        key = params['oauth_token'][0]
78
        key = params['oauth_token'][0]
206
73
        secret = params['oauth_token_secret'][0]
79
        secret = params['oauth_token_secret'][0]
209
74
        verifier = params.get('oauth_verifier', [None])[0]
80
        # verifier = params.get('oauth_verifier', [None])[0]
210
75
        callback = params.get('oauth_callback', [None])[0]
81
        # callback = params.get('oauth_callback', [None])[0]
211
76
        return OAuthToken(key, secret)
82
        return OAuthToken(key, secret)
212
77
83
213
78
    def __str__(self):
84
    def __str__(self):
214
@@ -86,7 +92,8 @@
215
86
        """-> str."""
92
        """-> str."""
216
87
        raise NotImplementedError
93
        raise NotImplementedError
217
88
94
219
89
    def build_signature_base_string(self, oauth_request, oauth_consumer, oauth_token):
95
    def build_signature_base_string(self, oauth_request,
220
96
                                    oauth_consumer, oauth_token):
221
90
        """-> str key, str raw."""
97
        """-> str key, str raw."""
222
91
        raise NotImplementedError
98
        raise NotImplementedError
223
92
99
224
@@ -104,7 +111,7 @@
225
104
111
226
105
    def get_name(self):
112
    def get_name(self):
227
106
        return 'HMAC-SHA1'
113
        return 'HMAC-SHA1'
229
107
        
114
230
108
    def build_signature_base_string(self, oauth_request, consumer, token):
115
    def build_signature_base_string(self, oauth_request, consumer, token):
231
109
        sig = (
116
        sig = (
232
110
            escape(oauth_request.get_normalized_http_method()),
117
            escape(oauth_request.get_normalized_http_method()),
233
@@ -125,10 +132,11 @@
234
125
132
235
126
        # HMAC object.
133
        # HMAC object.
236
127
        try:
134
        try:
239
128
            import hashlib # 2.5
135
            import hashlib  # 2.5
240
129
            hashed = hmac.new(key, raw, hashlib.sha1)
136
            hashed = hmac.new(bytes(key.encode('ascii')),
241
137
                              bytes(raw.encode('ascii')), hashlib.sha1)
242
130
        except:
138
        except:
244
131
            import sha # Deprecated
139
            import sha  # Deprecated
245
132
            hashed = hmac.new(key, raw, sha)
140
            hashed = hmac.new(key, raw, sha)
246
133
        return hashed.digest()
141
        return hashed.digest()
247
134
142
248
135
143
249
=== modified file 'poauth/server.py'
250
--- poauth/server.py	2009-09-02 14:20:00 +0000
251
+++ poauth/server.py	2012-05-21 13:12:18 +0000
252
@@ -1,7 +1,7 @@
253
1
# The MIT License
1
# The MIT License
254
2
#
2
#
255
3
# Copyright (c) 2007 Leah Culver
3
# Copyright (c) 2007 Leah Culver
257
4
# Copyright (c) 2009 Canonical, Ltd.
4
# Copyright (c) 2009-2012 Canonical, Ltd.
258
5
#
5
#
259
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
260
7
# of this software and associated documentation files (the "Software"), to deal
7
# of this software and associated documentation files (the "Software"), to deal
261
@@ -20,14 +20,12 @@
262
20
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
263
21
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
264
22
# THE SOFTWARE.
22
# THE SOFTWARE.
269
23
'''
23
"""OAuth Server interface."""
266
24
OAuth Server interface
267
25
'''
268
26
import urlparse
270
27
24
271
28
from poauth.client import OAuthRequest
25
from poauth.client import OAuthRequest
272
29
from poauth.oauth import OAuthToken, OAUTH_VERSION
26
from poauth.oauth import OAuthToken, OAUTH_VERSION
273
30
27
274
28
275
31
class OAuthResponse(OAuthRequest):
29
class OAuthResponse(OAuthRequest):
276
32
    '''Class to manage OAuthServer response data.'''
30
    '''Class to manage OAuthServer response data.'''
277
33
31
278
@@ -38,12 +36,12 @@
279
38
        self.realm = kwargs.get('realm', None)
36
        self.realm = kwargs.get('realm', None)
280
39
        self.header = {}
37
        self.header = {}
281
40
        if self.status_code != 200:
38
        if self.status_code != 200:
283
41
            self.header = {'WWW-Authenticate' : 'OAuth realm="%s"' % self.realm}
39
            self.header = {'WWW-Authenticate': 'OAuth realm="%s"' % self.realm}
284
42
40
285
43
        self.callback = kwargs.pop('callback', None)
41
        self.callback = kwargs.pop('callback', None)
286
44
        if self.callback:
42
        if self.callback:
287
45
            self.status_code = 307
43
            self.status_code = 307
289
46
            self.header = {'Location' : self.callback}
44
            self.header = {'Location': self.callback}
290
47
45
291
48
        self.parameters = kwargs.get('parameters', {})
46
        self.parameters = kwargs.get('parameters', {})
292
49
        try:
47
        try:
293
@@ -55,7 +53,7 @@
294
55
    def headers(self):
53
    def headers(self):
295
56
        '''Return the set of headers to respond with.'''
54
        '''Return the set of headers to respond with.'''
296
57
        return self.header
55
        return self.header
298
58
        
56
299
59
57
300
60
class OAuthServer(object):
58
class OAuthServer(object):
301
61
    '''Class for building an OAuth server.'''
59
    '''Class for building an OAuth server.'''
302
@@ -80,7 +78,7 @@
303
80
                           'oauth_timestamp',
78
                           'oauth_timestamp',
304
81
                           'oauth_nonce',
79
                           'oauth_nonce',
305
82
                           'oauth_callback']
80
                           'oauth_callback']
307
83
        supported_params = ['oauth_version']
81
        # supported_params = ['oauth_version']
308
84
82
309
85
        bad_request = OAuthResponse(status=400, message="Bad Request",
83
        bad_request = OAuthResponse(status=400, message="Bad Request",
310
86
                                    realm=self.realm)
84
                                    realm=self.realm)
311
@@ -100,7 +98,7 @@
312
100
            response_params['oauth_callback_confirmed'] = 'true'
98
            response_params['oauth_callback_confirmed'] = 'true'
313
101
        else:
99
        else:
314
102
            try:
100
            try:
316
103
                parts = urlparse.urlparse(callback)
101
                # parts = urlparse.urlparse(callback)
317
104
                response_params['oauth_callback_confirmed'] = 'true'
102
                response_params['oauth_callback_confirmed'] = 'true'
318
105
            except:
103
            except:
319
106
                return bad_request
104
                return bad_request
320
@@ -142,7 +140,7 @@
321
142
                           'oauth_timestamp',
140
                           'oauth_timestamp',
322
143
                           'oauth_nonce',
141
                           'oauth_nonce',
323
144
                           'oauth_verifier']
142
                           'oauth_verifier']
325
145
        supported_params = ['oauth_version']
143
        # supported_params = ['oauth_version']
326
146
144
327
147
        parameters = request.parameters
145
        parameters = request.parameters
328
148
146
329
@@ -174,9 +172,7 @@
330
174
    def __validate_required_params(self, required_params, parameters):
172
    def __validate_required_params(self, required_params, parameters):
331
175
        '''Validate that all the required parameters are there.'''
173
        '''Validate that all the required parameters are there.'''
332
176
        for param in required_params:
174
        for param in required_params:
336
177
            try:
175
            if parameters.get(param, None) is None:
334
178
                exists = parameters[param]
335
179
            except KeyError:
337
180
                return False
176
                return False
338
181
        return True
177
        return True
339
182
178
340
183
179
341
=== modified file 'poauth/tests/test_client.py'
342
--- poauth/tests/test_client.py	2009-08-31 18:54:22 +0000
343
+++ poauth/tests/test_client.py	2012-05-21 13:12:18 +0000
344
@@ -1,7 +1,7 @@
345
1
#
1
#
346
2
# The MIT License
2
# The MIT License
347
3
#
3
#
349
4
# Copyright 2009 Canonical Ltd.
4
# Copyright 2009-2012 Canonical Ltd.
350
5
#
5
#
351
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
352
7
# of this software and associated documentation files (the "Software"), to deal
7
# of this software and associated documentation files (the "Software"), to deal
353
@@ -27,6 +27,7 @@
354
27
from poauth.oauth import OAuthConsumer, OAuthToken
27
from poauth.oauth import OAuthConsumer, OAuthToken
355
28
from poauth.client import OAuthRequest
28
from poauth.client import OAuthRequest
356
29
29
357
30
358
30
class OAuthRequestTests(unittest.TestCase):
31
class OAuthRequestTests(unittest.TestCase):
359
31
    '''Tests for OAuthRequest'''
32
    '''Tests for OAuthRequest'''
360
32
33
361
33
34
362
=== modified file 'poauth/tests/test_oauth.py'
363
--- poauth/tests/test_oauth.py	2009-09-24 14:54:57 +0000
364
+++ poauth/tests/test_oauth.py	2012-05-21 13:12:18 +0000
365
@@ -1,7 +1,7 @@
366
1
#
1
#
367
2
# The MIT License
2
# The MIT License
368
3
#
3
#
370
4
# Copyright 2009 Canonical Ltd.
4
# Copyright 2009-2012 Canonical Ltd.
371
5
#
5
#
372
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
373
7
# of this software and associated documentation files (the "Software"), to deal
7
# of this software and associated documentation files (the "Software"), to deal
374
@@ -27,6 +27,7 @@
375
27
from poauth import oauth
27
from poauth import oauth
376
28
from poauth.client import OAuthRequest
28
from poauth.client import OAuthRequest
377
29
29
378
30
379
30
class OAuthSignatureTests(unittest.TestCase):
31
class OAuthSignatureTests(unittest.TestCase):
380
31
    '''Tests for OAuthSignatureMethod'''
32
    '''Tests for OAuthSignatureMethod'''
381
32
33
382
@@ -37,15 +38,16 @@
383
37
                                    http_url='http://example.com/request',
38
                                    http_url='http://example.com/request',
384
38
                                    consumer=self.consumer,
39
                                    consumer=self.consumer,
385
39
                                    callback='oob')
40
                                    callback='oob')
386
41
387
40
    def test_PLAINTEXT(self):
42
    def test_PLAINTEXT(self):
388
41
        '''Test the PLAINTEXT signature method.'''
43
        '''Test the PLAINTEXT signature method.'''
389
42
        method = oauth.OAuthSignatureMethod_PLAINTEXT()
44
        method = oauth.OAuthSignatureMethod_PLAINTEXT()
391
43
        self.assertEquals('PLAINTEXT', method.get_name())
45
        self.assertEqual('PLAINTEXT', method.get_name())
392
44
        self.request.sign_request(method, self.consumer, None)
46
        self.request.sign_request(method, self.consumer, None)
395
45
        self.assertEquals(self.request.get_parameter('oauth_signature_method'),
47
        self.assertEqual(self.request.get_parameter('oauth_signature_method'),
396
46
                          'PLAINTEXT')
48
                         'PLAINTEXT')
397
47
        signature = self.request.get_parameter('oauth_signature')
49
        signature = self.request.get_parameter('oauth_signature')
399
48
        self.assertEquals('secret&', signature)
50
        self.assertEqual('secret&', signature)
400
49
        self.assertTrue(method.check_signature(self.request,
51
        self.assertTrue(method.check_signature(self.request,
401
50
                                               self.consumer, None,
52
                                               self.consumer, None,
402
51
                                               signature))
53
                                               signature))
403
@@ -53,10 +55,10 @@
404
53
    def test_HMACSHA1(self):
55
    def test_HMACSHA1(self):
405
54
        '''Test the HMAC-SHA1 signature method.'''
56
        '''Test the HMAC-SHA1 signature method.'''
406
55
        method = oauth.OAuthSignatureMethod_HMAC_SHA1()
57
        method = oauth.OAuthSignatureMethod_HMAC_SHA1()
408
56
        self.assertEquals('HMAC-SHA1', method.get_name())
58
        self.assertEqual('HMAC-SHA1', method.get_name())
409
57
        self.request.sign_request(method, self.consumer, None)
59
        self.request.sign_request(method, self.consumer, None)
412
58
        self.assertEquals(self.request.get_parameter('oauth_signature_method'),
60
        self.assertEqual(self.request.get_parameter('oauth_signature_method'),
413
59
                          'HMAC-SHA1')
61
                         'HMAC-SHA1')
414
60
        signature = self.request.get_parameter('oauth_signature')
62
        signature = self.request.get_parameter('oauth_signature')
415
61
        self.assertTrue(method.check_signature(self.request,
63
        self.assertTrue(method.check_signature(self.request,
416
62
                                               self.consumer, None,
64
                                               self.consumer, None,
417
@@ -64,9 +66,9 @@
418
64
        import binascii
66
        import binascii
419
65
        digest = method._build_digest(self.request, self.consumer, None)
67
        digest = method._build_digest(self.request, self.consumer, None)
420
66
68
422
67
        self.assertEquals(digest, binascii.a2b_base64(signature))
69
        self.assertEqual(digest, binascii.a2b_base64(signature))
423
68
70
424
69
    def test_RSASHA1(self):
71
    def test_RSASHA1(self):
425
70
        '''Test the RSA-SHA1 signature method.'''
72
        '''Test the RSA-SHA1 signature method.'''
426
71
        method = oauth.OAuthSignatureMethod_RSA_SHA1()
73
        method = oauth.OAuthSignatureMethod_RSA_SHA1()
428
72
        self.assertEquals('RSA-SHA1', method.get_name())
74
        self.assertEqual('RSA-SHA1', method.get_name())
429
73
75
430
=== modified file 'poauth/tests/test_server.py'
431
--- poauth/tests/test_server.py	2009-09-02 14:20:00 +0000
432
+++ poauth/tests/test_server.py	2012-05-21 13:12:18 +0000
433
@@ -1,7 +1,7 @@
434
1
#
1
#
435
2
# The MIT License
2
# The MIT License
436
3
#
3
#
438
4
# Copyright 2009 Canonical Ltd.
4
# Copyright 2009-2012 Canonical Ltd.
439
5
#
5
#
440
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
6
# Permission is hereby granted, free of charge, to any person obtaining a copy
441
7
# of this software and associated documentation files (the "Software"), to deal
7
# of this software and associated documentation files (the "Software"), to deal
442
@@ -29,6 +29,7 @@
443
29
from poauth.client import OAuthRequest
29
from poauth.client import OAuthRequest
444
30
from poauth.server import OAuthServer, OAuthStorage, OAuthResponse
30
from poauth.server import OAuthServer, OAuthStorage, OAuthResponse
445
31
31
446
32
447
32
class FakeOAuthStorage(OAuthStorage):
33
class FakeOAuthStorage(OAuthStorage):
448
33
    '''Fake storage for testing.'''
34
    '''Fake storage for testing.'''
449
34
35
450
@@ -57,8 +58,8 @@
451
57
58
452
58
    def fetch_request_token(self, parameters):
59
    def fetch_request_token(self, parameters):
453
59
        '''Get a request token.'''
60
        '''Get a request token.'''
456
60
        response_params = {'oauth_token' : self.request_token.key,
61
        response_params = {'oauth_token': self.request_token.key,
457
61
                           'oauth_token_secret' : self.request_token.secret,
62
                           'oauth_token_secret': self.request_token.secret,
458
62
                           }
63
                           }
459
63
64
460
64
        if parameters['oauth_nonce'] != self.nonce:
65
        if parameters['oauth_nonce'] != self.nonce:
461
@@ -71,8 +72,8 @@
462
71
72
463
72
    def authorize_request_token(self, token, parameters):
73
    def authorize_request_token(self, token, parameters):
464
73
        '''Authorize the token.'''
74
        '''Authorize the token.'''
467
74
        response_params = {'oauth_token' : self.request_token.key,
75
        response_params = {'oauth_token': self.request_token.key,
468
75
                           'oauth_verifier' : self.verifier,
76
                           'oauth_verifier': self.verifier,
469
76
                           }
77
                           }
470
77
        if parameters['oauth_token'] == self.request_token.key:
78
        if parameters['oauth_token'] == self.request_token.key:
471
78
            return OAuthResponse(status=200, parameters=response_params)
79
            return OAuthResponse(status=200, parameters=response_params)
472
@@ -80,8 +81,8 @@
473
80
81
474
81
    def fetch_access_token(self, token, parameters):
82
    def fetch_access_token(self, token, parameters):
475
82
        '''Fetch the access token.'''
83
        '''Fetch the access token.'''
478
83
        response_params = {'oauth_token' : self.access_token.key,
84
        response_params = {'oauth_token': self.access_token.key,
479
84
                           'oauth_token_secret' : self.access_token.secret,
85
                           'oauth_token_secret': self.access_token.secret,
480
85
                           }
86
                           }
481
86
        verifier = parameters.get('oauth_verifier', self.verifier)
87
        verifier = parameters.get('oauth_verifier', self.verifier)
482
87
        if verifier == self.verifier:
88
        if verifier == self.verifier:
483
@@ -104,9 +105,9 @@
484
104
105
485
105
    def test_get_request_token(self):
106
    def test_get_request_token(self):
486
106
        '''Test the creation of a request token.'''
107
        '''Test the creation of a request token.'''
490
107
        request_params = {'oauth_timestamp' : str(int(time.time())),
108
        request_params = {'oauth_timestamp': str(int(time.time())),
491
108
                          'oauth_nonce' : 'nonce',
109
                          'oauth_nonce': 'nonce',
492
109
                          'oauth_version' : oauth.OAUTH_VERSION,
110
                          'oauth_version': oauth.OAUTH_VERSION,
493
110
                          }
111
                          }
494
111
        request = OAuthRequest(callback="oob", consumer=self.consumer,
112
        request = OAuthRequest(callback="oob", consumer=self.consumer,
495
112
                               parameters=request_params)
113
                               parameters=request_params)
496
@@ -114,9 +115,9 @@
497
114
        request.sign_request(method, self.consumer, None)
115
        request.sign_request(method, self.consumer, None)
498
115
        response = self.server.get_request_token(request)
116
        response = self.server.get_request_token(request)
499
116
        self.assertTrue(isinstance(response, OAuthResponse))
117
        self.assertTrue(isinstance(response, OAuthResponse))
503
117
        self.assertEquals(response.status_code, 200)
118
        self.assertEqual(response.status_code, 200)
504
118
        self.assertEquals(response.parameters['oauth_callback_confirmed'],
119
        self.assertEqual(response.parameters['oauth_callback_confirmed'],
505
119
                          'true')
120
                         'true')
506
120
121
507
121
    def test_authorize_request_token(self):
122
    def test_authorize_request_token(self):
508
122
        '''Test authorizing the request token.'''
123
        '''Test authorizing the request token.'''
509
@@ -124,25 +125,26 @@
510
124
        request = OAuthRequest(token=token)
125
        request = OAuthRequest(token=token)
511
125
        response = self.server.authorize_request_token(request)
126
        response = self.server.authorize_request_token(request)
512
126
        self.assertTrue(isinstance(response, OAuthResponse))
127
        self.assertTrue(isinstance(response, OAuthResponse))
514
127
        self.assertEquals(response.status_code, 200)
128
        self.assertEqual(response.status_code, 200)
515
128
129
516
129
    def test_get_access_token(self):
130
    def test_get_access_token(self):
517
130
        '''Test getting an access token.'''
131
        '''Test getting an access token.'''
521
131
        request_params = {'oauth_timestamp' : str(int(time.time())),
132
        request_params = {'oauth_timestamp': str(int(time.time())),
522
132
                          'oauth_nonce' : 'nonce',
133
                          'oauth_nonce': 'nonce',
523
133
                          'oauth_version' : oauth.OAUTH_VERSION,
134
                          'oauth_version': oauth.OAUTH_VERSION,
524
134
                          }
135
                          }
525
135
        token = oauth.OAuthToken('request_key', 'request_secret',
136
        token = oauth.OAuthToken('request_key', 'request_secret',
526
136
                                 verifier='verifier')
137
                                 verifier='verifier')
529
137
        request=OAuthRequest(consumer=self.consumer, token=token,
138
        request = OAuthRequest(consumer=self.consumer, token=token,
530
138
                             parameters=request_params)
139
                               parameters=request_params)
531
139
        method = oauth.OAuthSignatureMethod_PLAINTEXT()
140
        method = oauth.OAuthSignatureMethod_PLAINTEXT()
532
140
        request.sign_request(method, self.consumer, token)
141
        request.sign_request(method, self.consumer, token)
533
141
        response = self.server.get_access_token(request)
142
        response = self.server.get_access_token(request)
534
142
        self.assertTrue(isinstance(response, OAuthResponse))
143
        self.assertTrue(isinstance(response, OAuthResponse))
538
143
        self.assertEquals(response.status_code, 200)
144
        self.assertEqual(response.status_code, 200)
539
144
        self.assertEquals(response.token.key, 'access_key')
145
        self.assertEqual(response.token.key, 'access_key')
540
145
        self.assertEquals(response.token.secret, 'access_secret')
146
        self.assertEqual(response.token.secret, 'access_secret')
541
147
542
146
148
543
147
class OAuthStorageTests(unittest.TestCase):
149
class OAuthStorageTests(unittest.TestCase):
544
148
    '''Test the OAuthStorage class.'''
150
    '''Test the OAuthStorage class.'''
545
@@ -155,34 +157,34 @@
546
155
        '''Test consumer validation.'''
157
        '''Test consumer validation.'''
547
156
        consumer = self.storage.lookup_consumer('consumer_key')
158
        consumer = self.storage.lookup_consumer('consumer_key')
548
157
        self.assertTrue(isinstance(consumer, oauth.OAuthConsumer))
159
        self.assertTrue(isinstance(consumer, oauth.OAuthConsumer))
550
158
        self.assertEquals('consumer_key', consumer.key)
160
        self.assertEqual('consumer_key', consumer.key)
551
159
161
552
160
    def test_fetch_request_token(self):
162
    def test_fetch_request_token(self):
553
161
        '''Test fetching the request token.'''
163
        '''Test fetching the request token.'''
561
162
        parameters = {'oauth_consumer_key' : 'consumer_key',
164
        parameters = {'oauth_consumer_key': 'consumer_key',
562
163
                      'oauth_signature_method' : 'PLAINTEXT',
165
                      'oauth_signature_method': 'PLAINTEXT',
563
164
                      'oauth_signature' : '',
166
                      'oauth_signature': '',
564
165
                      'oauth_timestamp' : str(int(time.time())),
167
                      'oauth_timestamp': str(int(time.time())),
565
166
                      'oauth_nonce' : 'nonce',
168
                      'oauth_nonce': 'nonce',
566
167
                      'oauth_version' : oauth.OAUTH_VERSION,
169
                      'oauth_version': oauth.OAUTH_VERSION,
567
168
                      'oauth_callback' : 'oob',
170
                      'oauth_callback': 'oob',
568
169
                      }
171
                      }
569
170
        response = self.storage.fetch_request_token(parameters)
172
        response = self.storage.fetch_request_token(parameters)
570
171
        self.assertTrue(isinstance(response, OAuthResponse))
173
        self.assertTrue(isinstance(response, OAuthResponse))
572
172
        self.assertEquals(response.token.key, 'request_key')
174
        self.assertEqual(response.token.key, 'request_key')
573
173
175
574
174
    def test_fetch_request_token_compat(self):
176
    def test_fetch_request_token_compat(self):
575
175
        '''Test fetching the request token.'''
177
        '''Test fetching the request token.'''
582
176
        parameters = {'oauth_consumer_key' : 'consumer_key',
178
        parameters = {'oauth_consumer_key': 'consumer_key',
583
177
                      'oauth_signature_method' : 'PLAINTEXT',
179
                      'oauth_signature_method': 'PLAINTEXT',
584
178
                      'oauth_signature' : '',
180
                      'oauth_signature': '',
585
179
                      'oauth_timestamp' : str(int(time.time())),
181
                      'oauth_timestamp': str(int(time.time())),
586
180
                      'oauth_nonce' : 'nonce',
182
                      'oauth_nonce': 'nonce',
587
181
                      'oauth_version' : oauth.OAUTH_VERSION,
183
                      'oauth_version': oauth.OAUTH_VERSION,
588
182
                      }
184
                      }
589
183
        response = self.storage.fetch_request_token(parameters)
185
        response = self.storage.fetch_request_token(parameters)
590
184
        self.assertTrue(isinstance(response, OAuthResponse))
186
        self.assertTrue(isinstance(response, OAuthResponse))
592
185
        self.assertEquals(response.token.key, 'request_key')
187
        self.assertEqual(response.token.key, 'request_key')
593
186
188
594
187
    def test_authorize_request_token(self):
189
    def test_authorize_request_token(self):
595
188
        '''Test authorizing a request token.'''
190
        '''Test authorizing a request token.'''
596
189
191
597
=== added file 'run-tests'
598
--- run-tests	1970-01-01 00:00:00 +0000
599
+++ run-tests	2012-05-21 13:12:18 +0000
600
@@ -0,0 +1,31 @@
601
1
#!/bin/bash
602
2
#
603
3
# Copyright 2010-2012 Canonical Ltd.
604
4
#
605
5
# Permission is hereby granted, free of charge, to any person obtaining a copy
606
6
# of this software and associated documentation files (the "Software"), to deal
607
7
# in the Software without restriction, including without limitation the rights
608
8
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
609
9
# copies of the Software, and to permit persons to whom the Software is
610
10
# furnished to do so, subject to the following conditions:
611
11
#
612
12
# The above copyright notice and this permission notice shall be included in
613
13
# all copies or substantial portions of the Software.
614
14
#
615
15
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
616
16
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
617
17
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
618
18
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
619
19
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
620
20
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
621
21
# THE SOFTWARE.
622
22
623
23
set -e -x
624
24
625
25
# Run the tests with both python (2.x) and python3
626
26
./setup.py build test clean
627
27
python3 ./setup.py build test clean
628
28
629
29
# Style checks
630
30
pyflakes poauth setup.py
631
31
pep8 --repeat . setup.py
632
0
32
633
=== modified file 'setup.py'
634
--- setup.py	2009-08-31 19:20:49 +0000
635
+++ setup.py	2012-05-21 13:12:18 +0000
636
@@ -1,9 +1,9 @@
638
1
#!/usr/bin/env python
1
#!/usr/bin/python
639
2
#
2
#
640
3
# The MIT License
3
# The MIT License
641
4
#
4
#
642
5
# Copyright (c) 2007 Leah Culver
5
# Copyright (c) 2007 Leah Culver
644
6
# Copyright (c) 2009 Canonical, Ltd.
6
# Copyright (c) 2009-2012 Canonical, Ltd.
645
7
#
7
#
646
8
# Permission is hereby granted, free of charge, to any person obtaining a copy
8
# Permission is hereby granted, free of charge, to any person obtaining a copy
647
9
# of this software and associated documentation files (the "Software"), to deal
9
# of this software and associated documentation files (the "Software"), to deal
648
@@ -34,5 +34,7 @@
649
34
    license='MIT',
34
    license='MIT',
650
35
    author='Rodney Dawes',
35
    author='Rodney Dawes',
651
36
    author_email='rodney.dawes@canonical.com',
36
    author_email='rodney.dawes@canonical.com',
652
37
    download_url='https://launchpad.net/poauth/+download',
653
37
    packages=find_packages(),
38
    packages=find_packages(),
654
39
    test_suite='poauth.tests',
655
38
)
40
)
Reviewer	Review Type	Date Requested	Status
Mike McCracken (community)			Approve on 2012-05-22
Roberto Alsina (community)	code review	2012-05-15	Approve on 2012-05-21
Review via email: mp+105874@code.launchpad.net