Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'jeff-bb/patch-2'

Browse source 
* jeff-bb/patch-2:
  Log raw keyboard value on best guess
  Avoid excessive fmt calls, return default behavior on unknown
  "Best Guess" unknown keyboard / language variants
This commit is contained in:
Tim Wojtulewicz 2023-01-23 12:48:06 -07:00
commit 6cfb45d24f
3 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CHANGES
View file

@ -1,3 +1,26 @@
5.2.0-dev.508 | 2023-01-23 12:48:06 -0700
* Log raw keyboard value on best guess (jeff-bb)
* Avoid excessive fmt calls, return default behavior on unknown (jeff-bb)
Using "in" to query the language const. This also handles the case of not
having a best guess and continue using the existing behavior.
Given
keyboard_layout = 1033 (0x0409), "keyboard-English - United States"
keyboard_layout = 66569 (0x00010409), "keyboard-English - United States (Best Guess)"
keyboard_layout = 12345 (0x3039), "keyboard-12345"
* "Best Guess" unknown keyboard / language variants (jeff-bb)
If the lookup table does not have an entry, it will just log as the raw
decimal language/keyboard code. With this change, if we do not have an entry
in the lookup table, we'll look at the low order / 4 least significant bits
to see if we have a match. The high order / 4 most significant bits are
flags/modifiers to the base language/keyboard code. We'll append that it is
a "Best Guess"
5.2.0-dev.504 | 2023-01-23 09:37:47 -0700
* Update RDP Keyboard Languages (jeff-bb)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.504
5.2.0-dev.508

13
scripts/base/protocols/rdp/main.zeek
View file

@ -187,7 +187,18 @@ event rdp_client_core_data(c: connection, data: RDP::ClientCoreData) &priority=5
{
set_session(c);
c$rdp$keyboard_layout = RDP::languages[data$keyboard_layout];
if (data$keyboard_layout in RDP::languages)
{
c$rdp$keyboard_layout = RDP::languages[data$keyboard_layout];
}
else
{
if (data$keyboard_layout & 0xffff in RDP::languages)
c$rdp$keyboard_layout = fmt("%s (Best Guess for %d)", RDP::languages[data$keyboard_layout & 0xffff], data$keyboard_layout);
else
c$rdp$keyboard_layout = fmt("keyboard-%d", data$keyboard_layout);
}
c$rdp$client_build = RDP::builds[data$client_build];
c$rdp$client_name = data$client_name;
c$rdp$client_dig_product_id = data$dig_product_id;