Skip to content

Commit

Permalink
Ignore key modifiers on text editing if field is a password field. (#…
Browse files Browse the repository at this point in the history
…17695)

* Ignore key modifiers on text editing if field is a password field.

It's not secure to rely on password field content when moving. It's should
give no information what so ever.

* Required changes
  • Loading branch information
c4llv07e authored and maxkatz6 committed Dec 19, 2024
1 parent 36efc98 commit 2e5fbc8
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Avalonia.Controls/TextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,8 @@ protected override void OnKeyDown(KeyEventArgs e)
}
else
{
bool hasWholeWordModifiers = modifiers.HasAllFlags(keymap.WholeWordTextActionModifiers);
// It's not secure to rely on password field content when moving.
bool hasWholeWordModifiers = modifiers.HasAllFlags(keymap.WholeWordTextActionModifiers) && !IsPasswordBox;
switch (e.Key)
{
case Key.Left:
Expand Down
21 changes: 21 additions & 0 deletions tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,27 @@ public void DefaultBindingMode_Should_Be_TwoWay()
TextBox.TextProperty.GetMetadata(typeof(TextBox)).DefaultBindingMode);
}

[Fact]
public void TextBox_Ignore_Word_Move_In_Password_Field()
{
using (UnitTestApplication.Start(Services))
{
var target = new TextBox
{
Template = CreateTemplate(),
PasswordChar = '*',
Text = "passw0rd"
};

target.ApplyTemplate();
target.Measure(Size.Infinity);
target.CaretIndex = 8;
RaiseKeyEvent(target, Key.Left, KeyModifiers.Control);

Assert.Equal(7, target.CaretIndex);
}
}

[Fact]
public void CaretIndex_Can_Moved_To_Position_After_The_End_Of_Text_With_Arrow_Key()
{
Expand Down

0 comments on commit 2e5fbc8

Please sign in to comment.