lp:~canonical-isd-hackers/canonical-identity-provider/add-yubikey-support

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:canonical-identity-provider/release

Canonical ISD hackers: Pending requested 2011-05-11

Diff: 3068 lines (+1803/-133) (has conflicts)

51 files modified

.bzrignore (+1/-0)
identityprovider/admin.py (+9/-1)
identityprovider/fields.py (+5/-0)
identityprovider/forms.py (+55/-4)
identityprovider/management/commands/populate.py (+3/-2)
identityprovider/models/__init__.py (+2/-0)
identityprovider/models/account.py (+4/-3)
identityprovider/models/yubi.py (+121/-0)
identityprovider/models/yubi_key.py (+19/-0)
identityprovider/templates/account/applications.html (+1/-1)
identityprovider/templates/account/confirm_new_email.html (+1/-1)
identityprovider/templates/account/delete_email.html (+1/-1)
identityprovider/templates/account/delete_key.html (+35/-0)
identityprovider/templates/account/edit.html (+11/-2)
identityprovider/templates/account/emails.html (+1/-1)
identityprovider/templates/account/keys.html (+83/-0)
identityprovider/templates/account/new_email.html (+1/-1)
identityprovider/templates/account/tokens.html (+1/-1)
identityprovider/templates/admin/readonly_confirm.html (+1/-1)
identityprovider/templates/consumer/index.html (+27/-4)
identityprovider/templates/decide.html (+1/-1)
identityprovider/templates/invalid_identifier.html (+1/-1)
identityprovider/templates/launchpad/registration/login.html (+1/-1)
identityprovider/templates/registration/email_sent.html (+1/-1)
identityprovider/templates/registration/forgot_password.html (+1/-1)
identityprovider/templates/registration/new_account.html (+1/-1)
identityprovider/templates/registration/old_confirm_new_account.html (+1/-1)
identityprovider/templates/registration/reset_password.html (+1/-1)
identityprovider/templates/registration/token.html (+1/-0)
identityprovider/templates/select_language.html (+1/-1)
identityprovider/templates/ubuntu/registration/login.html (+25/-2)
identityprovider/templates/ubuntu/registration/two_step.html (+189/-0)
identityprovider/templates/widgets/launchpad/logout-button.html (+1/-0)
identityprovider/tests/test_forms.py (+180/-0)
identityprovider/tests/test_models_account.py (+4/-0)
identityprovider/tests/test_models_yubi.py (+156/-0)
identityprovider/tests/test_views_account.py (+62/-1)
identityprovider/tests/test_views_consumer.py (+43/-5)
identityprovider/tests/test_views_server.py (+246/-6)
identityprovider/tests/test_views_ui.py (+52/-16)
identityprovider/tests/utils.py (+42/-12)
identityprovider/urls.py (+4/-0)
identityprovider/views/account.py (+77/-15)
identityprovider/views/consumer.py (+20/-3)
identityprovider/views/server.py (+87/-24)
identityprovider/views/ui.py (+80/-9)
mockservice/yubiserver.py (+73/-0)
payload/__init__.py (+15/-3)
payload/virtualenv.py (+2/-3)
requirements.txt (+51/-0)
setup.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

173. By Danny Tamez on 2011-05-27

Support for relying parties for two form authentication.

Merged branch lp:~canonical-isd-hackers/canonical-identity-provider/yubi_and_relying_party

172. By David Owen on 2011-05-27

Tests for adding & removing YubiKeys

Merged branch lp:~canonical-isd-hackers/canonical-identity-provider/dsowens-tests

171. By Michael Hall on 2011-05-20

Store the PAPE authentication method used in the user's session and return it to the relaying party if it was requested.

Merged branch lp:~mhall119/canonical-identity-provider/pape-in-session

170. By Matthew Nuzum on 2011-05-18

This includes the progress bar version of the 2nd factor authentication page. This is not 100% done, the progressive enhancement part needs further testing, however it is working and ready to be incorporated into other's code.

Merged branch lp:~newz/canonical-identity-provider/2factor-progress-bar

169. By Danny Tamez on 2011-05-18

Fixed missing csrf tag and fixed created of generate_openid_identifier function

Merged branch lp:~canonical-isd-hackers/canonical-identity-provider/fix_sql_and_csrf

168. By Ricardo Kirkner on 2011-05-13

added feature flag for yubikey support

Merged branch lp:~ricardokirkner/canonical-identity-provider/yubikey_feature_flag

167. By David Owen on 2011-05-13

Finishes the YubiKey->UserYubiKey model rename

Merged branch lp:~canonical-isd-hackers/canonical-identity-provider/finish-yubi-rename

166. By Ricardo Kirkner on 2011-05-13

merged in lastest trunk

165. By Łukasz Czyżykowski on 2011-05-12

Renamed the user YubiKey class to UserYubiKey.

Merged branch lp:~canonical-isd-hackers/canonical-identity-provider/rename-useryubikey-class

164. By Ricardo Kirkner on 2011-05-12

require specific versions of configglue/django-configglue