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

Merge remote-tracking branch 'origin/topic/jsiwek/fix-netbios-decode-bifs'

Browse source 
* origin/topic/jsiwek/fix-netbios-decode-bifs:
  Fixes to `decode_netbios_name` and `decode_netbios_name_type` BIFs
This commit is contained in:
Tim Wojtulewicz 2021-04-30 09:40:18 -07:00
commit ad67d810be
7 changed files with 114 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
testing/btest/Baseline/bifs.netbios-functions/out
View file

@ -1,9 +1,13 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
WORKGROUP
27
\x01\x02__MSBROWSE__\x02
1
MARTIN
3
ISATAP
0
0, 6, ISATAP
27, 9, WORKGROUP
1, 15, \x01\x02__MSBROWSE__\x02
3, 6, MARTIN
69, 15, THE NETBIOS NAM
0, 15, !"#$%&'()*+,-.=
0, 8, :;@^_{}~
0, 0,
32, 0,
256, 0,
256, 0,
256, 0,

27
testing/btest/bifs/netbios-functions.zeek
View file

@ -2,17 +2,26 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
event zeek_init()
function decode_name(name: string)
{
local names_to_decode = set(
local dn = decode_netbios_name(name);
local suffix = decode_netbios_name_type(name);
print suffix, |dn|, dn;
}
local encoded_names = vector(
"ejfdebfeebfacacacacacacacacacaaa", # ISATAP
"fhepfcelehfcepfffacacacacacacabl", # WORKGROUP
"abacfpfpenfdecfcepfhfdeffpfpacab", # \001\002__MSBROWSE__\002
"enebfcfeejeocacacacacacacacacaad"); # MARTIN
"enebfcfeejeocacacacacacacacacaad", # MARTIN
"FEEIEFCAEOEFFEECEJEPFDCAEOEBENEF", # THE NETBIOS NAM
"cbcccdcecfcgchcicjckclcmcncodnaa", # !"#$%&'()*+,-.=
"dkdleafofphlhnhoaaaaaaaaaaaaaaaa", # :;@^_{}~
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", # empty
"cacacacacacacacacacacacacacacaca", # empty
"abcd", # invalid length
"~jfdebfeebfacacacacacacacacacaaa", # invalid alphabet
"0jfdebfeebfacacacacacacacacacaaa");# invalid alphabet
for ( name in names_to_decode )
{
print decode_netbios_name(name);
print decode_netbios_name_type(name);
}
}
for ( i in encoded_names )
decode_name(encoded_names[i]);

2
testing/external/commit-hash.zeek-testing-private vendored
View file

@ -1 +1 @@
d15d95ad14e8974d828f9ee64fcd6cb313f004a2
2e7a42892a8cf429787246dbba3927685799b56f