1
=== modified file 'lib/canonical/launchpad/browser/oauth.py'
2
--- lib/canonical/launchpad/browser/oauth.py	2010-09-20 16:45:03 +0000
3
+++ lib/canonical/launchpad/browser/oauth.py	2010-10-19 14:17:46 +0000
4
@@ -16,6 +16,7 @@
5
16
    Action,
16
    Action,
6
17
    Actions,
17
    Actions,
7
18
    )
18
    )
8
19
from zope.security.interfaces import Unauthorized
9
19
20
10
20
from canonical.launchpad.interfaces.oauth import (
21
from canonical.launchpad.interfaces.oauth import (
11
21
    IOAuthConsumerSet,
22
    IOAuthConsumerSet,
12
@@ -88,11 +89,13 @@
13
88
89
14
89
        token = consumer.newRequestToken()
90
        token = consumer.newRequestToken()
15
90
        if self.request.headers.get('Accept') == HTTPResource.JSON_TYPE:
91
        if self.request.headers.get('Accept') == HTTPResource.JSON_TYPE:
17
91
            # Don't show the client the GRANT_PERMISSIONS access
92
            # Don't show the client the DESKTOP_INTEGRATION access
18
92
            # level. If they have a legitimate need to use it, they'll
93
            # level. If they have a legitimate need to use it, they'll
19
93
            # already know about it.
94
            # already know about it.
22
94
            permissions = [permission for permission in OAuthPermission.items
95
            permissions = [
23
95
                           if permission != OAuthPermission.GRANT_PERMISSIONS]
96
                permission for permission in OAuthPermission.items
24
97
                if (permission != OAuthPermission.DESKTOP_INTEGRATION)
25
98
                ]
26
96
            return self.getJSONRepresentation(
99
            return self.getJSONRepresentation(
27
97
                permissions, token, include_secret=True)
100
                permissions, token, include_secret=True)
28
98
        return u'oauth_token=%s&oauth_token_secret=%s' % (
101
        return u'oauth_token=%s&oauth_token_secret=%s' % (
29
@@ -102,26 +105,36 @@
30
102
    return form.token is not None and not form.token.is_reviewed
105
    return form.token is not None and not form.token.is_reviewed
31
103
106
32
104
107
33
108
def token_review_success(form, action, data):
34
109
    """The success callback for a button to approve a token."""
35
110
    form.reviewToken(action.permission)
36
111
37
112
38
105
def create_oauth_permission_actions():
113
def create_oauth_permission_actions():
44
106
    """Return a list of `Action`s for each possible `OAuthPermission`."""
114
    """Return two `Actions` objects containing each possible `OAuthPermission`.
45
107
    actions = Actions()
115
46
108
    actions_excluding_grant_permissions = Actions()
116
    The first `Actions` object contains every action supported by the
47
109
    def success(form, action, data):
117
    OAuthAuthorizeTokenView. The second list contains a good default
48
110
        form.reviewToken(action.permission)
118
    set of actions, omitting special permissions like DESKTOP_INTEGRATION.
49
119
    """
50
120
    all_actions = Actions()
51
121
    ordinary_actions = Actions()
52
111
    for permission in OAuthPermission.items:
122
    for permission in OAuthPermission.items:
53
112
        action = Action(
123
        action = Action(
55
113
            permission.title, name=permission.name, success=success,
124
            permission.title, name=permission.name,
56
125
            success=token_review_success,
57
114
            condition=token_exists_and_is_not_reviewed)
126
            condition=token_exists_and_is_not_reviewed)
58
115
        action.permission = permission
127
        action.permission = permission
63
116
        actions.append(action)
128
        all_actions.append(action)
64
117
        if permission != OAuthPermission.GRANT_PERMISSIONS:
129
        if permission != OAuthPermission.DESKTOP_INTEGRATION:
65
118
            actions_excluding_grant_permissions.append(action)
130
            ordinary_actions.append(action)
66
119
    return actions, actions_excluding_grant_permissions
131
    return all_actions, ordinary_actions
67
132
68
120
133
69
121
class OAuthAuthorizeTokenView(LaunchpadFormView, JSONTokenMixin):
134
class OAuthAuthorizeTokenView(LaunchpadFormView, JSONTokenMixin):
70
122
    """Where users authorize consumers to access Launchpad on their behalf."""
135
    """Where users authorize consumers to access Launchpad on their behalf."""
71
123
136
73
124
    actions, actions_excluding_grant_permissions = (
137
    actions, actions_excluding_special_permissions = (
74
125
        create_oauth_permission_actions())
138
        create_oauth_permission_actions())
75
126
    label = "Authorize application to access Launchpad on your behalf"
139
    label = "Authorize application to access Launchpad on your behalf"
76
127
    schema = IOAuthRequestToken
140
    schema = IOAuthRequestToken
77
@@ -130,7 +143,7 @@
78
130
143
79
131
    @property
144
    @property
80
132
    def visible_actions(self):
145
    def visible_actions(self):
82
133
        """Restrict the actions to the subset the client can make use of.
146
        """Restrict the actions to a subset to be presented to the client.
83
134
147
84
135
        Not all client programs can function with all levels of
148
        Not all client programs can function with all levels of
85
136
        access. For instance, a client that needs to modify the
149
        access. For instance, a client that needs to modify the
86
@@ -150,7 +163,7 @@
87
150
163
88
151
        allowed_permissions = self.request.form_ng.getAll('allow_permission')
164
        allowed_permissions = self.request.form_ng.getAll('allow_permission')
89
152
        if len(allowed_permissions) == 0:
165
        if len(allowed_permissions) == 0:
91
153
            return self.actions_excluding_grant_permissions
166
            return self.actions_excluding_special_permissions
92
154
        actions = Actions()
167
        actions = Actions()
93
155
168
94
156
        # UNAUTHORIZED is always one of the options. If the client
169
        # UNAUTHORIZED is always one of the options. If the client
95
@@ -159,18 +172,59 @@
96
159
        if OAuthPermission.UNAUTHORIZED.name in allowed_permissions:
172
        if OAuthPermission.UNAUTHORIZED.name in allowed_permissions:
97
160
            allowed_permissions.remove(OAuthPermission.UNAUTHORIZED.name)
173
            allowed_permissions.remove(OAuthPermission.UNAUTHORIZED.name)
98
161
174
100
162
        # GRANT_PERMISSIONS cannot be requested as one of several
175
        # DESKTOP_INTEGRATION cannot be requested as one of several
101
163
        # options--it must be the only option (other than
176
        # options--it must be the only option (other than
103
164
        # UNAUTHORIZED). If GRANT_PERMISSIONS is one of several
177
        # UNAUTHORIZED). If DESKTOP_INTEGRATION is one of several
104
165
        # options, remove it from the list.
178
        # options, remove it from the list.
106
166
        if (OAuthPermission.GRANT_PERMISSIONS.name in allowed_permissions
179
        desktop_permission = OAuthPermission.DESKTOP_INTEGRATION
107
180
        if (desktop_permission.name in allowed_permissions
108
167
            and len(allowed_permissions) > 1):
181
            and len(allowed_permissions) > 1):
115
168
            allowed_permissions.remove(OAuthPermission.GRANT_PERMISSIONS.name)
182
            allowed_permissions.remove(desktop_permission.name)
116
169
183
117
170
        for action in self.actions:
184
        if desktop_permission.name in allowed_permissions:
118
171
            if (action.permission.name in allowed_permissions
185
            if not self.token.consumer.is_integrated_desktop:
119
172
                or action.permission is OAuthPermission.UNAUTHORIZED):
186
                # Consumers may only ask for desktop integration if
120
173
                actions.append(action)
187
                # they give a desktop type (eg. "Ubuntu") and a
121
188
                # user-recognizable desktop name (eg. the hostname).
122
189
                raise Unauthorized(
123
190
                    ('Consumer "%s" asked for desktop integration, '
124
191
                     "but didn't say what kind of desktop it is, or name "
125
192
                     "the computer being integrated."
126
193
                     % self.token.consumer.key))
127
194
128
195
            # We're going for desktop integration. The only two
129
196
            # possibilities are "allow" and "deny". We'll customize
130
197
            # the "allow" message using the hostname provided by the
131
198
            # desktop.
132
199
            #
133
200
            # Since self.actions is a descriptor that returns copies
134
201
            # of Action objects, we can modify the actions we get
135
202
            # in-place without ruining the Action objects for everyone
136
203
            # else.
137
204
            desktop_name = self.token.consumer.integrated_desktop_name
138
205
            label = (
139
206
                'Give all programs running on &quot;%s&quot; access '
140
207
                'to my Launchpad account.')
141
208
            allow_action = [
142
209
                action for action in self.actions
143
210
                if action.name == desktop_permission.name][0]
144
211
            allow_action.label = label % desktop_name
145
212
            actions.append(allow_action)
146
213
147
214
            # We'll customize the "deny" message as well.
148
215
            label = "No, thanks, I don't trust &quot;%s&quot;."
149
216
            deny_action = [
150
217
                action for action in self.actions
151
218
                if action.name == OAuthPermission.UNAUTHORIZED.name][0]
152
219
            deny_action.label = label % desktop_name
153
220
            actions.append(deny_action)
154
221
155
222
        else:
156
223
            # We're going for web-based integration.
157
224
            for action in self.actions_excluding_special_permissions:
158
225
                if (action.permission.name in allowed_permissions
159
226
                    or action.permission is OAuthPermission.UNAUTHORIZED):
160
227
                    actions.append(action)
161
174
228
162
175
        if len(list(actions)) == 1:
229
        if len(list(actions)) == 1:
163
176
            # The only visible action is UNAUTHORIZED. That means the
230
            # The only visible action is UNAUTHORIZED. That means the
164
@@ -179,8 +233,8 @@
165
179
            # UNAUTHORIZED). Rather than present the end-user with an
233
            # UNAUTHORIZED). Rather than present the end-user with an
166
180
            # impossible situation where their only option is to deny
234
            # impossible situation where their only option is to deny
167
181
            # access, we'll present the full range of actions (except
235
            # access, we'll present the full range of actions (except
170
182
            # for GRANT_PERMISSIONS).
236
            # for special permissions like DESKTOP_INTEGRATION).
171
183
            return self.actions_excluding_grant_permissions
237
            return self.actions_excluding_special_permissions
172
184
        return actions
238
        return actions
173
185
239
174
186
    def initialize(self):
240
    def initialize(self):
175
@@ -189,6 +243,31 @@
176
189
        key = form.get('oauth_token')
243
        key = form.get('oauth_token')
177
190
        if key:
244
        if key:
178
191
            self.token = getUtility(IOAuthRequestTokenSet).getByKey(key)
245
            self.token = getUtility(IOAuthRequestTokenSet).getByKey(key)
179
246
180
247
181
248
        callback = self.request.form.get('oauth_callback')
182
249
        if (self.token is not None
183
250
            and self.token.consumer.is_integrated_desktop):
184
251
            # Nip problems in the bud by appling special rules about
185
252
            # what desktop integrations are allowed to do.
186
253
            if callback is not None:
187
254
                # A desktop integration is not allowed to specify a callback.
188
255
                raise Unauthorized(
189
256
                    "A desktop integration may not specify an "
190
257
                    "OAuth callback URL.")
191
258
            # A desktop integration token can only have one of two
192
259
            # permission levels: "Desktop Integration" and
193
260
            # "Unauthorized". It shouldn't even be able to ask for any
194
261
            # other level.
195
262
            for action in self.visible_actions:
196
263
                if action.permission not in (
197
264
                    OAuthPermission.DESKTOP_INTEGRATION,
198
265
                    OAuthPermission.UNAUTHORIZED):
199
266
                    raise Unauthorized(
200
267
                        ("Desktop integration token requested a permission "
201
268
                         '("%s") not supported for desktop-wide use.')
202
269
                         % action.label)
203
270
204
192
        super(OAuthAuthorizeTokenView, self).initialize()
271
        super(OAuthAuthorizeTokenView, self).initialize()
205
193
272
206
194
    def render(self):
273
    def render(self):
207
195
274
208
=== modified file 'lib/canonical/launchpad/database/oauth.py'
209
--- lib/canonical/launchpad/database/oauth.py	2010-10-03 15:30:06 +0000
210
+++ lib/canonical/launchpad/database/oauth.py	2010-10-19 14:17:46 +0000
211
@@ -15,6 +15,7 @@
212
15
    timedelta,
15
    timedelta,
213
16
    )
16
    )
214
17
17
215
18
import re
216
18
import pytz
19
import pytz
217
19
from sqlobject import (
20
from sqlobject import (
218
20
    BoolCol,
21
    BoolCol,
219
@@ -59,7 +60,7 @@
220
59
from lp.registry.interfaces.projectgroup import IProjectGroup
60
from lp.registry.interfaces.projectgroup import IProjectGroup
221
60
61
222
61
# How many hours should a request token be valid for?
62
# How many hours should a request token be valid for?
224
62
REQUEST_TOKEN_VALIDITY = 12
63
REQUEST_TOKEN_VALIDITY = 2
225
63
# The OAuth Core 1.0 spec (http://oauth.net/core/1.0/#nonce) says that a
64
# The OAuth Core 1.0 spec (http://oauth.net/core/1.0/#nonce) says that a
226
64
# timestamp "MUST be equal or greater than the timestamp used in previous
65
# timestamp "MUST be equal or greater than the timestamp used in previous
227
65
# requests," but this is likely to cause problems if the client does request
66
# requests," but this is likely to cause problems if the client does request
228
@@ -93,6 +94,7 @@
229
93
94
230
94
    getStore = _get_store
95
    getStore = _get_store
231
95
96
232
97
233
96
class OAuthConsumer(OAuthBase):
98
class OAuthConsumer(OAuthBase):
234
97
    """See `IOAuthConsumer`."""
99
    """See `IOAuthConsumer`."""
235
98
    implements(IOAuthConsumer)
100
    implements(IOAuthConsumer)
236
@@ -102,13 +104,56 @@
237
102
    key = StringCol(notNull=True)
104
    key = StringCol(notNull=True)
238
103
    secret = StringCol(notNull=False, default='')
105
    secret = StringCol(notNull=False, default='')
239
104
106
240
107
    # This regular expression singles out a consumer key that
241
108
    # represents any and all apps running on a specific computer
242
109
    # (usually a desktop). For instance:
243
110
    #
244
111
    # System-wide: Ubuntu desktop (hostname1)
245
112
    #  - An Ubuntu desktop called "hostname1"
246
113
    # System-wide: Windows desktop (Computer Name)
247
114
    #  - A Windows desktop called "Computer Name"
248
115
    # System-wide: Mac OS desktop (hostname2)
249
116
    #  - A Macintosh desktop called "hostname2"
250
117
    # System-wide Android phone (Bob's Phone)
251
118
    #  - An Android phone called "Bob's Phone"
252
119
    integrated_desktop_re = re.compile("^System-wide: (.*) \(([^)]*)\)$")
253
120
254
121
    def _integrated_desktop_match_group(self, position):
255
122
        """Return information about a desktop integration token.
256
123
257
124
        A convenience method that runs the desktop integration regular
258
125
        expression against the consumer key.
259
126
260
127
        :param position: The match group to return if the regular
261
128
        expression matches.
262
129
263
130
        :return: The value of one of the match groups, or None.
264
131
        """
265
132
        match = self.integrated_desktop_re.match(self.key)
266
133
        if match is None:
267
134
            return None
268
135
        return match.groups()[position]
269
136
270
137
    @property
271
138
    def is_integrated_desktop(self):
272
139
        """See `IOAuthConsumer`."""
273
140
        return self.integrated_desktop_re.match(self.key) is not None
274
141
275
142
    @property
276
143
    def integrated_desktop_type(self):
277
144
        """See `IOAuthConsumer`."""
278
145
        return self._integrated_desktop_match_group(0)
279
146
280
147
    @property
281
148
    def integrated_desktop_name(self):
282
149
        """See `IOAuthConsumer`."""
283
150
        return self._integrated_desktop_match_group(1)
284
151
285
105
    def newRequestToken(self):
152
    def newRequestToken(self):
286
106
        """See `IOAuthConsumer`."""
153
        """See `IOAuthConsumer`."""
287
107
        key, secret = create_token_key_and_secret(table=OAuthRequestToken)
154
        key, secret = create_token_key_and_secret(table=OAuthRequestToken)
288
108
        date_expires = (datetime.now(pytz.timezone('UTC'))
289
109
                        + timedelta(hours=REQUEST_TOKEN_VALIDITY))
290
110
        return OAuthRequestToken(
155
        return OAuthRequestToken(
292
111
            consumer=self, key=key, secret=secret, date_expires=date_expires)
156
            consumer=self, key=key, secret=secret)
293
112
157
294
113
    def getAccessToken(self, key):
158
    def getAccessToken(self, key):
295
114
        """See `IOAuthConsumer`."""
159
        """See `IOAuthConsumer`."""
296
@@ -177,6 +222,11 @@
297
177
        else:
222
        else:
298
178
            return None
223
            return None
299
179
224
300
225
    @property
301
226
    def is_expired(self):
302
227
        now = datetime.now(pytz.timezone('UTC'))
303
228
        return self.date_expires is not None and self.date_expires <= now
304
229
305
180
    def checkNonceAndTimestamp(self, nonce, timestamp):
230
    def checkNonceAndTimestamp(self, nonce, timestamp):
306
181
        """See `IOAuthAccessToken`."""
231
        """See `IOAuthAccessToken`."""
307
182
        timestamp = float(timestamp)
232
        timestamp = float(timestamp)
308
@@ -254,10 +304,21 @@
309
254
        else:
304
        else:
310
255
            return None
305
            return None
311
256
306
312
307
    @property
313
308
    def is_expired(self):
314
309
        now = datetime.now(pytz.timezone('UTC'))
315
310
        expires = self.date_created + timedelta(hours=REQUEST_TOKEN_VALIDITY)
316
311
        return expires <= now
317
312
318
257
    def review(self, user, permission, context=None):
313
    def review(self, user, permission, context=None):
319
258
        """See `IOAuthRequestToken`."""
314
        """See `IOAuthRequestToken`."""
322
259
        assert not self.is_reviewed, (
315
        if self.is_reviewed:
323
260
            "Request tokens can be reviewed only once.")
316
            raise AssertionError(
324
317
                "Request tokens can be reviewed only once.")
325
318
        if self.is_expired:
326
319
            raise AssertionError(
327
320
                'This request token has expired and can no longer be '
328
321
                'reviewed.')
329
261
        self.date_reviewed = datetime.now(pytz.timezone('UTC'))
322
        self.date_reviewed = datetime.now(pytz.timezone('UTC'))
330
262
        self.person = user
323
        self.person = user
331
263
        self.permission = permission
324
        self.permission = permission
332
@@ -275,10 +336,18 @@
333
275
336
334
276
    def createAccessToken(self):
337
    def createAccessToken(self):
335
277
        """See `IOAuthRequestToken`."""
338
        """See `IOAuthRequestToken`."""
340
278
        assert self.is_reviewed, (
339
        if not self.is_reviewed:
341
279
            'Cannot create an access token from an unreviewed request token.')
340
            raise AssertionError(
342
280
        assert self.permission != OAuthPermission.UNAUTHORIZED, (
341
                'Cannot create an access token from an unreviewed request '
343
281
            'The user did not grant access to this consumer.')
342
                'token.')
344
343
        if self.permission == OAuthPermission.UNAUTHORIZED:
345
344
            raise AssertionError(
346
345
                'The user did not grant access to this consumer.')
347
346
        if self.is_expired:
348
347
            raise AssertionError(
349
348
                'This request token has expired and can no longer be '
350
349
                'exchanged for an access token.')
351
350
352
282
        key, secret = create_token_key_and_secret(table=OAuthAccessToken)
351
        key, secret = create_token_key_and_secret(table=OAuthAccessToken)
353
283
        access_level = AccessLevel.items[self.permission.name]
352
        access_level = AccessLevel.items[self.permission.name]
354
284
        access_token = OAuthAccessToken(
353
        access_token = OAuthAccessToken(
355
285
354
356
=== modified file 'lib/canonical/launchpad/doc/oauth.txt'
357
--- lib/canonical/launchpad/doc/oauth.txt	2010-10-09 16:36:22 +0000
358
+++ lib/canonical/launchpad/doc/oauth.txt	2010-10-19 14:17:46 +0000
359
@@ -38,6 +38,45 @@
360
38
    ...
38
    ...
361
39
    AssertionError: ...
39
    AssertionError: ...
362
40
40
363
41
Desktop consumers
364
42
=================
365
43
366
44
In a web context, each application is represented by a unique consumer
367
45
key. But a typical user sitting at a typical desktop (or other
368
46
personal computer), using multiple desktop applications that integrate
369
47
with Launchpad, is represented by a single consumer key. The user's
370
48
session as a whole is a single "consumer", and the consumer key is
371
49
expected to contain structured information: the type of system
372
50
(usually the operating system plus the word "desktop") and a string
373
51
that the end-user would recognize as identifying their computer.
374
52
375
53
    >>> desktop_key = consumer_set.new(
376
54
    ...     "System-wide: Ubuntu desktop (hostname)")
377
55
    >>> desktop_key.is_integrated_desktop
378
56
    True
379
57
    >>> print desktop_key.integrated_desktop_type
380
58
    Ubuntu desktop
381
59
    >>> print desktop_key.integrated_desktop_name
382
60
    hostname
383
61
384
62
    >>> desktop_key = consumer_set.new(
385
63
    ...     "System-wide: Android phone (My Phone)")
386
64
    >>> desktop_key.is_integrated_desktop
387
65
    True
388
66
    >>> print desktop_key.integrated_desktop_type
389
67
    Android phone
390
68
    >>> print desktop_key.integrated_desktop_name
391
69
    My Phone
392
70
393
71
A normal OAuth consumer does not have this information.
394
72
395
73
    >>> ordinary_key = consumer_set.new("Not a desktop at all.")
396
74
    >>> ordinary_key.is_integrated_desktop
397
75
    False
398
76
    >>> print ordinary_key.integrated_desktop_type
399
77
    None
400
78
    >>> print ordinary_key.integrated_desktop_name
401
79
    None
402
41
80
403
42
Request tokens
81
Request tokens
404
43
==============
82
==============
405
44
83
406
=== modified file 'lib/canonical/launchpad/doc/webapp-authorization.txt'
407
--- lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-09 16:36:22 +0000
408
+++ lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-19 14:17:46 +0000
409
@@ -79,24 +79,16 @@
410
79
    >>> check_permission('launchpad.View', bug_1)
79
    >>> check_permission('launchpad.View', bug_1)
411
80
    False
80
    False
412
81
81
416
82
Now consider a principal authorized to create OAuth tokens. Whenever
82
A token used for desktop integration has a level of permission
417
83
it's not creating OAuth tokens, it has a level of permission
83
equivalent to WRITE_PUBLIC.
415
84
equivalent to READ_PUBLIC.
418
85
84
420
86
    >>> principal.access_level = AccessLevel.GRANT_PERMISSIONS
85
    >>> principal.access_level = AccessLevel.DESKTOP_INTEGRATION
421
87
    >>> setupInteraction(principal)
86
    >>> setupInteraction(principal)
422
88
    >>> check_permission('launchpad.View', bug_1)
87
    >>> check_permission('launchpad.View', bug_1)
424
89
    False
88
    True
425
90
89
426
91
    >>> check_permission('launchpad.Edit', sample_person)
90
    >>> check_permission('launchpad.Edit', sample_person)
435
92
    False
91
    True
428
93
429
94
This may seem useless from a security standpoint, since once a
430
95
malicious client is authorized to create OAuth tokens, it can escalate
431
96
its privileges at any time by creating a new token for itself. The
432
97
security benefit is more subtle: by discouraging feature creep in
433
98
clients that have this super-access level, we reduce the risk that a
434
99
bug in a _trusted_ client will enable privilege escalation attacks.
436
100
92
437
101
Users logged in through the web application have full access, which
93
Users logged in through the web application have full access, which
438
102
means they can read/change any object they have access to.
94
means they can read/change any object they have access to.
439
103
95
440
=== modified file 'lib/canonical/launchpad/interfaces/oauth.py'
441
--- lib/canonical/launchpad/interfaces/oauth.py	2010-08-20 20:31:18 +0000
442
+++ lib/canonical/launchpad/interfaces/oauth.py	2010-10-19 14:17:46 +0000
443
@@ -64,12 +64,26 @@
444
64
        description=_('The secret which, if not empty, should be used by the '
64
        description=_('The secret which, if not empty, should be used by the '
445
65
                      'consumer to sign its requests.'))
65
                      'consumer to sign its requests.'))
446
66
66
447
67
    is_integrated_desktop = Attribute(
448
68
        """This attribute is true if the consumer corresponds to a
449
69
        user account on a personal computer or similar device.""")
450
70
451
71
    integrated_desktop_name = Attribute(
452
72
        """If the consumer corresponds to a user account on a personal
453
73
        computer or similar device, this is the self-reported name of
454
74
        the computer. If the consumer is a specific web or desktop
455
75
        application, this is None.""")
456
76
457
77
    integrated_desktop_type = Attribute(
458
78
        """If the consumer corresponds to a user account on a personal
459
79
        computer or similar device, this is the self-reported type of
460
80
        that computer (usually the operating system plus the word
461
81
        "desktop"). If the consumer is a specific web or desktop
462
82
        application, this is None.""")
463
83
464
67
    def newRequestToken():
84
    def newRequestToken():
465
68
        """Return a new `IOAuthRequestToken` with a random key and secret.
85
        """Return a new `IOAuthRequestToken` with a random key and secret.
466
69
86
467
70
        Also sets the token's date_expires to `REQUEST_TOKEN_VALIDITY` hours
468
71
        from the creation date (now).
469
72
470
73
        The other attributes of the token are supposed to be set whenever the
87
        The other attributes of the token are supposed to be set whenever the
471
74
        user logs into Launchpad and grants (or not) access to this consumer.
88
        user logs into Launchpad and grants (or not) access to this consumer.
472
75
        """
89
        """
473
@@ -131,12 +145,6 @@
474
131
    person = Object(
145
    person = Object(
475
132
        schema=IPerson, title=_('Person'), required=False, readonly=False,
146
        schema=IPerson, title=_('Person'), required=False, readonly=False,
476
133
        description=_('The user on whose behalf the consumer is accessing.'))
147
        description=_('The user on whose behalf the consumer is accessing.'))
477
134
    date_created = Datetime(
478
135
        title=_('Date created'), required=True, readonly=True)
479
136
    date_expires = Datetime(
480
137
        title=_('Date expires'), required=False, readonly=False,
481
138
        description=_('From this date onwards this token can not be used '
482
139
                      'by the consumer to access protected resources.'))
483
140
    key = TextLine(
148
    key = TextLine(
484
141
        title=_('Key'), required=True, readonly=True,
149
        title=_('Key'), required=True, readonly=True,
485
142
        description=_('The key used to identify this token.  It is included '
150
        description=_('The key used to identify this token.  It is included '
486
@@ -154,6 +162,12 @@
487
154
        title=_("Distribution"), required=False, vocabulary='Distribution')
162
        title=_("Distribution"), required=False, vocabulary='Distribution')
488
155
    context = Attribute("FIXME")
163
    context = Attribute("FIXME")
489
156
164
490
165
    is_expired = Bool(
491
166
        title=_("Whether or not this token has expired."),
492
167
        required=False, readonly=True,
493
168
        description=_("A token may only be usable for a limited time, "
494
169
                      "after which it will expire."))
495
170
496
157
171
497
158
class IOAuthAccessToken(IOAuthToken):
172
class IOAuthAccessToken(IOAuthToken):
498
159
    """A token used by a consumer to access protected resources in LP.
173
    """A token used by a consumer to access protected resources in LP.
499
@@ -168,6 +182,16 @@
500
168
        description=_('The level of access given to the application acting '
182
        description=_('The level of access given to the application acting '
501
169
                      'on your behalf.'))
183
                      'on your behalf.'))
502
170
184
503
185
    date_created = Datetime(
504
186
        title=_('Date created'), required=True, readonly=True,
505
187
        description=_('The date some request token was exchanged for '
506
188
                      'this token.'))
507
189
508
190
    date_expires = Datetime(
509
191
        title=_('Date expires'), required=False, readonly=False,
510
192
        description=_('From this date onwards this token can not be used '
511
193
                      'by the consumer to access protected resources.'))
512
194
513
171
    def checkNonceAndTimestamp(nonce, timestamp):
195
    def checkNonceAndTimestamp(nonce, timestamp):
514
172
        """Verify the nonce and timestamp.
196
        """Verify the nonce and timestamp.
515
173
197
516
@@ -202,11 +226,22 @@
517
202
        vocabulary=OAuthPermission,
226
        vocabulary=OAuthPermission,
518
203
        description=_('The permission you give to the application which may '
227
        description=_('The permission you give to the application which may '
519
204
                      'act on your behalf.'))
228
                      'act on your behalf.'))
520
229
    date_created = Datetime(
521
230
        title=_('Date created'), required=True, readonly=True,
522
231
        description=_('The date the token was created. The request token '
523
232
                      'will be good for a limited time after this date.'))
524
233
525
234
    date_expires = Datetime(
526
235
        title=_('Date expires'), required=False, readonly=False,
527
236
        description=_('The expiration date for the permission you give to '
528
237
                      'the application which may act on your behalf.'))
529
238
530
205
    date_reviewed = Datetime(
239
    date_reviewed = Datetime(
531
206
        title=_('Date reviewed'), required=True, readonly=True,
240
        title=_('Date reviewed'), required=True, readonly=True,
532
207
        description=_('The date in which the user authorized (or not) the '
241
        description=_('The date in which the user authorized (or not) the '
533
208
                      'consumer to access his protected resources on '
242
                      'consumer to access his protected resources on '
534
209
                      'Launchpad.'))
243
                      'Launchpad.'))
535
244
536
210
    is_reviewed = Bool(
245
    is_reviewed = Bool(
537
211
        title=_('Has this token been reviewed?'),
246
        title=_('Has this token been reviewed?'),
538
212
        required=False, readonly=True,
247
        required=False, readonly=True,
539
213
248
540
=== modified file 'lib/canonical/launchpad/pagetests/oauth/authorize-token.txt'
541
--- lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-09 16:36:22 +0000
542
+++ lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-19 14:17:46 +0000
543
@@ -39,32 +39,29 @@
544
39
39
545
40
    >>> main_content = find_tag_by_id(browser.contents, 'maincontent')
40
    >>> main_content = find_tag_by_id(browser.contents, 'maincontent')
546
41
    >>> print extract_text(main_content)
41
    >>> print extract_text(main_content)
547
42
    Integrating foobar123451432 into your Launchpad account
548
42
    The application identified as foobar123451432 wants to access Launchpad on
43
    The application identified as foobar123451432 wants to access Launchpad on
549
43
    your behalf. What level of access do you want to grant?
44
    your behalf. What level of access do you want to grant?
550
44
    ...
45
    ...
551
45
    See all applications authorized to access Launchpad on your behalf.
46
    See all applications authorized to access Launchpad on your behalf.
552
46
47
553
47
This page contains one submit button for each item of OAuthPermission,
48
This page contains one submit button for each item of OAuthPermission,
572
48
except for 'Grant Permissions', which must be specifically requested.
49
except for 'Desktop Integration', which must be specifically requested.
573
49
50
574
50
    >>> browser.getControl('No Access')
51
    >>> def print_access_levels(main_content):
575
51
    <SubmitControl...
52
    ...     actions = main_content.findAll('input', attrs={'type': 'submit'})
576
52
    >>> browser.getControl('Read Non-Private Data')
53
    ...     for action in actions:
577
53
    <SubmitControl...
54
    ...         print action['value']
578
54
    >>> browser.getControl('Change Non-Private Data')
55
579
55
    <SubmitControl...
56
    >>> print_access_levels(main_content)
580
56
    >>> browser.getControl('Read Anything')
57
    No Access
581
57
    <SubmitControl...
58
    Read Non-Private Data
582
58
    >>> browser.getControl('Change Anything')
59
    Change Non-Private Data
583
59
    <SubmitControl...
60
    Read Anything
584
60
61
    Change Anything
585
61
    >>> browser.getControl('Grant Permissions')
62
586
62
    Traceback (most recent call last):
63
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
569
63
    ...
570
64
    LookupError: label 'Grant Permissions'
571
65
587
66
    >>> actions = main_content.findAll('input', attrs={'type': 'submit'})
64
    >>> actions = main_content.findAll('input', attrs={'type': 'submit'})
588
67
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
589
68
    >>> len(actions) == len(OAuthPermission.items) - 1
65
    >>> len(actions) == len(OAuthPermission.items) - 1
590
69
    True
66
    True
591
70
67
592
@@ -74,57 +71,53 @@
593
74
that isn't enough for the application. The user always has the option
71
that isn't enough for the application. The user always has the option
594
75
to deny permission altogether.
72
to deny permission altogether.
595
76
73
597
77
    >>> def print_access_levels(allow_permission):
74
    >>> def authorize_token_main_content(allow_permission):
598
78
    ...     browser.open(
75
    ...     browser.open(
599
79
    ...         "http://launchpad.dev/+authorize-token?%s&%s"
76
    ...         "http://launchpad.dev/+authorize-token?%s&%s"
600
80
    ...         % (urlencode(params), allow_permission))
77
    ...         % (urlencode(params), allow_permission))
607
81
    ...     main_content = find_tag_by_id(browser.contents, 'maincontent')
78
    ...     return find_tag_by_id(browser.contents, 'maincontent')
608
82
    ...     actions = main_content.findAll('input', attrs={'type': 'submit'})
79
609
83
    ...     for action in actions:
80
    >>> def print_access_levels_for(allow_permission):
610
84
    ...         print action['value']
81
    ...     main_content = authorize_token_main_content(allow_permission)
611
85
82
    ...     print_access_levels(main_content)
612
86
    >>> print_access_levels(
83
613
84
    >>> print_access_levels_for(
614
87
    ...     'allow_permission=WRITE_PUBLIC&allow_permission=WRITE_PRIVATE')
85
    ...     'allow_permission=WRITE_PUBLIC&allow_permission=WRITE_PRIVATE')
615
88
    No Access
86
    No Access
616
89
    Change Non-Private Data
87
    Change Non-Private Data
617
90
    Change Anything
88
    Change Anything
618
91
89
619
92
The only time the 'Grant Permissions' permission shows up in this list
620
93
is if the client specifically requests it, and no other
621
94
permission. (Also requesting UNAUTHORIZED is okay--it will show up
622
95
anyway.)
623
96
624
97
    >>> print_access_levels('allow_permission=GRANT_PERMISSIONS')
625
98
    No Access
626
99
    Grant Permissions
627
100
628
101
    >>> print_access_levels(
629
102
    ...     'allow_permission=GRANT_PERMISSIONS&allow_permission=UNAUTHORIZED')
630
103
    No Access
631
104
    Grant Permissions
632
105
633
106
    >>> print_access_levels(
634
107
    ...     'allow_permission=WRITE_PUBLIC&allow_permission=GRANT_PERMISSIONS')
635
108
    No Access
636
109
    Change Non-Private Data
637
110
638
111
If an application doesn't specify any valid access levels, or only
90
If an application doesn't specify any valid access levels, or only
639
112
specifies the UNAUTHORIZED access level, Launchpad will show all the
91
specifies the UNAUTHORIZED access level, Launchpad will show all the
655
113
access levels, except for GRANT_PERMISSIONS.
92
access levels, except for DESKTOP_INTEGRATION.
656
114
93
657
115
    >>> print_access_levels('')
94
    >>> print_access_levels_for('')
658
116
    No Access
95
    No Access
659
117
    Read Non-Private Data
96
    Read Non-Private Data
660
118
    Change Non-Private Data
97
    Change Non-Private Data
661
119
    Read Anything
98
    Read Anything
662
120
    Change Anything
99
    Change Anything
663
121
100
664
122
    >>> print_access_levels('allow_permission=UNAUTHORIZED')
101
    >>> print_access_levels_for('allow_permission=UNAUTHORIZED')
665
123
    No Access
102
    No Access
666
124
    Read Non-Private Data
103
    Read Non-Private Data
667
125
    Change Non-Private Data
104
    Change Non-Private Data
668
126
    Read Anything
105
    Read Anything
669
127
    Change Anything
106
    Change Anything
670
107
671
108
An application may not request the DESKTOP_INTEGRATION access level
672
109
unless its consumer key matches a certain pattern. (Successful desktop
673
110
integration has its own section, below.)
674
111
675
112
    >>> allow_permission = "allow_permission=DESKTOP_INTEGRATION"
676
113
    >>> browser.open(
677
114
    ...     "http://launchpad.dev/+authorize-token?%s&%s"
678
115
    ...         % (urlencode(params), allow_permission))
679
116
    Traceback (most recent call last):
680
117
    ...
681
118
    Unauthorized: Consumer "foobar123451432" asked for desktop
682
119
    integration, but didn't say what kind of desktop it is, or name
683
120
    the computer being integrated.
684
128
121
685
129
An application may also specify a context, so that the access granted
122
An application may also specify a context, so that the access granted
686
130
by the user is restricted to things related to that context.
123
by the user is restricted to things related to that context.
687
@@ -136,6 +129,7 @@
688
136
    ...     % urlencode(params_with_context))
129
    ...     % urlencode(params_with_context))
689
137
    >>> main_content = find_tag_by_id(browser.contents, 'maincontent')
130
    >>> main_content = find_tag_by_id(browser.contents, 'maincontent')
690
138
    >>> print extract_text(main_content)
131
    >>> print extract_text(main_content)
691
132
    Integrating foobar123451432 into your Launchpad account
692
139
    The application...wants to access things related to Mozilla Firefox...
133
    The application...wants to access things related to Mozilla Firefox...
693
140
134
694
141
A client other than a web browser may request a JSON representation of
135
A client other than a web browser may request a JSON representation of
695
@@ -263,3 +257,95 @@
696
263
    This request for accessing Launchpad on your behalf has been
257
    This request for accessing Launchpad on your behalf has been
697
264
    reviewed ... ago.
258
    reviewed ... ago.
698
265
    See all applications authorized to access Launchpad on your behalf.
259
    See all applications authorized to access Launchpad on your behalf.
699
260
700
261
Desktop integration
701
262
===================
702
263
703
264
The test case given above shows how to integrate a single application
704
265
or website into Launchpad. But it's also possible to integrate an
705
266
entire desktop environment into Launchpad.
706
267
707
268
The desktop integration option is only available for OAuth consumers
708
269
that say what kind of desktop they are (eg. Ubuntu) and give a name
709
270
that a user can identify with their computer (eg. the hostname). Here,
710
271
we'll create such a token.
711
272
712
273
    >>> login('salgado@ubuntu.com')
713
274
    >>> desktop_key = "System-wide: Ubuntu desktop (mycomputer)"
714
275
    >>> consumer = getUtility(IOAuthConsumerSet).new(desktop_key)
715
276
    >>> token = consumer.newRequestToken()
716
277
    >>> logout()
717
278
718
279
When a desktop tries to integrate with Launchpad, the user gets a
719
280
special warning about giving access to every program running on their
720
281
desktop.
721
282
722
283
    >>> params = dict(oauth_token=token.key)
723
284
    >>> print extract_text(
724
285
    ...     authorize_token_main_content(
725
286
    ...         'allow_permission=DESKTOP_INTEGRATION'))
726
287
    Integrating mycomputer into your Launchpad account
727
288
    The Ubuntu desktop called mycomputer wants access to your
728
289
    Launchpad account. If you allow the integration, all applications
729
290
    running on mycomputer will have read-write access to your
730
291
    Launchpad account, including to your private data.
731
292
    If you're using a public computer, if mycomputer is not the
732
293
    computer you're using right now, or if something just doesn't feel
733
294
    right about this situation, you should choose "No, thanks, I don't
734
295
    trust 'mycomputer'", or close this window now. You can always try
735
296
    again later.
736
297
    Even if you decide to allow the integration, you can change your
737
298
    mind later.
738
299
    See all applications authorized to access Launchpad on your behalf.
739
300
740
301
741
302
The only time the 'Desktop Integration' permission shows up in the
742
303
list of permissions is if the client specifically requests it, and no
743
304
other permission. (Also requesting UNAUTHORIZED is okay--it will show
744
305
up anyway.)
745
306
746
307
    >>> print_access_levels_for('allow_permission=DESKTOP_INTEGRATION')
747
308
    Give all programs running on "mycomputer" access to my Launchpad account.
748
309
    No, thanks, I don't trust "mycomputer".
749
310
750
311
    >>> print_access_levels_for(
751
312
    ...     'allow_permission=DESKTOP_INTEGRATION&allow_permission=UNAUTHORIZED')
752
313
    Give all programs running on "mycomputer" access to my Launchpad account.
753
314
    No, thanks, I don't trust "mycomputer".
754
315
755
316
A desktop may not request a level of access other than
756
317
DESKTOP_INTEGRATION, since the whole point is to have a permission
757
318
level that specifically applies across the entire desktop.
758
319
759
320
    >>> print_access_levels_for('allow_permission=WRITE_PRIVATE')
760
321
    Traceback (most recent call last):
761
322
    ...
762
323
    Unauthorized: Desktop integration token requested a permission
763
324
    ("Change Anything") not supported for desktop-wide use.
764
325
765
326
    >>> print_access_levels_for(
766
327
    ...     'allow_permission=WRITE_PUBLIC&allow_permission=DESKTOP_INTEGRATION')
767
328
    Traceback (most recent call last):
768
329
    ...
769
330
    Unauthorized: Desktop integration token requested a permission
770
331
    ("Change Non-Private Data") not supported for desktop-wide use.
771
332
772
333
You can't specify a callback URL when authorizing a desktop-wide
773
334
token, since callback URLs should only be used when integrating
774
335
websites into Launchpad.
775
336
776
337
    >>> params['oauth_callback'] = 'http://launchpad.dev/bzr'
777
338
    >>> print_access_levels_for('allow_permission=DESKTOP_INTEGRATION')
778
339
    Traceback (most recent call last):
779
340
    ...
780
341
    Unauthorized: A desktop integration may not specify an OAuth
781
342
    callback URL.
782
343
783
344
This is true even if the desktop token isn't asking for the
784
345
DESKTOP_INTEGRATION permission.
785
346
786
347
    >>> print_access_levels_for('allow_permission=WRITE_PRIVATE')
787
348
    Traceback (most recent call last):
788
349
    ...
789
350
    Unauthorized: A desktop integration may not specify an OAuth
790
351
    callback URL.
791
266
352
792
=== modified file 'lib/canonical/launchpad/templates/oauth-authorize.pt'
793
--- lib/canonical/launchpad/templates/oauth-authorize.pt	2009-07-17 17:59:07 +0000
794
+++ lib/canonical/launchpad/templates/oauth-authorize.pt	2010-10-19 14:17:46 +0000
795
@@ -21,28 +21,69 @@
796
21
      <tal:token-not-reviewed condition="not:token/is_reviewed">
21
      <tal:token-not-reviewed condition="not:token/is_reviewed">
797
22
        <div metal:use-macro="context/@@launchpad_form/form">
22
        <div metal:use-macro="context/@@launchpad_form/form">
798
23
          <div metal:fill-slot="extra_top">
23
          <div metal:fill-slot="extra_top">
821
24
            <p>The application identified as
24
822
25
              <strong tal:content="token/consumer/key">consumer</strong>
25
           <tal:desktop-integration-token condition="token/consumer/is_integrated_desktop">
823
26
              wants to access
26
             <h1>Integrating
824
27
              <tal:has-context condition="view/token_context">
27
               <tal:hostname replace="structure
825
28
                things related to
28
                token/consumer/integrated_desktop_name" />
826
29
                <strong tal:content="view/token_context/title">Context</strong>
29
               into your Launchpad account</h1>
827
30
                in
30
             <p>The
828
31
              </tal:has-context>
31
               <tal:desktop replace="structure
829
32
              Launchpad on your behalf. What level of access
32
               token/consumer/integrated_desktop_type" />
830
33
              do you want to grant?</p>
33
             called
831
34
34
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
832
35
            <table>
35
             wants access to your Launchpad account. If you allow the
833
36
              <tr tal:repeat="action view/visible_actions">
36
             integration, all applications running
834
37
                <td style="text-align: right">
37
             on <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
835
38
                  <tal:action replace="structure action/render" />
38
             will have read-write access to your Launchpad account,
836
39
                </td>
39
             including to your private data.</p>
837
40
                <td>
40
838
41
                  <span class="lesser"
41
             <p>If you're using a public computer, if
839
42
                    tal:content="action/permission/description" />
42
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
840
43
                </td>
43
             is not the computer you're using right now, or if
841
44
              </tr>
44
             something just doesn't feel right about this situation,
842
45
            </table>
45
             you should choose "No, thanks, I don't trust
843
46
             '<tal:hostname replace="structure
844
47
              token/consumer/integrated_desktop_name" />'",
845
48
             or close this window now. You can always try
846
49
             again later.</p>
847
50
848
51
             <p>Even if you decide to allow the integration, you can
849
52
             change your mind later.</p>
850
53
           </tal:desktop-integration-token>
851
54
852
55
           <tal:web-integration-token condition="not:token/consumer/is_integrated_desktop">
853
56
             <h1>Integrating
854
57
               <tal:hostname replace="structure token/consumer/key" />
855
58
               into your Launchpad account</h1>
856
59
857
60
             <p>The application identified as
858
61
               <strong tal:content="token/consumer/key">consumer</strong>
859
62
               wants to access
860
63
               <tal:has-context condition="view/token_context">
861
64
                 things related to
862
65
                 <strong tal:content="view/token_context/title">Context</strong>
863
66
                 in
864
67
               </tal:has-context>
865
68
               Launchpad on your behalf. What level of access
866
69
               do you want to grant?</p>
867
70
           </tal:web-integration-token>
868
71
869
72
           <table>
870
73
             <tr tal:repeat="action view/visible_actions">
871
74
               <td style="text-align: right">
872
75
                 <tal:action replace="structure action/render" />
873
76
               </td>
874
77
875
78
               <tal:web-integration-token
876
79
                  condition="not:token/consumer/is_integrated_desktop">
877
80
                 <td>
878
81
                   <span class="lesser"
879
82
                     tal:content="action/permission/description" />
880
83
                 </td>
881
84
               </tal:web-integration-token>
882
85
             </tr>
883
86
           </table>
884
46
          </div>
87
          </div>
885
47
88
886
48
          <div metal:fill-slot="extra_bottom">
89
          <div metal:fill-slot="extra_bottom">
887
49
90
888
=== added file 'lib/canonical/launchpad/tests/test_oauth_tokens.py'
889
--- lib/canonical/launchpad/tests/test_oauth_tokens.py	1970-01-01 00:00:00 +0000
890
+++ lib/canonical/launchpad/tests/test_oauth_tokens.py	2010-10-19 14:17:46 +0000
891
@@ -0,0 +1,47 @@
892
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
893
2
# GNU Affero General Public License version 3 (see the file LICENSE).
894
3
895
4
from datetime import (
896
5
    datetime,
897
6
    timedelta
898
7
    )
899
8
import pytz
900
9
901
10
from canonical.launchpad.webapp.interfaces import OAuthPermission
902
11
from canonical.testing.layers import DatabaseFunctionalLayer
903
12
904
13
from lp.testing import (
905
14
    TestCaseWithFactory,
906
15
    )
907
16
908
17
909
18
class TestRequestTokens(TestCaseWithFactory):
910
19
911
20
    layer = DatabaseFunctionalLayer
912
21
913
22
    def setUp(self):
914
23
        """Set up a dummy person and OAuth consumer."""
915
24
        super(TestRequestTokens, self).setUp()
916
25
917
26
        self.person = self.factory.makePerson()
918
27
        self.consumer = self.factory.makeOAuthConsumer()
919
28
920
29
        now = datetime.now(pytz.timezone('UTC'))
921
30
        self.a_long_time_ago = now - timedelta(hours=1000)
922
31
923
32
    def testExpiredRequestTokenCantBeReviewed(self):
924
33
        """An expired request token can't be reviewed."""
925
34
        token = self.factory.makeOAuthRequestToken(
926
35
            date_created=self.a_long_time_ago)
927
36
        self.assertRaises(
928
37
            AssertionError, token.review, self.person,
929
38
            OAuthPermission.WRITE_PUBLIC)
930
39
931
40
    def testExpiredRequestTokenCantBeExchanged(self):
932
41
        """An expired request token can't be exchanged for an access token.
933
42
934
43
        This can only happen if the token was reviewed before it expired.
935
44
        """
936
45
        token = self.factory.makeOAuthRequestToken(
937
46
            date_created=self.a_long_time_ago, reviewed_by=self.person)
938
47
        self.assertRaises(AssertionError, token.createAccessToken)
939
0
48
940
=== modified file 'lib/canonical/launchpad/webapp/authorization.py'
941
--- lib/canonical/launchpad/webapp/authorization.py	2010-08-20 20:31:18 +0000
942
+++ lib/canonical/launchpad/webapp/authorization.py	2010-10-19 14:17:46 +0000
943
@@ -61,7 +61,8 @@
944
61
        lp_permission = getUtility(ILaunchpadPermission, permission)
61
        lp_permission = getUtility(ILaunchpadPermission, permission)
945
62
        if lp_permission.access_level == "write":
62
        if lp_permission.access_level == "write":
946
63
            required_access_level = [
63
            required_access_level = [
948
64
                AccessLevel.WRITE_PUBLIC, AccessLevel.WRITE_PRIVATE]
64
                AccessLevel.WRITE_PUBLIC, AccessLevel.WRITE_PRIVATE,
949
65
                AccessLevel.DESKTOP_INTEGRATION]
950
65
            if access_level not in required_access_level:
66
            if access_level not in required_access_level:
951
66
                return False
67
                return False
952
67
        elif lp_permission.access_level == "read":
68
        elif lp_permission.access_level == "read":
953
@@ -80,7 +81,8 @@
954
80
        access to private objects, return False.  Return True otherwise.
81
        access to private objects, return False.  Return True otherwise.
955
81
        """
82
        """
956
82
        private_access_levels = [
83
        private_access_levels = [
958
83
            AccessLevel.READ_PRIVATE, AccessLevel.WRITE_PRIVATE]
84
            AccessLevel.READ_PRIVATE, AccessLevel.WRITE_PRIVATE,
959
85
            AccessLevel.DESKTOP_INTEGRATION]
960
84
        if access_level in private_access_levels:
86
        if access_level in private_access_levels:
961
85
            # The user has access to private objects. Return early,
87
            # The user has access to private objects. Return early,
962
86
            # before checking whether the object is private, since
88
            # before checking whether the object is private, since
963
87
89
964
=== modified file 'lib/canonical/launchpad/webapp/interfaces.py'
965
--- lib/canonical/launchpad/webapp/interfaces.py	2010-09-24 09:42:01 +0000
966
+++ lib/canonical/launchpad/webapp/interfaces.py	2010-10-19 14:17:46 +0000
967
@@ -531,14 +531,13 @@
968
531
        for reading and changing anything, including private data.
531
        for reading and changing anything, including private data.
969
532
        """)
532
        """)
970
533
533
973
534
    GRANT_PERMISSIONS = DBItem(60, """
534
    DESKTOP_INTEGRATION = DBItem(60, """
974
535
        Grant Permissions
535
        Desktop Integration
975
536
536
981
537
        The application will be able to grant access to your Launchpad
537
        Every application running on your desktop will have read-write
982
538
        account to any other application. This is a very powerful
538
        access to your Launchpad account, including to your private
983
539
        level of access. You should not grant this level of access to
539
        data. You should not allow this unless you trust the computer
984
540
        any application except the official Launchpad credential
540
        you're using right now.
980
541
        manager.
985
542
        """)
541
        """)
986
543
542
987
544
class AccessLevel(DBEnumeratedType):
543
class AccessLevel(DBEnumeratedType):
988
545
544
989
=== modified file 'lib/canonical/launchpad/webapp/servers.py'
990
--- lib/canonical/launchpad/webapp/servers.py	2010-09-28 07:00:56 +0000
991
+++ lib/canonical/launchpad/webapp/servers.py	2010-10-19 14:17:46 +0000
992
@@ -8,7 +8,6 @@
993
8
__metaclass__ = type
8
__metaclass__ = type
994
9
9
995
10
import cgi
10
import cgi
996
11
from datetime import datetime
997
12
import threading
11
import threading
998
13
import xmlrpclib
12
import xmlrpclib
999
14
13
1000
@@ -1277,10 +1276,9 @@
1001
1277
            token.checkNonceAndTimestamp(nonce, timestamp)
1276
            token.checkNonceAndTimestamp(nonce, timestamp)
1002
1278
        except (NonceAlreadyUsed, TimestampOrderingError, ClockSkew), e:
1277
        except (NonceAlreadyUsed, TimestampOrderingError, ClockSkew), e:
1003
1279
            raise Unauthorized('Invalid nonce/timestamp: %s' % e)
1278
            raise Unauthorized('Invalid nonce/timestamp: %s' % e)
1004
1280
        now = datetime.now(pytz.timezone('UTC'))
1005
1281
        if token.permission == OAuthPermission.UNAUTHORIZED:
1279
        if token.permission == OAuthPermission.UNAUTHORIZED:
1006
1282
            raise Unauthorized('Unauthorized token (%s).' % token.key)
1280
            raise Unauthorized('Unauthorized token (%s).' % token.key)
1008
1283
        elif token.date_expires is not None and token.date_expires <= now:
1281
        elif token.is_expired:
1009
1284
            raise Unauthorized('Expired token (%s).' % token.key)
1282
            raise Unauthorized('Expired token (%s).' % token.key)
1010
1285
        elif not check_oauth_signature(request, consumer, token):
1283
        elif not check_oauth_signature(request, consumer, token):
1011
1286
            raise Unauthorized('Invalid signature.')
1284
            raise Unauthorized('Invalid signature.')
1012
1287
1285
1013
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
1014
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-10-02 11:41:43 +0000
1015
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-10-19 14:17:46 +0000
1016
@@ -50,8 +50,8 @@
1017
50
from lp.soyuz.enums import (
50
from lp.soyuz.enums import (
1018
51
    BinaryPackageFormat,
51
    BinaryPackageFormat,
1019
52
    PackagePublishingPriority,
52
    PackagePublishingPriority,
1020
53
    PackagePublishingStatus,
1021
53
    PackageUploadCustomFormat,
54
    PackageUploadCustomFormat,
1022
54
    PackageUploadStatus,
1023
55
    )
55
    )
1024
56
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
56
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
1025
57
from lp.soyuz.interfaces.component import IComponentSet
57
from lp.soyuz.interfaces.component import IComponentSet
1026
@@ -781,11 +781,9 @@
1027
781
    #   Database relationship methods
781
    #   Database relationship methods
1028
782
    #
782
    #
1029
783
    def findSourcePackageRelease(self):
783
    def findSourcePackageRelease(self):
1031
784
        """Return the respective ISourcePackagRelease for this binary upload.
784
        """Return the respective ISourcePackageRelease for this binary upload.
1032
785
785
1036
786
        It inspect publication in the targeted DistroSeries and also the
786
        It inspect publication in the targeted DistroSeries.
1034
787
        ACCEPTED queue for sources matching stored
1035
788
        (source_name, source_version).
1037
789
787
1038
790
        It raises UploadError if the source was not found.
788
        It raises UploadError if the source was not found.
1039
791
789
1040
@@ -793,43 +791,19 @@
1041
793
        mixed_uploads (source + binary) we do not have the source stored
791
        mixed_uploads (source + binary) we do not have the source stored
1042
794
        in DB yet (see verifySourcepackagerelease).
792
        in DB yet (see verifySourcepackagerelease).
1043
795
        """
793
        """
1044
794
        assert self.source_name is not None
1045
795
        assert self.source_version is not None
1046
796
        distroseries = self.policy.distroseries
796
        distroseries = self.policy.distroseries
1047
797
        spphs = distroseries.getPublishedSources(
797
        spphs = distroseries.getPublishedSources(
1048
798
            self.source_name, version=self.source_version,
798
            self.source_name, version=self.source_version,
1049
799
            include_pending=True, archive=self.policy.archive)
799
            include_pending=True, archive=self.policy.archive)
1050
800
800
1078
801
        sourcepackagerelease = None
801
        if spphs.count() == 0:
1052
802
        if spphs:
1053
803
            # We know there's only going to be one release because
1054
804
            # version is unique.
1055
805
            assert spphs.count() == 1, "Duplicated ancestry"
1056
806
            sourcepackagerelease = spphs[0].sourcepackagerelease
1057
807
        else:
1058
808
            # XXX cprov 2006-08-09 bug=55774: Building from ACCEPTED is
1059
809
            # special condition, not really used in production. We should
1060
810
            # remove the support for this use case.
1061
811
            self.logger.debug(
1062
812
                "No source published, checking the ACCEPTED queue")
1063
813
1064
814
            queue_candidates = distroseries.getQueueItems(
1065
815
                status=PackageUploadStatus.ACCEPTED,
1066
816
                name=self.source_name, version=self.source_version,
1067
817
                archive=self.policy.archive, exact_match=True)
1068
818
1069
819
            for queue_item in queue_candidates:
1070
820
                if queue_item.sources.count():
1071
821
                    sourcepackagerelease = queue_item.sourcepackagerelease
1072
822
1073
823
        if sourcepackagerelease is None:
1074
824
            # At this point, we can't really do much more to try
1075
825
            # building this package. If we look in the NEW queue it is
1076
826
            # possible that multiple versions of the package exist there
1077
827
            # and we know how bad that can be. Time to give up!
1079
828
            raise UploadError(
802
            raise UploadError(
1080
829
                "Unable to find source package %s/%s in %s" % (
803
                "Unable to find source package %s/%s in %s" % (
1081
830
                self.source_name, self.source_version, distroseries.name))
804
                self.source_name, self.source_version, distroseries.name))
1082
831
805
1084
832
        return sourcepackagerelease
806
        return spphs[0].sourcepackagerelease
1085
833
807
1086
834
    def verifySourcePackageRelease(self, sourcepackagerelease):
808
    def verifySourcePackageRelease(self, sourcepackagerelease):
1087
835
        """Check if the given ISourcePackageRelease matches the context."""
809
        """Check if the given ISourcePackageRelease matches the context."""
1088
836
810
1089
=== modified file 'lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt'
1090
--- lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt	2009-04-17 10:32:16 +0000
1091
+++ lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt	2010-10-19 14:17:46 +0000
1092
@@ -208,6 +208,14 @@
1093
208
    >>> bar_spr.version
208
    >>> bar_spr.version
1094
209
    u'1:1.0-9'
209
    u'1:1.0-9'
1095
210
210
1096
211
    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1097
212
    >>> from lp.soyuz.interfaces.publishing import IPublishingSet
1098
213
    >>> getUtility(IPublishingSet).newSourcePublication(
1099
214
    ...     bar_src_upload.policy.distro.main_archive, bar_spr,
1100
215
    ...     bar_src_upload.policy.distroseries, bar_spr.component,
1101
216
    ...     bar_spr.section, PackagePublishingPocket.RELEASE)
1102
217
    <SourcePackagePublishingHistory at ...>
1103
218
1104
211
Let's accept the source and claim 'build from accepted' to process the
219
Let's accept the source and claim 'build from accepted' to process the
1105
212
respective binary:
220
respective binary:
1106
213
221
1107
@@ -217,9 +225,6 @@
1108
217
    >>> bar_src_queue.status.name
225
    >>> bar_src_queue.status.name
1109
218
    'ACCEPTED'
226
    'ACCEPTED'
1110
219
227
1111
220
    >>> from canonical.launchpad.ftests import syncUpdate
1112
221
    >>> syncUpdate(bar_src_queue)
1113
222
1114
223
For a binary upload we expect the same, a BinaryPackageRelease
228
For a binary upload we expect the same, a BinaryPackageRelease
1115
224
'version' that includes 'epoch':
229
'version' that includes 'epoch':
1116
225
230
1117
226
231
1118
=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
1119
--- lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-14 18:42:19 +0000
1120
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-19 14:17:46 +0000
1121
@@ -484,86 +484,6 @@
1122
484
  1
484
  1
1123
485
485
1124
486
486
1125
487
=== Building From ACCEPTED queue ===
1126
488
1127
489
XXX cprov 20060728: Building from ACCEPTED is special condition, not
1128
490
really used in production. We should remove the support for this use
1129
491
case, see further info in bug #55774.
1130
492
1131
493
Next we send in the binaries, since the source should be in ACCEPTED the
1132
494
binary should go straight there too. Note that we are not specifying
1133
495
any build, so it should be created appropriately, it is what happens
1134
496
with staged security uploads:
1135
497
1136
498
XXX cprov 20070404: we are using a modified sync policy because we
1137
499
need unsigned changes and binaries uploads (same as security, but also
1138
500
accepts non-security uploads)
1139
501
1140
502
  >>> from lp.archiveuploader.uploadpolicy import ArchiveUploadType
1141
503
  >>> modified_sync_policy = getPolicy(
1142
504
  ...     name='sync', distro='ubuntu', distroseries='hoary')
1143
505
  >>> modified_sync_policy.accepted_type = ArchiveUploadType.BINARY_ONLY
1144
506
1145
507
  >>> ed_bin = NascentUpload.from_changesfile_path(
1146
508
  ...      datadir('split-upload-test/ed_0.2-20_i386.changes'),
1147
509
  ...      modified_sync_policy, mock_logger_quiet)
1148
510
1149
511
  >>> ed_bin.process()
1150
512
  >>> ed_bin.is_rejected
1151
513
  False
1152
514
1153
515
  >>> success = ed_bin.do_accept()
1154
516
1155
517
  >>> ed_bin.queue_root.status.name
1156
518
  'NEW'
1157
519
1158
520
A build was created to represent the relationship between ed_src
1159
521
(waiting in ACCEPTED queue) and the just uploaded ed_bin:
1160
522
1161
523
  >>> ed_build = ed_bin.queue_root.builds[0].build
1162
524
1163
525
  >>> ed_spr.id  == ed_build.source_package_release.id
1164
526
  True
1165
527
1166
528
  >>> ed_build.title
1167
529
  u'i386 build of ed 0.2-20 in ubuntu hoary RELEASE'
1168
530
1169
531
  >>> ed_build.status.name
1170
532
  'FULLYBUILT'
1171
533
1172
534
Binary control file attributes are stored as text in the
1173
535
BinaryPackageRelease record.
1174
536
1175
537
  >>> ed_bpr = ed_build.binarypackages[0]
1176
538
1177
539
  >>> ed_bpr.depends
1178
540
  u'libc6 (>= 2.6-1)'
1179
541
1180
542
  >>> ed_bpr.suggests
1181
543
  u'emacs'
1182
544
1183
545
  >>> ed_bpr.conflicts
1184
546
  u'vi'
1185
547
1186
548
  >>> ed_bpr.replaces
1187
549
  u'vim'
1188
550
1189
551
  >>> ed_bpr.provides
1190
552
  u'ed'
1191
553
1192
554
  >>> ed_bpr.essential
1193
555
  False
1194
556
1195
557
  >>> ed_bpr.pre_depends
1196
558
  u'dpkg'
1197
559
1198
560
  >>> ed_bpr.enhances
1199
561
  u'bash'
1200
562
1201
563
  >>> ed_bpr.breaks
1202
564
  u'emacs'
1203
565
1204
566
1205
567
=== Staged Source and Binary upload with multiple binaries ===
487
=== Staged Source and Binary upload with multiple binaries ===
1206
568
488
1207
569
As we could see both, sources and binaries, get into Launchpad via
489
As we could see both, sources and binaries, get into Launchpad via
1208
@@ -613,12 +533,18 @@
1209
613
  >>> multibar_src_queue.status.name
533
  >>> multibar_src_queue.status.name
1210
614
  'ACCEPTED'
534
  'ACCEPTED'
1211
615
535
1214
616
We can just assume the source was published by step 3 and 4 for
536
Then the source gets accepted and published, step 3 and 4:
1215
617
simplicity and claim 'build from ACCEPTED' feature.
537
1216
538
  >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1217
539
  >>> from lp.soyuz.interfaces.publishing import IPublishingSet
1218
540
  >>> getUtility(IPublishingSet).newSourcePublication(
1219
541
  ...     multibar_src_queue.archive, multibar_spr,
1220
542
  ...     sync_policy.distroseries, multibar_spr.component,
1221
543
  ...     multibar_spr.section, PackagePublishingPocket.RELEASE)
1222
544
  <SourcePackagePublishingHistory at ...>
1223
618
545
1224
619
Build creation is done based on the SourcePackageRelease object, step 5:
546
Build creation is done based on the SourcePackageRelease object, step 5:
1225
620
547
1226
621
  >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1227
622
  >>> multibar_build = multibar_spr.createBuild(
548
  >>> multibar_build = multibar_spr.createBuild(
1228
623
  ...     hoary['i386'], PackagePublishingPocket.RELEASE,
549
  ...     hoary['i386'], PackagePublishingPocket.RELEASE,
1229
624
  ...     multibar_src_queue.archive)
550
  ...     multibar_src_queue.archive)
1230
@@ -636,8 +562,8 @@
1231
636
and the collection of DEB files produced.
562
and the collection of DEB files produced.
1232
637
563
1233
638
At this point slave-scanner moves the upload to the appropriate path
564
At this point slave-scanner moves the upload to the appropriate path
1236
639
(/srv/launchpad.net/builddmaster) and invokes process-upload.py with
565
(/srv/launchpad.net/builddmaster). A cron job invokes process-upload.py
1237
640
the 'buildd' upload policy and the build record id.
566
with the 'buildd' upload policy and processes all files in that directory.
1238
641
567
1239
642
  >>> buildd_policy = getPolicy(
568
  >>> buildd_policy = getPolicy(
1240
643
  ...     name='buildd', distro='ubuntu', distroseries='hoary')
569
  ...     name='buildd', distro='ubuntu', distroseries='hoary')
1241
644
570
1242
=== modified file 'lib/lp/archiveuploader/tests/test_buildduploads.py'
1243
--- lib/lp/archiveuploader/tests/test_buildduploads.py	2010-10-06 11:46:51 +0000
1244
+++ lib/lp/archiveuploader/tests/test_buildduploads.py	2010-10-19 14:17:46 +0000
1245
@@ -20,6 +20,7 @@
1246
20
    )
20
    )
1247
21
from lp.registry.interfaces.distribution import IDistributionSet
21
from lp.registry.interfaces.distribution import IDistributionSet
1248
22
from lp.registry.interfaces.pocket import PackagePublishingPocket
22
from lp.registry.interfaces.pocket import PackagePublishingPocket
1249
23
from lp.soyuz.interfaces.publishing import IPublishingSet
1250
23
from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
24
from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
1251
24
25
1252
25
26
1253
@@ -195,6 +196,13 @@
1254
195
        real_policy = self.policy
196
        real_policy = self.policy
1255
196
        self.policy = 'insecure'
197
        self.policy = 'insecure'
1256
197
        super(TestBuilddUploads, self).setUp()
198
        super(TestBuilddUploads, self).setUp()
1257
199
        # Publish the source package release so it can be found by
1258
200
        # NascentUploadFile.findSourcePackageRelease().
1259
201
        spr = self.source_queue.sources[0].sourcepackagerelease
1260
202
        getUtility(IPublishingSet).newSourcePublication(
1261
203
            self.distroseries.main_archive, spr,
1262
204
            self.distroseries, spr.component,
1263
205
            spr.section, PackagePublishingPocket.RELEASE)
1264
198
        self.policy = real_policy
206
        self.policy = real_policy
1265
199
207
1266
200
    def _publishBuildQueueItem(self, queue_item):
208
    def _publishBuildQueueItem(self, queue_item):
1267
201
209
1268
=== modified file 'lib/lp/archiveuploader/tests/test_nascentuploadfile.py'
1269
--- lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2010-10-06 11:46:51 +0000
1270
+++ lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2010-10-19 14:17:46 +0000
1271
@@ -25,7 +25,10 @@
1272
25
from lp.registry.interfaces.pocket import PackagePublishingPocket
25
from lp.registry.interfaces.pocket import PackagePublishingPocket
1273
26
from lp.archiveuploader.tests import AbsolutelyAnythingGoesUploadPolicy
26
from lp.archiveuploader.tests import AbsolutelyAnythingGoesUploadPolicy
1274
27
from lp.buildmaster.enums import BuildStatus
27
from lp.buildmaster.enums import BuildStatus
1276
28
from lp.soyuz.enums import PackageUploadCustomFormat
28
from lp.soyuz.enums import (
1277
29
    PackageUploadCustomFormat,
1278
30
    PackagePublishingStatus,
1279
31
    )
1280
29
from lp.testing import TestCaseWithFactory
32
from lp.testing import TestCaseWithFactory
1281
30
33
1282
31
34
1283
@@ -387,3 +390,68 @@
1284
387
            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
390
            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
1285
388
            None)
391
            None)
1286
389
        self.assertRaises(UploadError, uploadfile.checkBuild, build)
392
        self.assertRaises(UploadError, uploadfile.checkBuild, build)
1287
393
1288
394
    def test_findSourcePackageRelease(self):
1289
395
        # findSourcePackageRelease finds the matching SourcePackageRelease.
1290
396
        das = self.factory.makeDistroArchSeries(
1291
397
            distroseries=self.policy.distroseries, architecturetag="i386")
1292
398
        build = self.factory.makeBinaryPackageBuild(
1293
399
            distroarchseries=das,
1294
400
            archive=self.policy.archive)
1295
401
        uploadfile = self.createDebBinaryUploadFile(
1296
402
            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
1297
403
            None)
1298
404
        spph = self.factory.makeSourcePackagePublishingHistory(
1299
405
            sourcepackagename=self.factory.makeSourcePackageName("foo"),
1300
406
            distroseries=self.policy.distroseries,
1301
407
            version="0.42", archive=self.policy.archive)
1302
408
        control = self.getBaseControl()
1303
409
        control["Source"] = "foo"
1304
410
        uploadfile.parseControl(control)
1305
411
        self.assertEquals(
1306
412
            spph.sourcepackagerelease, uploadfile.findSourcePackageRelease())
1307
413
1308
414
    def test_findSourcePackageRelease_no_spph(self):
1309
415
        # findSourcePackageRelease raises UploadError if there is no
1310
416
        # SourcePackageRelease.
1311
417
        das = self.factory.makeDistroArchSeries(
1312
418
            distroseries=self.policy.distroseries, architecturetag="i386")
1313
419
        build = self.factory.makeBinaryPackageBuild(
1314
420
            distroarchseries=das,
1315
421
            archive=self.policy.archive)
1316
422
        uploadfile = self.createDebBinaryUploadFile(
1317
423
            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
1318
424
            None)
1319
425
        control = self.getBaseControl()
1320
426
        control["Source"] = "foo"
1321
427
        uploadfile.parseControl(control)
1322
428
        self.assertRaises(UploadError, uploadfile.findSourcePackageRelease)
1323
429
1324
430
    def test_findSourcePackageRelease_multiple_sprs(self):
1325
431
        # findSourcePackageRelease finds the last uploaded
1326
432
        # SourcePackageRelease and can deal with multiple pending source
1327
433
        # package releases.
1328
434
        das = self.factory.makeDistroArchSeries(
1329
435
            distroseries=self.policy.distroseries, architecturetag="i386")
1330
436
        build = self.factory.makeBinaryPackageBuild(
1331
437
            distroarchseries=das,
1332
438
            archive=self.policy.archive)
1333
439
        uploadfile = self.createDebBinaryUploadFile(
1334
440
            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
1335
441
            None)
1336
442
        spn = self.factory.makeSourcePackageName("foo")
1337
443
        spph1 = self.factory.makeSourcePackagePublishingHistory(
1338
444
            sourcepackagename=spn,
1339
445
            distroseries=self.policy.distroseries,
1340
446
            version="0.42", archive=self.policy.archive,
1341
447
            status=PackagePublishingStatus.PUBLISHED)
1342
448
        spph2 = self.factory.makeSourcePackagePublishingHistory(
1343
449
            sourcepackagename=spn,
1344
450
            distroseries=self.policy.distroseries,
1345
451
            version="0.42", archive=self.policy.archive,
1346
452
            status=PackagePublishingStatus.PENDING)
1347
453
        control = self.getBaseControl()
1348
454
        control["Source"] = "foo"
1349
455
        uploadfile.parseControl(control)
1350
456
        self.assertEquals(
1351
457
            spph2.sourcepackagerelease, uploadfile.findSourcePackageRelease())
1352
390
458
1353
=== modified file 'lib/lp/testing/factory.py'
1354
--- lib/lp/testing/factory.py	2010-10-18 21:18:03 +0000
1355
+++ lib/lp/testing/factory.py	2010-10-19 14:17:46 +0000
1356
@@ -79,6 +79,7 @@
1357
79
    EmailAddressStatus,
79
    EmailAddressStatus,
1358
80
    IEmailAddressSet,
80
    IEmailAddressSet,
1359
81
    )
81
    )
1360
82
from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1361
82
from canonical.launchpad.interfaces.gpghandler import IGPGHandler
83
from canonical.launchpad.interfaces.gpghandler import IGPGHandler
1362
83
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
84
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
1363
84
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
85
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
1364
@@ -91,6 +92,7 @@
1365
91
    DEFAULT_FLAVOR,
92
    DEFAULT_FLAVOR,
1366
92
    IStoreSelector,
93
    IStoreSelector,
1367
93
    MAIN_STORE,
94
    MAIN_STORE,
1368
95
    OAuthPermission,
1369
94
    )
96
    )
1370
95
from lp.app.enums import ServiceUsage
97
from lp.app.enums import ServiceUsage
1371
96
from lp.archiveuploader.dscfile import DSCFile
98
from lp.archiveuploader.dscfile import DSCFile
1372
@@ -3165,6 +3167,33 @@
1373
3165
                to_source=to_source, date_fulfilled=date_fulfilled,
3167
                to_source=to_source, date_fulfilled=date_fulfilled,
1374
3166
                status=status, diff_content=lfa))
3168
                status=status, diff_content=lfa))
1375
3167
3169
1376
3170
    # Factory methods for OAuth tokens.
1377
3171
    def makeOAuthConsumer(self, key=None, secret=None):
1378
3172
        if key is None:
1379
3173
            key = self.getUniqueString("oauthconsumerkey")
1380
3174
        if secret is None:
1381
3175
            secret = ''
1382
3176
        return getUtility(IOAuthConsumerSet).new(key, secret)
1383
3177
1384
3178
    def makeOAuthRequestToken(
1385
3179
        self, consumer=None, date_created=None, reviewed_by=None,
1386
3180
        access_level=OAuthPermission.READ_PUBLIC):
1387
3181
        """Create a (possibly reviewed) OAuth request token."""
1388
3182
        if consumer is None:
1389
3183
            consumer = self.makeOAuthConsumer()
1390
3184
        token = consumer.newRequestToken()
1391
3185
1392
3186
        if reviewed_by is not None:
1393
3187
            # Review the token before modifying the date_created,
1394
3188
            # since the date_created can be used to simulate an
1395
3189
            # expired token.
1396
3190
            token.review(reviewed_by, access_level)
1397
3191
1398
3192
        if date_created is not None:
1399
3193
            unwrapped_token = removeSecurityProxy(token)
1400
3194
            unwrapped_token.date_created = date_created
1401
3195
        return token
1402
3196
1403
3168
3197
1404
3169
# Some factory methods return simple Python types. We don't add
3198
# Some factory methods return simple Python types. We don't add
1405
3170
# security wrappers for them, as well as for objects created by
3199
# security wrappers for them, as well as for objects created by
Status:	Merged
Approved by:	Leonard Richardson on 2010-10-18
Approved revision:	no longer in the source branch.
Merge reported by:	Leonard Richardson
Merged at revision:	not available
Proposed branch:	lp:~leonardr/launchpad/automatically-calculate-request-token-expire-time
Merge into:	lp:launchpad/db-devel
Diff against target:	1405 lines (+672/-275) 17 files modified lib/canonical/launchpad/browser/oauth.py (+106/-27) lib/canonical/launchpad/database/oauth.py (+79/-10) lib/canonical/launchpad/doc/oauth.txt (+39/-0) lib/canonical/launchpad/doc/webapp-authorization.txt (+5/-13) lib/canonical/launchpad/interfaces/oauth.py (+44/-9) lib/canonical/launchpad/pagetests/oauth/authorize-token.txt (+146/-60) lib/canonical/launchpad/templates/oauth-authorize.pt (+63/-22) lib/canonical/launchpad/tests/test_oauth_tokens.py (+47/-0) lib/canonical/launchpad/webapp/authorization.py (+4/-2) lib/canonical/launchpad/webapp/interfaces.py (+6/-7) lib/canonical/launchpad/webapp/servers.py (+1/-3) lib/lp/archiveuploader/nascentuploadfile.py (+7/-33) lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt (+8/-3) lib/lp/archiveuploader/tests/nascentupload.txt (+11/-85) lib/lp/archiveuploader/tests/test_buildduploads.py (+8/-0) lib/lp/archiveuploader/tests/test_nascentuploadfile.py (+69/-1) lib/lp/testing/factory.py (+29/-0)
To merge this branch:	bzr merge lp:~leonardr/launchpad/automatically-calculate-request-token-expire-time
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)		2010-10-14	Approve on 2010-10-14
Review via email: mp+38423@code.launchpad.net