Merge lp:~gary-lasker/software-center/staging-certs-2-for-5.0 into lp:software-center/5.0
Proposed by
Gary Lasker
Status: | Merged |
---|---|
Merged at revision: | 2488 |
Proposed branch: | lp:~gary-lasker/software-center/staging-certs-2-for-5.0 |
Merge into: | lp:software-center/5.0 |
Diff against target: |
48 lines (+12/-3) 2 files modified
run_local.sh (+1/-0) softwarecenter/ui/gtk3/views/purchaseview.py (+11/-3) |
To merge this branch: | bzr merge lp:~gary-lasker/software-center/staging-certs-2-for-5.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
software-store-developers | Pending | ||
Review via email: mp+89175@code.launchpad.net |
Description of the change
This is a small branch that adds an environment variable, SOFTWARE_
This is a 5.0 port of the corresponding branch in precise:
lp:~gary-lasker/software-center/staging-certs-2
Thanks!
To post a comment you must log in.
On Thu, Jan 19, 2012 at 01:07:29AM -0000, Gary Lasker wrote: store-developer s (software- store-developer s) /code.launchpad .net/~gary- lasker/ software- center/ staging- certs-2- for-5.0/ +merge/ 89175 CENTER_ FORCE_DISABLE_ CERTS_CHECK, that disables certificates validation in webkit views (as used in the for-purchase views). This switch will allow testing against a server that does not have a valid certificate (e.g. the staging server currently).
> Gary Lasker has proposed merging lp:~gary-lasker/software-center/staging-certs-2-for-5.0 into lp:software-center/5.0.
>
> Requested reviews:
> software-
>
> For more details, see:
> https:/
>
> This is a small branch that adds an environment variable, SOFTWARE_
>
> This is a 5.0 port of the corresponding branch in precise:
>
> lp:~gary-lasker/software-center/staging-certs-2
Thanks, looking good! For the 5.0 version we will need a SRU bugreport
though, it can be pretty trivial (like just ensuring that there are no
regressions).
Cheers,
Michael
> Thanks! /code.launchpad .net/~gary- lasker/ software- center/ staging- certs-2- for-5.0/ +merge/ 89175 store-developer s is requested to review the proposed merge of lp:~gary-lasker/software-center/staging-certs-2-for-5.0 into lp:software-center/5.0.
> --
> https:/
> Your team software-
> === modified file 'run_local.sh' CENTER_ REVIEWS_ HOST="http:// 127.0.0. 1:8000/ reviews/ api/1.0" CENTER_ FORCE_NON_ SSL=1 CENTER_ FORCE_DISABLE_ CERTS_CHECK= 1 /login. staging. ubuntu. com/api/ 1.0" /ui/gtk3/ views/purchasev iew.py' ui/gtk3/ views/purchasev iew.py 2011-11-24 09:51:29 +0000 ui/gtk3/ views/purchasev iew.py 2012-01-19 01:06:43 +0000 get_default_ session( ) set_property( "ssl-ca- file", "/etc/ssl/ certs/ca- certificates. crt") getLogger( __name_ _) CENTER_ FORCE_DISABLE_ CERTS_CHECK" in os.environ: get_default_ session( ) set_property( "ssl-ca- file", "/etc/ssl/ certs/ca- certificates. crt") "SOFTWARE_ CENTER_ FORCE_DISABLE_ CERTS_CHECK " + iew(webkit. WebView) :
> --- run_local.sh 2011-08-19 11:54:50 +0000
> +++ run_local.sh 2012-01-19 01:06:43 +0000
> @@ -2,6 +2,7 @@
>
> export SOFTWARE_
> export SOFTWARE_
> +export SOFTWARE_
>
> # sso
> export USSOC_SERVICE_URL="https:/
>
> === modified file 'softwarecenter
> --- softwarecenter/
> +++ softwarecenter/
> @@ -20,14 +20,12 @@
> from gi.repository import GObject
> from gi.repository import Gtk
> from gi.repository import Gdk
> +from gi.repository import WebKit as webkit
> import logging
> import os
> import json
> import sys
> import urllib
> -from gi.repository import WebKit as webkit
> -session = webkit.
> -session.
>
> from gettext import gettext as _
>
> @@ -36,6 +34,16 @@
>
> LOG = logging.
>
> +# enable certificates validation in webkit views unless specified otherwise
> +if not "SOFTWARE_
> + session = webkit.
> + session.
> +else:
> + # WARN the user!! Do not remove this
> + LOG.warning(
> + "has been specified, all purchase transactions " +
> + "are now INSECURE and UNENCRYPTED!!")
> +
> class LocaleAwareWebV
>
> def __init__(self):
>