From 2589b94ba975026965bfb78ba51e42ae8ef6f794 Mon Sep 17 00:00:00 2001 From: smanojna Date: Wed, 11 Oct 2006 09:50:49 +0000 Subject: [PATCH] Some fixes for Distribution of Firefox Password Manager secrets. --- CASA/CASA.changes | 4 + CASA/gui/Firefox.cs | 40 +++++---- CASA/gui/images/casa.glade | 169 ++++++++++++++++++++++++++++++++++++- 3 files changed, 193 insertions(+), 20 deletions(-) diff --git a/CASA/CASA.changes b/CASA/CASA.changes index 6faaf061..5ac5b660 100644 --- a/CASA/CASA.changes +++ b/CASA/CASA.changes @@ -1,3 +1,7 @@ +Wed Oct 11 15:29:13 IST 2006 - smanojna@novell.com + +- Some fixes for Distribution of Firefox Password Manager secrets. + ------------------------------------------------------------------- Tue Oct 10 11:56:10 MDT 2006 - jnorman@novell.com diff --git a/CASA/gui/Firefox.cs b/CASA/gui/Firefox.cs index 9aac6641..b441ad5b 100644 --- a/CASA/gui/Firefox.cs +++ b/CASA/gui/Firefox.cs @@ -66,7 +66,8 @@ public class Firefox : Store dialogManageSecret, dialogLogin, dialogConfirmDelete, - dialogInvalidSecret, + dialogFPMInvalidSecret, + dialogFPMIdenticalSecret, dialogSpecialCharacter; [Glade.Widget] @@ -390,9 +391,9 @@ public class Firefox : Store sname = String.Concat ( sname, args.NewText, ")"); if (sname != entrySecretID.Text && checkDuplicateSecretName(sname, null, ref tsSecretIDFirefox, 1)) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMIdenticalSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMIdenticalSecret.Show(); return; } @@ -459,9 +460,9 @@ public class Firefox : Store if (tvKeyValue.Model.IterNChildren() == 2) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMInvalidSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMInvalidSecret.Show(); return; } @@ -511,9 +512,14 @@ public class Firefox : Store dialogSpecialCharacter.Destroy(); } - public void on_buttonISClose_clicked(object obj, EventArgs args) + public void on_buttonInvalidSecretClose_clicked(object obj, EventArgs args) { - dialogInvalidSecret.Destroy(); + dialogFPMInvalidSecret.Destroy(); + } + + public void on_buttonIdenticalSecretClose_clicked(object obj, EventArgs args) + { + dialogFPMIdenticalSecret.Destroy(); } /// @@ -622,9 +628,9 @@ public class Firefox : Store { if (tvKeyValue.Model.IterNChildren() == 1) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMInvalidSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMInvalidSecret.Show(); return; } @@ -661,9 +667,9 @@ public class Firefox : Store sname = String.Concat ( sname, NewValue, ")"); if (sname != entrySecretID.Text && checkDuplicateSecretName(sname, null, ref tsSecretIDFirefox, 1)) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMIdenticalSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMIdenticalSecret.Show(); return; } break; @@ -944,9 +950,9 @@ public class Firefox : Store arrIsPassword = null; if (tvKeyValue.Model.IterNChildren() == 1) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMInvalidSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMInvalidSecret.Show(); return; } if ( true == entrySecretID.Editable && false == ValidateString(entrySecretID.Text) ) @@ -998,9 +1004,9 @@ public class Firefox : Store { if (checkDuplicateSecretName(entrySecretID.Text, NewValue, ref tsSecretIDFirefox, 3)) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMIdenticalSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMIdenticalSecret.Show(); return; } @@ -1012,9 +1018,9 @@ public class Firefox : Store if (checkDuplicateSecretName(sname, null, ref tsSecretIDFirefox, 1)) { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogInvalidSecret", null); + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogFPMIdenticalSecret", null); gxmlTemp.Autoconnect (this); - dialogInvalidSecret.Show(); + dialogFPMIdenticalSecret.Show(); return; } diff --git a/CASA/gui/images/casa.glade b/CASA/gui/images/casa.glade index 2781bddd..800d787f 100644 --- a/CASA/gui/images/casa.glade +++ b/CASA/gui/images/casa.glade @@ -14169,10 +14169,10 @@ to encrypt this file - + 4 True - Warning + Warning - Invalid Secret GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT True @@ -14209,7 +14209,7 @@ to encrypt this file GTK_RELIEF_NORMAL True -7 - + @@ -14330,4 +14330,167 @@ to encrypt this file + + 4 + True + Warning - Identical Secret + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + False + True + CASAicons.ico + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + gtk-dialog-warning + 6 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + 4 + True + True + + + + + + True + False + 0 + + + + True + <b>An identical secret with similar username value +already exists in the Firefox Password Manager.</b> + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 5 + False + False + + + + + + True + Secrets with identical secret ID must have unique +username values. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 4 + False + False + + + + + 0 + True + True + + + + + 0 + False + True + + + + + +