Merge lp://staging/~mandel/ubuntu-sso-client/ssl-checkbox into lp://staging/ubuntu-sso-client
| Status: | Rejected |
|---|---|
| Rejected by: | Manuel de la Peña |
| Proposed branch: | lp://staging/~mandel/ubuntu-sso-client/ssl-checkbox |
| Merge into: | lp://staging/ubuntu-sso-client |
| Prerequisite: | lp://staging/~mandel/ubuntu-sso-client/pinned-certs |
| Diff against target: |
151 lines (+46/-7) 5 files modified
ubuntu_sso/__init__.py (+1/-0) ubuntu_sso/qt/ssl_dialog.py (+6/-2) ubuntu_sso/qt/tests/test_ssl_dialog.py (+10/-1) ubuntu_sso/utils/webclient/common.py (+5/-3) ubuntu_sso/utils/webclient/tests/test_webclient.py (+24/-1) |
| To merge this branch: | bzr merge lp://staging/~mandel/ubuntu-sso-client/ssl-checkbox |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Disapprove | ||
| dobey (community) | Needs Fixing | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Added the required changes in the ssl dialog and in the common webclient code to only store pinned certificates when the user has checked the box in the ui (LP: #955831).
Description of the change
- Added the required changes in the ssl dialog and in the common webclient code to only store pinned certificates when the user has checked the box in the ui (LP: #955831).
Unmerged revisions
- 953. By Manuel de la Peña
-
Merged pinned-certs into ssl-checkbox.
- 952. By Manuel de la Peña
-
Ensured that the fact that the user checked the box to remember the ssl certificate is taken into account.
- 951. By Manuel de la Peña
-
Merged libsoup-ssl-dialog into pinned-certs.
- 950. By Manuel de la Peña
-
Merged libsoup-ssl-dialog into pinned-certs.
- 949. By Manuel de la Peña
-
Added the required code to store the pinned certificates in order to not promp the ssl dialog constantly.
- 948. By Manuel de la Peña
-
Pass the cert pem from the child WebClient implementations to the base class.
- 947. By Manuel de la Peña
-
Reduced diff size.
- 946. By Manuel de la Peña
-
Reduced diff size.
- 945. By Manuel de la Peña
-
Merged with trunk.
- 944. By Manuel de la Peña
-
Added the required code to let the libsoup webclient implementation deal with ssl cert errors.
Looks good!