Merge lp:~mvo/software-center/set-ssl-stuff-in-webkitwidget into lp:software-center

[Michael Vogt]

A drive-by cleanup branch that moves the webkit.py file into "widgets"
where it fits better and it consolidates all setup of the webkit settings
there too.

[Gary Lasker (gary-lasker)]

This is very nice, thanks Michael!

review: Approve

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-10 07:09:33 +0000
+++ po/POTFILES.in	2012-08-10 13:33:19 +0000
@@ -53,7 +53,6 @@
 softwarecenter/ui/gtk3/views/appview.py
 softwarecenter/ui/gtk3/views/catview_gtk.py
 softwarecenter/ui/gtk3/views/purchaseview.py
-softwarecenter/ui/gtk3/views/webkit.py
 softwarecenter/ui/gtk3/widgets/apptreeview.py
 softwarecenter/ui/gtk3/widgets/backforward.py
 softwarecenter/ui/gtk3/widgets/buttons.py
@@ -66,6 +65,7 @@
 softwarecenter/ui/gtk3/widgets/thumbnail.py
 softwarecenter/ui/gtk3/widgets/videoplayer.py
 softwarecenter/ui/gtk3/widgets/weblivedialog.py
+softwarecenter/ui/gtk3/widgets/webkit.py
 softwarecenter/ui/gtk3/widgets/recommendations.py
 utils/delete_review_gtk3.py
 utils/modify_review_gtk3.py

=== modified file 'software-center'
--- software-center	2012-07-10 08:42:19 +0000
+++ software-center	2012-08-10 13:33:19 +0000
@@ -127,21 +127,6 @@
     # ensure we can actually run
     Gtk.init_check(sys.argv)
 
-    # set default ssl-ca-file here because it needs only be set once, but
-    # it can not be set in the global context as this will cause segfaults
-    # 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
-    # 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
     with ExecutionTime("create SoftwareCenterApp"):

=== modified file 'softwarecenter/ui/gtk3/dialogs/dialog_tos.py'
--- softwarecenter/ui/gtk3/dialogs/dialog_tos.py	2012-03-21 20:54:46 +0000
+++ softwarecenter/ui/gtk3/dialogs/dialog_tos.py	2012-08-10 13:33:19 +0000
@@ -24,8 +24,8 @@
 
 from gettext import gettext as _
 
-from softwarecenter.ui.gtk3.views.webkit import ScrolledWebkitWindow
 from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
+from softwarecenter.ui.gtk3.widgets.webkit import ScrolledWebkitWindow
 from softwarecenter.enums import SOFTWARE_CENTER_TOS_LINK_NO_HEADER
 
 

=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-08-10 11:36:27 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-08-10 13:33:19 +0000
@@ -33,21 +33,11 @@
 from softwarecenter.ui.gtk3.dialogs import show_accept_tos_dialog
 from softwarecenter.config import get_config
 from softwarecenter.ui.gtk3.utils import get_parent
-from softwarecenter.ui.gtk3.views.webkit import ScrolledWebkitWindow
+from softwarecenter.ui.gtk3.widgets.webkit import ScrolledWebkitWindow
 
 LOG = logging.getLogger(__name__)
 
 
-def init_webkit_soup_debug():
-    session = webkit.get_default_session()
-    from gi.repository import Soup
-    # alternatively you can use HEADERS, BODY
-    logger = Soup.Logger.new(Soup.LoggerLogLevel.BODY, -1)
-    logger.attach(session)
-if "SOFTWARE_CENTER_DEBUG_WEBKIT" in os.environ:
-    init_webkit_soup_debug()
-
-
 class PurchaseView(Gtk.VBox):
     """
     View that displays the webkit-based UI for purchasing an item.

=== renamed file 'softwarecenter/ui/gtk3/views/webkit.py' => 'softwarecenter/ui/gtk3/widgets/webkit.py'
--- softwarecenter/ui/gtk3/views/webkit.py	2012-06-28 07:20:49 +0000
+++ softwarecenter/ui/gtk3/widgets/webkit.py	2012-08-10 13:33:19 +0000
@@ -17,6 +17,7 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import logging
 import os
 
 from gi.repository import WebKit as webkit
@@ -31,8 +32,26 @@
 from gi.repository import WebKit
 
 
+LOG = logging.getLogger(__name__)
+
+
 def global_webkit_init():
+    """ this sets the defaults for webkit, its important that this gets
+        run if you want a secure webkit session
+    """
     session = WebKit.get_default_session()
+    # add security by default (see bugzilla #666280 and #666276)
+    # 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!!")
+    # cookies by default
     fname = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "cookies.txt")
     # clear cookies again in a new session, see #1018347 comment #4
     # there is no "logout" support right now on any of the USC pages
@@ -42,6 +61,12 @@
         pass
     cookie_jar = Soup.CookieJarText.new(fname, False)
     session.add_feature(cookie_jar)
+    # optional session debuggin
+    if "SOFTWARE_CENTER_DEBUG_WEBKIT" in os.environ:
+        # alternatively you can use HEADERS, BODY here
+        logger = Soup.Logger.new(Soup.LoggerLogLevel.BODY, -1)
+        logger.attach(session)
+# ALWAYS AWLAYS run this or get insecurity by default
 global_webkit_init()