MAAS

Merge lp://qastaging/~rvb/maas/oauth-retry-bug-1435767 into lp://qastaging/~maas-committers/maas/trunk

oauth-retry-bug-1435767
Merge into trunk

Proposed by Raphaël Badin on 2015-04-02

Status:

Merged

Approved by:

Raphaël Badin on 2015-04-02

Approved revision:

no longer in the source branch.

Merged at revision:

3760

Proposed branch:

lp://qastaging/~rvb/maas/oauth-retry-bug-1435767

Merge into:

lp://qastaging/~maas-committers/maas/trunk

Diff against target:

186 lines (+106/-5)

2 files modified

src/maasserver/utils/tests/test_views.py (+90/-5)
src/maasserver/utils/views.py (+16/-0)

To merge this branch:

bzr merge lp://qastaging/~rvb/maas/oauth-retry-bug-1435767

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2015-04-02	Approve on 2015-04-02
Review via email: mp+255063@code.qastaging.launchpad.net

Commit message

Delete the nonce before retrying requests.

Description of the change

- I've used the oauth_request.get_parameter() methods in delete_oauth_nonce instead of using the similar methods that return the Consumer and the Token object in order to minimize the number of database queries: the only thing we're interested in here is the Nonce object.

- I realize the testing done in test__get_response_deleted_nonces_across_requests is a bit fragile because it assumes a lot of stuff about the internals but that's the best I could come up with in a testing environment.