Merge lp:~gary-lasker/software-center/staging-certs-2 into lp:software-center

[Gary Lasker]

This is a small branch that adds an environment variable, SOFTWARE_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).

When this environment variable is set, a somewhat alarming warning is displayed to the user in the log.

This branch also removes the two scripts run_fake_gtk3.sh and run_local.sh, as these are not used anymore.

Thanks!

[lp:~gary-lasker/software-center/staging-certs-2]

2682. By Gary Lasker on 2012-01-19

d'oh, remove this leftover

=== removed file 'run_fake_gtk3.sh'
--- run_fake_gtk3.sh	2011-08-15 11:55:13 +0000
+++ run_fake_gtk3.sh	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export SOFTWARE_CENTER_FAKE_REVIEW_API="1"
-
-# s-c
-export PYTHONPATH=$(pwd)
-./software-center-gtk3 $@
 
=== modified file 'run_local.sh'
--- run_local.sh	2011-08-19 11:54:50 +0000
+++ run_local.sh	2012-01-19 00:47:24 +0000
@@ -2,6 +2,7 @@
 
 export SOFTWARE_CENTER_REVIEWS_HOST="http://127.0.0.1:8000/reviews/api/1.0"
 export SOFTWARE_CENTER_FORCE_NON_SSL=1
+export SOFTWARE_CENTER_FORCE_DISABLE_CERTS_CHECK=1
 
 # sso
 export USSOC_SERVICE_URL="https://login.staging.ubuntu.com/api/1.0"
 
=== removed file 'run_local_gtk3.sh'
--- run_local_gtk3.sh	2011-08-15 11:55:13 +0000
+++ run_local_gtk3.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export SOFTWARE_CENTER_REVIEWS_HOST="http://127.0.0.1:8000/reviews/api/1.0"
-export SOFTWARE_CENTER_FORCE_NON_SSL=1
-
-# sso
-export USSOC_SERVICE_URL="https://login.staging.ubuntu.com/api/1.0"
-pkill -f ubuntu-sso-login
-python /usr/lib/ubuntu-sso-client/ubuntu-sso-login &
-
-# s-c
-export PYTHONPATH=$(pwd)
-
-if [ ! -d "./build" ]; then
-    echo "Please run: 'python setup.py build' before $0"
-fi
-
-./software-center-gtk3 $@
 
=== modified file 'software-center'
--- software-center	2012-01-06 16:59:29 +0000
+++ software-center	2012-01-19 00:47:24 +0000
@@ -45,6 +45,8 @@
 # Enable Xapian's CJK tokenizer (see LP: #745243)
 os.environ['XAPIAN_CJK_NGRAM'] = '1'
 
+LOG = logging.getLogger("softwarecenter")
+
 if __name__ == "__main__":
 
     parser = OptionParser("usage: %prog [options] [package-name | apturl | deb-file]", 
@@ -124,8 +126,15 @@
     # on exit. However its IMPORTANT to set it as libsoup is *not* secure
     # by default (see bugzilla #666280 and #666276)
     from gi.repository import WebKit as webkit
-    session = webkit.get_default_session()
-    session.set_property("ssl-ca-file", "/etc/ssl/certs/ca-certificates.crt")
+    # enable certificates validation in webkit views unless specified otherwise
+    if not "SOFTWARE_CENTER_FORCE_DISABLE_CERTS_CHECK" in os.environ:
+        session = webkit.get_default_session()
+        session.set_property("ssl-ca-file", "/etc/ssl/certs/ca-certificates.crt")
+    else:
+        # WARN the user!! Do not remove this
+        LOG.warning("SOFTWARE_CENTER_FORCE_DISABLE_CERTS_CHECK " +
+                    "has been specified, all purchase transactions " + 
+                    "are now INSECURE and UNENCRYPTED!!")
 
     # create the app
     from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3