1
=== modified file 'tests/test_client.py'
2
--- tests/test_client.py	2012-12-03 19:45:43 +0000
3
+++ tests/test_client.py	2013-02-14 20:28:33 +0000
4
@@ -38,6 +38,8 @@
5
38
import unittest
38
import unittest
6
39
import uuid
39
import uuid
7
40
40
8
41
from urlparse import urlparse, parse_qsl
9
42
10
41
from twisted.application import internet, service
43
from twisted.application import internet, service
11
42
from twisted.internet import defer
44
from twisted.internet import defer
12
43
from twisted.internet.defer import Deferred, inlineCallbacks
45
from twisted.internet.defer import Deferred, inlineCallbacks
13
@@ -48,10 +50,12 @@
14
48
from ubuntuone.storageprotocol.client import (
50
from ubuntuone.storageprotocol.client import (
15
49
    StorageClient, CreateUDF, ListVolumes, DeleteVolume, GetDelta, Unlink,
51
    StorageClient, CreateUDF, ListVolumes, DeleteVolume, GetDelta, Unlink,
16
50
    Authenticate, MakeFile, MakeDir, PutContent, Move, BytesMessageProducer,
52
    Authenticate, MakeFile, MakeDir, PutContent, Move, BytesMessageProducer,
18
51
    oauth, TwistedTimestampChecker, tx_timestamp_checker,
53
    TwistedTimestampChecker, tx_timestamp_checker,
19
52
)
54
)
20
55
21
53
from ubuntuone.storageprotocol import volumes
56
from ubuntuone.storageprotocol import volumes
22
54
from tests import test_delta_info
57
from tests import test_delta_info
23
58
from oauthlib.oauth1 import Client
24
55
59
25
56
# let's not get picky about aatributes outside __init__ in tests
60
# let's not get picky about aatributes outside __init__ in tests
26
57
# pylint: disable=W0201
61
# pylint: disable=W0201
27
@@ -795,31 +799,43 @@
28
795
799
29
796
    def test_oauth_authenticate_uses_server_timestamp(self):
800
    def test_oauth_authenticate_uses_server_timestamp(self):
30
797
        """The oauth authentication uses the server timestamp."""
801
        """The oauth authentication uses the server timestamp."""
37
798
        fromcandt_call = []
802
        timestamps = []
38
799
803
39
800
        fake_token = oauth.OAuthToken('token', 'token_secret')
804
        original_sign = Client.sign
40
801
        fake_consumer = oauth.OAuthConsumer('consumer_key', 'consumer_secret')
805
41
802
806
        def fake_sign(self, *args, **kwargs):
42
803
        fake_timestamp = object()
807
            """A fake Client.sign()."""
43
808
            url, headers, body = original_sign(self, *args, **kwargs)
44
809
            timestamps.extend(
45
810
                value for name, value in parse_qsl(urlparse(url).query)
46
811
                if name == 'oauth_timestamp')
47
812
            return url, headers, body
48
813
49
814
        fake_timestamp = '801'
50
804
        timestamp_d = Deferred()
815
        timestamp_d = Deferred()
51
805
        self.patch(tx_timestamp_checker, "get_faithful_time",
816
        self.patch(tx_timestamp_checker, "get_faithful_time",
52
806
                   lambda: timestamp_d)
817
                   lambda: timestamp_d)
63
807
        original_fromcandt = oauth.OAuthRequest.from_consumer_and_token
818
64
808
819
        self.patch(Client, 'sign', fake_sign)
55
809
        @staticmethod
56
810
        def fake_from_consumer_and_token(**kwargs):
57
811
            """A fake from_consumer_and_token."""
58
812
            fromcandt_call.append(kwargs)
59
813
            return original_fromcandt(**kwargs)
60
814
61
815
        self.patch(oauth.OAuthRequest, "from_consumer_and_token",
62
816
                   fake_from_consumer_and_token)
65
817
        protocol = FakedProtocol()
820
        protocol = FakedProtocol()
68
818
        protocol.oauth_authenticate(fake_consumer, fake_token)
821
        # For backward compatibility of the API, oauth_authenticate() takes a
69
819
        self.assertEqual(len(fromcandt_call), 0)
822
        # consumer object and a token object.  Both of those must have .key
70
823
        # and .secret attributes.  In modern OAuth1 (i.e. RFC 5849)
71
824
        # terminology, the consumer is really the OAuth client, and the token
72
825
        # is really the OAuth resource owner.
73
826
74
827
        class OAuthClient:
75
828
            key = 'consumer_key'
76
829
            secret = 'consumer_secret'
77
830
78
831
        class OAuthResourceOwner:
79
832
            key = 'token'
80
833
            secret = 'token_secret'
81
834
        protocol.oauth_authenticate(OAuthResourceOwner, OAuthClient)
82
835
        self.assertEqual(len(timestamps), 0)
83
820
        timestamp_d.callback(fake_timestamp)
836
        timestamp_d.callback(fake_timestamp)
86
821
        parameters = fromcandt_call[0]["parameters"]
837
        self.assertEqual(len(timestamps), 1)
87
822
        self.assertEqual(parameters["oauth_timestamp"], fake_timestamp)
838
        self.assertEqual(timestamps[0], fake_timestamp)
88
823
839
89
824
840
90
825
class RootResource(resource.Resource):
841
class RootResource(resource.Resource):
91
826
842
92
=== modified file 'ubuntuone/storageprotocol/client.py'
93
--- ubuntuone/storageprotocol/client.py	2012-12-03 19:45:43 +0000
94
+++ ubuntuone/storageprotocol/client.py	2013-02-14 20:28:33 +0000
95
@@ -39,7 +39,8 @@
96
39
39
97
40
from functools import partial
40
from functools import partial
98
41
from itertools import chain
41
from itertools import chain
100
42
from oauth import oauth
42
from urlparse import urlparse, parse_qsl
101
43
from oauthlib.oauth1 import Client, SIGNATURE_PLAINTEXT, SIGNATURE_TYPE_QUERY
102
43
44
103
44
from twisted.internet.protocol import ClientFactory
45
from twisted.internet.protocol import ClientFactory
104
45
from twisted.internet import reactor, defer
46
from twisted.internet import reactor, defer
105
@@ -143,29 +144,30 @@
106
143
    def oauth_authenticate(self, consumer, token, metadata=None):
144
    def oauth_authenticate(self, consumer, token, metadata=None):
107
144
        """Authenticate to a server using the OAuth provider.
145
        """Authenticate to a server using the OAuth provider.
108
145
146
114
146
        @param consumer: the OAuth consumer to authenticate with.
147
        @param consumer: the OAuth consumer (a.k.a. client in RFC 5849) to
115
147
        @type consumer: `oauth.OAuthConsumer`
148
            authenticate with.
116
148
        @param token: a previously acquired OAuth access token.
149
        @type consumer: object having both a `.key` and `.secret` attribute.
117
149
        @type consumer: `oauth.OAuthToken`
150
        @param token: a previously acquired OAuth access token (a.k.a.
118
150
        @param kwargs: key/values to send as metadata
151
            resource owner in RFC 5849).
119
152
        @type token: object having both a `.key` and `.secret` attribute.
120
153
        @param metadata: key/values to send as metadata
121
151
154
122
152
        Return a deferred that will get called with the request
155
        Return a deferred that will get called with the request
123
153
        object when completed.
156
        object when completed.
124
154
157
125
155
        """
158
        """
126
156
        timestamp = yield tx_timestamp_checker.get_faithful_time()
159
        timestamp = yield tx_timestamp_checker.get_faithful_time()
137
157
        req = oauth.OAuthRequest.from_consumer_and_token(
160
        client = Client(consumer.key, consumer.secret,
138
158
            oauth_consumer=consumer,
161
                        token.key, token.secret,
139
159
            token=token,
162
                        signature_method=SIGNATURE_PLAINTEXT,
140
160
            parameters={"oauth_timestamp": timestamp},
163
                        signature_type=SIGNATURE_TYPE_QUERY,
141
161
            http_method="GET",
164
                        timestamp=timestamp)
142
162
            http_url="storage://server")
165
        url, headers, body = client.sign('storage://server')
143
163
        req.sign_request(
166
        # Parse out the authentication parameters from the query string.
134
164
            oauth.OAuthSignatureMethod_PLAINTEXT(), consumer, token)
135
165
136
166
        # Make sure all parameter values are strings.
144
167
        auth_parameters = dict(
167
        auth_parameters = dict(
146
168
            (key, str(value)) for key, value in req.parameters.iteritems())
168
            (name, value) for name, value in
147
169
            parse_qsl(urlparse(url).query)
148
170
            if name.startswith('oauth_'))
149
169
        p = Authenticate(self, auth_parameters, metadata=metadata)
171
        p = Authenticate(self, auth_parameters, metadata=metadata)
150
170
        p.start()
172
        p.start()
151
171
        result = yield p.deferred
173
        result = yield p.deferred
Status:	Merged
Approved by:	dobey on 2013-02-14
Approved revision:	no longer in the source branch.
Merged at revision:	159
Proposed branch:	lp:~dobey/ubuntuone-storage-protocol/update-4-2
Merge into:	lp:ubuntuone-storage-protocol/stable-4-2
Diff against target:	151 lines (+56/-38) 2 files modified tests/test_client.py (+37/-21) ubuntuone/storageprotocol/client.py (+19/-17)
To merge this branch:	bzr merge lp:~dobey/ubuntuone-storage-protocol/update-4-2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mike McCracken (community)		2013-02-14	Approve on 2013-02-14
Review via email: mp+148553@code.launchpad.net