Some fixes for Distribution of Firefox Password Manager secrets.
This commit is contained in:
smanojna
parent
0e03e5e475
commit
2589b94ba9
@ -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
|
||||
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -14169,10 +14169,10 @@ to encrypt this file</property>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="dialogInvalidSecret">
|
||||
<widget class="GtkDialog" id="dialogFPMInvalidSecret">
|
||||
<property name="border_width">4</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Warning</property>
|
||||
<property name="title" translatable="yes">Warning - Invalid Secret</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
|
||||
<property name="modal">True</property>
|
||||
@ -14209,7 +14209,7 @@ to encrypt this file</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-7</property>
|
||||
<signal name="clicked" handler="on_buttonISClose_clicked" last_modification_time="Fri, 29 Sep 2006 10:49:22 GMT"/>
|
||||
<signal name="clicked" handler="on_buttonInvalidSecretClose_clicked" last_modification_time="Wed, 11 Oct 2006 09:22:01 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
@ -14330,4 +14330,167 @@ to encrypt this file</property>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="dialogFPMIdenticalSecret">
|
||||
<property name="border_width">4</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Warning - Identical Secret</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
|
||||
<property name="modal">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">True</property>
|
||||
<property name="icon">CASAicons.ico</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="focus_on_map">True</property>
|
||||
<property name="urgency_hint">False</property>
|
||||
<property name="has_separator">True</property>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="vbox170">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child internal-child="action_area">
|
||||
<widget class="GtkHButtonBox" id="hbuttonbox27">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="button70">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-close</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-7</property>
|
||||
<signal name="clicked" handler="on_buttonIdenticalSecretClose_clicked" last_modification_time="Wed, 11 Oct 2006 09:22:21 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">GTK_PACK_END</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox99">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox171">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image4266">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-dialog-warning</property>
|
||||
<property name="icon_size">6</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">4</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox172">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label284">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>An identical secret with similar username value
|
||||
already exists in the Firefox Password Manager.</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">True</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">5</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label285">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Secrets with identical secret ID must have unique
|
||||
username values.</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">True</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">4</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
</glade-interface>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user