Merge lp:~lemonboy/capnet-assist/ssl-status into lp:~elementary-apps/capnet-assist/trunk

[The Lemon Man]

Show ssl certificates

[lp:~lemonboy/capnet-assist/ssl-status]

28. By The Lemon Man on 2015-10-24

Show the state of the SSL certificate in the UI.

[Danielle Foré (danrabbit)]

Can we add the "flat" class to the icon.

Also, would it be possible to put it next to the title? (still to the left). Right now, it feels very disassociated.

Clicking the button doesn't seem to do anything for me

review: Needs Fixing

[lp:~lemonboy/capnet-assist/ssl-status]

29. By The Lemon Man on 2015-10-25

Show a popover with some informations about the certificate.

30. By The Lemon Man on 2015-10-25

Move the button near the title.

[Danielle Foré (danrabbit)]

Please use Gtk.STYLE_CLASS_FLAT and not Gtk.ReliefStyle.NONE

Also, add the "title" class to the title label instead of hardcoding style with pango

Corentin would probably say to use Gtk.Grid and not Gtk.Box

review: Needs Fixing

[lp:~lemonboy/capnet-assist/ssl-status]

31. By The Lemon Man on 2015-10-25

Set the appropriate class for the widgets.

[Danielle Foré (danrabbit)]

Hm, I'm not 100% sure why but there's a difference between the height of the titlebar here and what it would normally be.

Can we add a 3px margin to the title box and also add the class "titlebutton" to the SSL button (just to make sure that it's round)?

[lp:~lemonboy/capnet-assist/ssl-status]

32. By The Lemon Man on 2015-10-25

Minor UI touchups.

33. By The Lemon Man on 2015-10-26

Revert to the http scheme for DUMMY_URL

34. By The Lemon Man on 2015-10-26

Minor UI touchups.

35. By The Lemon Man on 2015-10-26

Use a ToggleButton instead of a Button.

36. By The Lemon Man on 2015-10-26

Revert to the http scheme for DUMMY_URL

37. By The Lemon Man on 2015-10-26

Use a more appropriate placeholder icon

[Danielle Foré (danrabbit)]

Works as expected. UX Approve.

Needs proper code review

review: Approve (ux)

[Marcus Wichelmann (l-admin-3)]

The code looks good, I've only marked some style-stuff and things that might not be needed.
See comments.

review: Needs Fixing (code)

[lp:~lemonboy/capnet-assist/ssl-status]

38. By The Lemon Man on 2015-10-26

Stylistic touchups

[Marcus Wichelmann (l-admin-3)]

Looks good now!
Since dan said he has tested it I think this branch is ready for merge.

Nice work!

review: Approve (code)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-10-21 20:43:21 +0000
+++ src/CMakeLists.txt	2015-10-26 01:07:19 +0000
@@ -2,6 +2,8 @@
     gtk+-3.0
     gio-2.0
     webkit2gtk-4.0
+    gcr-3
+    gcr-ui-3
 )
 add_definitions(${DEPS_CFLAGS})
 
@@ -13,11 +15,12 @@
     -D_VERSION=\"${VERSION}\"
     -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
     -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\"
+    -DGCR_API_SUBJECT_TO_CHANGE
     -g
 )
 
 set(CAPTIVE_LOGIN_PACKAGES
-    gtk+-3.0 gio-2.0 webkit2gtk-4.0
+    gtk+-3.0 gio-2.0 webkit2gtk-4.0 gcr-3 gcr-ui-3
 )
 
 set(VALAC_OPTIONS
@@ -36,6 +39,8 @@
     ${VALAC_OPTIONS}
 )
 
+add_definitions(${CFLAGS})
+
 #Here we define our executable name.
 add_executable(captive-login ${VALA_C} )
 

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2015-10-25 20:43:09 +0000
+++ src/CaptiveLogin.vala	2015-10-26 01:07:19 +0000
@@ -23,31 +23,53 @@
     private const string DUMMY_URL = "http://elementary.io";
     
     private WebKit.WebView web_view;
+    private Gtk.ToggleButton tls_button;
+    private Gtk.Label title_label;
     
     public ValaBrowser () {
         set_default_size (1000, 680);
         set_keep_above (true);
         set_skip_taskbar_hint (true);
 
+        create_widgets ();
+        connect_signals ();
+    }
+
+    private void create_widgets () {
         var header = new Gtk.HeaderBar ();
         header.set_show_close_button (true);
         header.get_style_context ().remove_class ("header-bar");
 
         this.set_titlebar (header);
-        this.title = ValaBrowser.TITLE;
-
-        create_widgets ();
-        connect_signals ();
-    }
-
-    private void create_widgets () {
-        this.web_view = new WebKit.WebView ();
+
+        tls_button = new Gtk.ToggleButton ();
+        tls_button.set_image (new Gtk.Image.from_icon_name ("content-loading-symbolic", Gtk.IconSize.BUTTON));
+        var tls_button_style_context = tls_button.get_style_context ();
+        tls_button_style_context.add_class (Gtk.STYLE_CLASS_FLAT);
+        tls_button_style_context.add_class ("titlebutton");
+        tls_button.set_sensitive (false);
+        tls_button.toggled.connect (on_tls_button_click);
+
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        hbox.set_margin_top (3);
+        hbox.set_margin_bottom (3);
+        hbox.pack_start (tls_button);
+
+        title_label = new Gtk.Label (ValaBrowser.TITLE);
+        title_label.get_style_context ().add_class (Gtk.STYLE_CLASS_TITLE);
+        hbox.pack_start (title_label);
+
+        header.set_custom_title (hbox);
+
+        web_view = new WebKit.WebView ();
+
         var scrolled_window = new Gtk.ScrolledWindow (null, null);
         scrolled_window.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-        scrolled_window.add (this.web_view);
+        scrolled_window.add (web_view);
+
         var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        vbox.set_homogeneous (false);
         vbox.pack_start (scrolled_window, true, true, 0);
+
         add (vbox);
     }
     
@@ -72,25 +94,131 @@
         return message.status_code == 204;
     }
 
+    private void update_tls_info () {
+        TlsCertificate cert;
+        TlsCertificateFlags cert_flags;
+        Icon icon;
+        bool is_secure;
+
+        if (!web_view.get_tls_info (out cert, out cert_flags)) {
+            // The page is served over HTTP
+            is_secure = false;
+        } else {
+            // The page is served over HTTPS, if cert_flags is set then there's
+            // some problem with the certificate provided by the website.
+            is_secure = (cert_flags == 0);
+        }
+
+        if (is_secure) {
+            icon = new ThemedIcon.from_names ({"channel-secure-symbolic", "security-high"});
+            tls_button.set_tooltip_text ("The page is served over a protected connection.");
+        } else {
+            icon = new ThemedIcon.from_names ({"channel-insecure-symbolic", "security-low"});
+            tls_button.set_tooltip_text ("The page is served over an unprotected connection.");
+        }
+
+        var image = new Gtk.Image.from_gicon (icon, Gtk.IconSize.BUTTON);
+        tls_button.set_image (image);
+    }
+
+    private void on_tls_button_click () {
+        TlsCertificate cert;
+        TlsCertificateFlags cert_flags;
+
+        if (!tls_button.get_active ()) {
+            return;
+        }
+        if (!web_view.get_tls_info (out cert, out cert_flags)) {
+            return;
+        }
+
+        var popover = new Gtk.Popover (tls_button);
+        popover.set_border_width (6);
+        var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+        popover.add (vbox);
+
+        // Wonderful hack we got here, the vapi for Gtk has a wrong definition
+        // for the get_gicon () method, it's not reported as an out parameter
+        // hence we're stuck with passing everything by value.
+        // Since we're badass we pass the INVALID constant that evaluates to 0
+        // which is casted into a NULL pointer and allows us to save the date.
+        Icon button_icon;
+        (tls_button.get_image () as Gtk.Image).get_gicon (out button_icon, Gtk.IconSize.INVALID);
+
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        hbox.pack_start (new Gtk.Image.from_gicon (button_icon, Gtk.IconSize.LARGE_TOOLBAR), false, false);
+        hbox.pack_start (new Gtk.Label (tls_button.get_tooltip_text ()), false, false);
+        vbox.pack_start (hbox, false, false);
+
+        var gcr_cert = new Gcr.SimpleCertificate (cert.certificate.data);
+        var cert_details = new Gcr.CertificateWidget (gcr_cert);
+        vbox.pack_start (cert_details);
+
+        // This hack has been borrowed from midori, the widget provided by the
+        // GCR library would fail with an assertion when the 'details' button was
+        // clicked
+        popover.button_press_event.connect ((event) => {
+            return true;
+        });
+        popover.button_release_event.connect ((event) => {
+            var child = popover.get_child ();
+            var event_widget = Gtk.get_event_widget (event);
+
+            if (child != null && event.window == popover.get_window ()) {
+                Gtk.Allocation child_alloc;
+                popover.get_allocation (out child_alloc);
+
+                if (event.x < child_alloc.x ||
+                    event.x > child_alloc.x + child_alloc.width ||
+                    event.y < child_alloc.y ||
+                    event.y > child_alloc.y + child_alloc.height) {
+                    popover.hide ();
+                    tls_button.set_active (false);
+                }
+            } 
+            else if (event_widget != null && !event_widget.is_ancestor (popover)) {
+                popover.hide ();
+                tls_button.set_active (false);
+            }
+
+            return true;
+        });
+
+        popover.show_all ();
+
+        return;
+    }
+
     private void connect_signals () {
         this.destroy.connect (Gtk.main_quit);
         //should title change?
-        this.web_view.notify["title"].connect ((view, param_spec) => {
-            this.title = this.web_view.get_title ();
+        web_view.notify["title"].connect ((view, param_spec) => {
+            title_label.set_text (web_view.get_title ());
         });
 
-        this.web_view.load_changed.connect ((view, event) => {
-            if (event == WebKit.LoadEvent.FINISHED) {
-                if (isLoggedIn ()) {
-                    debug ("Logged in!");
-                    Gtk.main_quit ();
-                } else {
-                    debug ("Still not logged in.");
-                }
+        web_view.load_changed.connect ((view, event) => {
+            switch (event) {
+                case WebKit.LoadEvent.FINISHED:
+                    if (isLoggedIn ()) {
+                        debug ("Logged in!");
+                        Gtk.main_quit ();
+                    } else {
+                        debug ("Still not logged in.");
+                    }
+                    break;
+
+                case WebKit.LoadEvent.STARTED:
+                    tls_button.set_sensitive (false);
+                    break;
+
+                case WebKit.LoadEvent.COMMITTED:
+                    update_tls_info ();
+                    tls_button.set_sensitive (true);
+                    break;
             }
         });
 
-        this.web_view.load_failed.connect ((event, uri, error) => {
+        web_view.load_failed.connect ((event, uri, error) => {
             // The user has canceled the page loading eg. by clicking on a link.
             if ((Error)error is WebKit.NetworkError.CANCELLED) {
                 return true;
@@ -103,7 +231,7 @@
 
     public void start () {
         show_all ();
-        this.web_view.load_uri (ValaBrowser.DUMMY_URL);
+        web_view.load_uri (ValaBrowser.DUMMY_URL);
     }
 
     public static int main (string[] args) {