Merge lp:~mhr3/unity-lens-shopping/secure-connection into lp:unity-lens-shopping

[Michal Hruby]

Use secure connection to the server

Use secure connection to the server.

[lp:~mhr3/unity-lens-shopping/secure-connection]

22. By Michal Hruby on 2012-09-26

Use strict certificate checking

23. By Michal Hruby on 2012-09-26

Merge trunk, add more error reporting

[Paweł Stołowski (stolowski)]

Cool, we have SSL now! Looks good and works fine!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-07-25 15:18:43 +0000
+++ configure.ac	2012-09-26 11:13:24 +0000
@@ -62,6 +62,7 @@
                   gio-unix-2.0 >= $GLIB_REQUIRED
                   dee-1.0 >= 1.0.7
                   gee-1.0
+                  libsoup-gnome-2.4
                   json-glib-1.0
                   unity >= 5.93.0)
 
@@ -118,6 +119,7 @@
   data/Makefile
   src/Makefile
   src/config.vala
+  vapi/Makefile
   po/Makefile.in
 ])
 AC_OUTPUT

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-09-24 16:17:01 +0000
+++ src/Makefile.am	2012-09-26 11:13:24 +0000
@@ -28,7 +28,10 @@
   --pkg gio-unix-2.0 \
   --pkg glib-2.0 \
   --pkg json-glib-1.0 \
+  --pkg libsoup-2.4 \
   --vapidir $(srcdir) \
+  --vapidir $(top_srcdir)/vapi \
+  --pkg libsoup-gnome-2.4 \
   --target-glib=2.26 \
   $(MAINTAINER_VALAFLAGS) \
   $(NULL)

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-25 10:05:54 +0000
+++ src/scope.vala	2012-09-26 11:13:24 +0000
@@ -23,10 +23,11 @@
 {
   public class ShoppingScope : Unity.Scope
   {
-    private const string OFFERS_BASE_URI = "http://productsearch.ubuntu.com";
+    private const string OFFERS_BASE_URI = "https://productsearch.ubuntu.com";
 
     private HashTable<string, string> results_details_map;
     private HashTable<string, string> global_results_details_map;
+    private Soup.Session session;
     private PreviewPlayerHandler player;
 
     public ShoppingScope ()
@@ -36,6 +37,12 @@
 
     protected override void constructed ()
     {
+      session = new Soup.SessionAsync ();
+      session.ssl_use_system_ca_file = true;
+      session.ssl_strict = true;
+      session.user_agent = "Unity Shopping Lens " + Config.VERSION;
+      session.add_feature_by_type (typeof (SoupGNOME.ProxyResolverGNOME));
+
       /* Listen for filter changes */
       filters_changed.connect (() => {
         queue_search_changed (SearchType.DEFAULT);
@@ -94,6 +101,7 @@
         process_search_reply_json (parser, Category.TREAT_YOURSELF,
                                    search.results_model);
       }
+      catch (IOError.CANCELLED canc_err) { /* ignore */ }
       catch (Error err)
       {
         warning ("Error: %s", err.message);
@@ -122,6 +130,62 @@
       }
     }
 
+    private async Preview? process_preview_request (string details_uri)
+    {
+      Json.Parser parser;
+      try
+      {
+        parser = yield get_json_reply_async (details_uri, null);
+      }
+      catch (Error err)
+      {
+        return new GenericPreview (Path.get_basename (details_uri),
+                                   err.message, null);
+      }
+
+      if (U1MSPreviewFactory.is_u1ms_details (parser))
+      {
+        var u1mspf = new U1MSPreviewFactory ();
+        var preview = u1mspf.create_preview (parser);
+        u1mspf.add_download_action (preview); // download will be handled by normal activation
+        if (player == null)
+            player = new PreviewPlayerHandler ();
+        player.music_preview = preview;
+        return preview;
+      }
+      else
+      {
+        var root = parser.get_root ().get_object ();
+        unowned string title = root.get_string_member ("title");
+        unowned string description = root.get_string_member ("description_html");
+
+        unowned string price = null;
+        if (root.has_member ("formatted_price"))
+          price = root.get_string_member ("formatted_price");
+        else if (root.has_member ("price"))
+          price = root.get_string_member ("price");
+
+        var img_obj = root.get_object_member ("images");
+        string image_uri = extract_image_uri (img_obj, int.MAX);
+
+        Icon? image = null;
+        if (image_uri != "")
+        {
+          image = new FileIcon (File.new_for_uri (image_uri));
+        }
+
+        var preview = new GenericPreview (title, MarkupCleaner.html_to_pango_markup (description), image);
+        var icon_dir = File.new_for_path (ICON_PATH);
+        var icon = new FileIcon (icon_dir.get_child ("service-amazon.svg"));
+        var buy_action = new PreviewAction ("buy", _("Buy"), icon);
+        if (price != null) buy_action.extra_text = price;
+        /* Leaving the activation on unity for now */
+        // buy_action.activated.connect ((uri) => { });
+        preview.add_action (buy_action);
+        return preview;
+      }
+    }
+
     private Preview? generate_preview_for_uri (string uri)
     {
       string? details_uri =
@@ -133,52 +197,13 @@
                                    "No data available", null);
       }
 
-      try
-      {
-        var parser = get_json_reply (details_uri, null);
-
-        if (U1MSPreviewFactory.is_u1ms_details (parser))
-        {
-          var u1mspf = new U1MSPreviewFactory ();
-          var preview = u1mspf.create_preview (parser);
-          u1mspf.add_download_action (preview); // download will be handled by normal activation
-          if (player == null)
-              player = new PreviewPlayerHandler ();
-          player.music_preview = preview;
-          return preview;
-        }
-        else
-        {
-          var root = parser.get_root ().get_object ();
-          unowned string title = root.get_string_member ("title");
-          unowned string description = root.get_string_member ("description_html");
-          unowned string price = root.get_string_member ("formatted_price");
-          if (price == null) price = root.get_string_member ("price");
-
-          var img_obj = root.get_object_member ("images");
-          string image_uri = extract_image_uri (img_obj, int.MAX);
-
-          Icon? image = null;
-          if (image_uri != "")
-          {
-            image = new FileIcon (File.new_for_uri (image_uri));
-          }
-
-          var preview = new GenericPreview (title, MarkupCleaner.html_to_pango_markup (description), image);
-          var icon_dir = File.new_for_path (ICON_PATH);
-          var icon = new FileIcon (icon_dir.get_child ("service-amazon.svg"));
-          var buy_action = new PreviewAction ("buy", _("Buy"), icon);
-          if (price != null) buy_action.extra_text = price;
-          /* Leaving the activation on unity for now */
-          // buy_action.activated.connect ((uri) => { });
-          preview.add_action (buy_action);
-          return preview;
-        }
-      }
-      catch (Error err)
-      {
-        return new GenericPreview (Path.get_basename (uri), err.message, null);
-      }
+      var preview = new AsyncPreview ();
+      process_preview_request.begin (details_uri, (obj, res) =>
+      {
+        var real_preview = process_preview_request.end (res);
+        preview.preview_ready (real_preview);
+      });
+      return preview;
     }
 
     private string build_search_uri (string query, SearchType search_type)
@@ -199,29 +224,55 @@
     }
 
     private async Json.Parser get_json_reply_async (string uri,
-                                                    Cancellable cancellable)
+                                                    Cancellable? cancellable)
       throws Error
     {
       message ("Sending request: %s", uri);
 
-      var file = File.new_for_uri (uri);
-      var stream = yield file.read_async (Priority.DEFAULT, cancellable);
-      var parser = new Json.Parser ();
-      yield parser.load_from_stream_async (stream);
-
-      return parser;
-    }
-
-    private Json.Parser get_json_reply (string uri,
-                                        Cancellable? cancellable)
-      throws Error
-    {
-      message ("Sending sync request: %s", uri);
-
-      var file = File.new_for_uri (uri);
-      var stream = file.read (cancellable);
-      var parser = new Json.Parser ();
-      parser.load_from_stream (stream);
+      var msg = new Soup.Message ("GET", uri);
+      session.queue_message (msg, (session_, msg_) =>
+      {
+        msg = msg_;
+        get_json_reply_async.callback ();
+      });
+
+      var cancelled = false;
+      ulong cancel_id = 0;
+      if (cancellable != null)
+      {
+        cancel_id = cancellable.connect (() =>
+        {
+          cancelled = true;
+          session.cancel_message (msg, Soup.KnownStatusCode.CANCELLED);
+        });
+      }
+
+      yield;
+
+      if (cancelled)
+      {
+        // we can't disconnect right away, as that would deadlock (cause
+        // cancel_message doesn't return before invoking the callback)
+        Idle.add (get_json_reply_async.callback);
+        yield;
+        cancellable.disconnect (cancel_id);
+        throw new IOError.CANCELLED ("Cancelled");
+      }
+
+      if (msg.status_code < 100)
+      {
+        throw new IOError.FAILED ("Request failed with error %u", msg.status_code);
+      }
+      else if (msg.status_code != 200)
+      {
+        warning ("Request returned status code %u", msg.status_code);
+      }
+
+      if (msg.response_body.data == null)
+        throw new IOError.FAILED ("Request didn't return any content");
+
+      var parser = new Json.Parser ();
+      parser.load_from_data ((string) msg.response_body.data);
 
       return parser;
     }
@@ -308,8 +359,12 @@
         var image_obj = result.get_object_member ("images");
         string image_uri = extract_image_uri (image_obj, 128*128);
 
-        unowned string price = result.get_string_member ("formatted_price");
-        if (price == null) price = result.get_string_member ("price");
+        unowned string price = null;
+        if (result.has_member ("formatted_price"))
+          price = result.get_string_member ("formatted_price");
+        else if (result.has_member ("price"))
+          price = result.get_string_member ("price");
+
         if (image_uri != "")
         {
           // TODO: what to do if we have price but no icon?

=== added directory 'vapi'
=== added file 'vapi/Makefile.am'
--- vapi/Makefile.am	1970-01-01 00:00:00 +0000
+++ vapi/Makefile.am	2012-09-26 11:13:24 +0000
@@ -0,0 +1,5 @@
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST = libsoup-gnome-2.4.vapi
+

=== added file 'vapi/libsoup-gnome-2.4.vapi'
--- vapi/libsoup-gnome-2.4.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libsoup-gnome-2.4.vapi	2012-09-26 11:13:24 +0000
@@ -0,0 +1,8 @@
+[CCode (cprefix = "Soup", gir_namespace = "SoupGNOME", gir_version = "2.4", lower_case_cprefix = "soup_")]
+namespace SoupGNOME {
+	[CCode (cheader_filename = "libsoup/soup-gnome.h", type_id = "soup_proxy_resolver_gnome_get_type ()")]
+	public class ProxyResolverGNOME : Soup.ProxyResolverDefault, Soup.ProxyURIResolver, Soup.SessionFeature {
+		[CCode (has_construct_function = false)]
+		protected ProxyResolverGNOME ();
+	}
+}