Merge lp:~ted/policykit-unity8/lp1580236-hide-password into lp:policykit-unity8

[Ted Gould]

Setting the password echo mode on passwords

Simpler than expected

[Charles Kerr (charlesk)]

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:8
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/450/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'service/authentication.cpp'
--- service/authentication.cpp	2016-04-25 20:57:22 +0000
+++ service/authentication.cpp	2016-08-22 19:42:57 +0000
@@ -21,6 +21,7 @@
 
 #include <glib/gi18n.h>
 #include <iostream>
+#include <regex>
 
 /* Make it so all our GObjects are easier to work with */
 template <typename T>
@@ -367,6 +368,9 @@
     g_menu_insert_item(menus.get(), location, item.get());
 }
 
+/** A regex to see if the incoming request is for a password */
+static const std::regex passwordDetector{"\\s*[Pp]assword:?\\s*"};
+
 /** Add a request for information from the user. This is a menu item in
     the menu model. If there isn't an item, it is created here, else it
     is updated to include this request. */
@@ -382,9 +386,10 @@
     int index = findMenuItem(menus, "x-canonical-type", "com.canonical.snapdecision.textfield");
 
     std::string label;
-    if (request == "password:" || request == "Password:")
+    if (std::regex_match(request, passwordDetector))
     {
         label = _("Password");  // TODO: Add Username (Password for Joe)
+        password = true; /* Force to password even if PAM doesn't think so */
     }
     else
     {
@@ -397,6 +402,8 @@
         auto item = shared_gobject<GMenuItem>(g_menu_item_new(label.c_str(), "pk.response"));
         g_menu_item_set_attribute_value(item.get(), "x-canonical-type",
                                         g_variant_new_string("com.canonical.snapdecision.textfield"));
+        g_menu_item_set_attribute_value(item.get(), "x-echo-mode-password",
+                                        g_variant_new_boolean(password ? TRUE : FALSE));
         g_menu_append_item(menus.get(), item.get());
     }
     else
@@ -404,6 +411,8 @@
         /* Update it */
         auto item = shared_gobject<GMenuItem>(g_menu_item_new_from_model(G_MENU_MODEL(menus.get()), index));
         g_menu_item_set_label(item.get(), label.c_str());
+        g_menu_item_set_attribute_value(item.get(), "x-echo-mode-password",
+                                        g_variant_new_boolean(password ? TRUE : FALSE));
         g_menu_remove(menus.get(), index);
         g_menu_insert_item(menus.get(), index, item.get());
     }

=== modified file 'service/session-iface.cpp'
--- service/session-iface.cpp	2016-04-25 20:57:22 +0000
+++ service/session-iface.cpp	2016-08-22 19:42:57 +0000
@@ -109,7 +109,7 @@
     /** Static callback for the complete signal. Passed up to the
         complete C++ signal. Also sets the session complete flag
         which ensures we don't cancel on destruction. */
-    static void completeCb(PolkitAgentSession *session, bool success, gpointer user_data)
+    static void completeCb(PolkitAgentSession *session, gboolean success, gpointer user_data)
     {
         g_debug("PK Session Complete: %s", success ? "success" : "fail");
         auto obj = reinterpret_cast<Impl *>(user_data);