r21420 - gnucash/branches/2.4/src/gnome-utils - [21419] Bug #661721 - Exposed Password

[Geert Janssens]

Author: gjanssens
Date: 2011-10-14 12:15:03 -0400 (Fri, 14 Oct 2011)
New Revision: 21420
Trac: http://svn.gnucash.org/trac/changeset/21420

Modified:
   gnucash/branches/2.4/src/gnome-utils/gnc-file.c
Log:
[21419] Bug #661721 - Exposed Password

Modified: gnucash/branches/2.4/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/gnc-file.c	2011-10-14 16:12:17 UTC (rev 21419)
+++ gnucash/branches/2.4/src/gnome-utils/gnc-file.c	2011-10-14 16:15:03 UTC (rev 21420)
@@ -698,6 +698,8 @@
     if (ERR_BACKEND_LOCKED == io_err || ERR_BACKEND_READONLY == io_err)
     {
         GtkWidget *dialog;
+        gchar *displayname = NULL;
+
         char *fmt1 = _("GnuCash could not obtain the lock for %s.");
         char *fmt2 = ((ERR_BACKEND_LOCKED == io_err) ?
                       _("That database may be in use by another user, "
@@ -710,6 +712,11 @@
                      );
         int rc;
 
+        if (! gnc_uri_is_file_uri (newfile)) /* Hide the db password in error messages */
+            displayname = gnc_uri_normalize_uri ( newfile, FALSE);
+        else
+            displayname = g_strdup (newfile);
+
         // Bug#467521: on Mac (and maybe Win?), the dialog will appear below the
         // splash, but is modal, so we can't get rid of the splash...  So, get
         // rid of it now.
@@ -719,7 +726,7 @@
                                         0,
                                         GTK_MESSAGE_WARNING,
                                         GTK_BUTTONS_NONE,
-                                        fmt1, newfile);
+                                        fmt1, displayname);
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
                 "%s", fmt2);
 
@@ -732,6 +739,7 @@
                                   GTK_STOCK_QUIT, RESPONSE_QUIT);
         rc = gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
+        g_free (displayname);
 
         if (rc == GTK_RESPONSE_DELETE_EVENT)
         {