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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-514-improve-addr-conversion-errors'

Browse source 
* origin/topic/jsiwek/gh-514-improve-addr-conversion-errors:
  Improve error messages from to_addr and to_subnet BIFs
This commit is contained in:
Johanna Amann 2019-08-01 13:15:43 -07:00
commit ca36728a4e
9 changed files with 115 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/btest/Baseline/bifs.to_addr/error
View file

@ -1 +1 @@
error: Bad IP address: not an IP
error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.to_addr/to_addr.zeek, line 7 and /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.to_addr/to_addr.zeek, line 20: failed converting string to IP address (to_addr(ip) and not an IP)

4
testing/btest/Baseline/bifs.to_subnet/error
View file

@ -1 +1,3 @@
error: Bad string in SubNetVal ctor: 10.0.0.0
error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.to_subnet/to_subnet.zeek, line 10: failed converting string to IP prefix (to_subnet(10.0.0.0) and 10.0.0.0)
error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.to_subnet/to_subnet.zeek, line 12: failed converting string to IP prefix (to_subnet(10.0.0.0/222) and 10.0.0.0/222)
error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.to_subnet/to_subnet.zeek, line 14: failed converting string to IP prefix (to_subnet(don't work) and don't work)

2
testing/btest/Baseline/bifs.to_subnet/output
View file

@ -1,3 +1,5 @@
10.0.0.0/8, T
2607:f8b0::/32, T
::/0, T
::/0, T
::/0, T

2
testing/btest/bifs/to_addr.zeek
View file

@ -1,6 +1,6 @@
# @TEST-EXEC: zeek -b %INPUT >output 2>error
# @TEST-EXEC: btest-diff output
# @TEST-EXEC: btest-diff error
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff error
function test_to_addr(ip: string, expect: addr)
{

6
testing/btest/bifs/to_subnet.zeek
View file

@ -1,6 +1,6 @@
# @TEST-EXEC: zeek -b %INPUT >output 2>error
# @TEST-EXEC: btest-diff output
# @TEST-EXEC: btest-diff error
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff error
global sn: subnet;
sn = to_subnet("10.0.0.0/8");
@ -9,3 +9,7 @@ sn = to_subnet("2607:f8b0::/32");
print sn, sn == [2607:f8b0::]/32;
sn = to_subnet("10.0.0.0");
print sn, sn == [::]/0;
sn = to_subnet("10.0.0.0/222");
print sn, sn == [::]/0;
sn = to_subnet("don't work");
print sn, sn == [::]/0;