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

Fixing unit tests.

Browse source
This commit is contained in:
Jon Siwek 2011-09-30 07:53:23 -05:00
parent 91ed9ffa8f
commit 71dc6b6de3
8 changed files with 102 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/scripts/DocSourcesList.cmake
View file

@ -51,7 +51,6 @@ rest_target(${psd} base/frameworks/packet-filter/netstats.bro)
rest_target(${psd} base/frameworks/reporter/main.bro) rest_target(${psd} base/frameworks/reporter/main.bro)
rest_target(${psd} base/frameworks/signatures/main.bro) rest_target(${psd} base/frameworks/signatures/main.bro)
rest_target(${psd} base/frameworks/software/main.bro) rest_target(${psd} base/frameworks/software/main.bro)
rest_target(${psd} base/frameworks/time-machine/notice.bro)
rest_target(${psd} base/protocols/conn/contents.bro) rest_target(${psd} base/protocols/conn/contents.bro)
rest_target(${psd} base/protocols/conn/inactivity.bro) rest_target(${psd} base/protocols/conn/inactivity.bro)
rest_target(${psd} base/protocols/conn/main.bro) rest_target(${psd} base/protocols/conn/main.bro)
@ -64,11 +63,9 @@ rest_target(${psd} base/protocols/http/file-extract.bro)
rest_target(${psd} base/protocols/http/file-hash.bro) rest_target(${psd} base/protocols/http/file-hash.bro)
rest_target(${psd} base/protocols/http/file-ident.bro) rest_target(${psd} base/protocols/http/file-ident.bro)
rest_target(${psd} base/protocols/http/main.bro) rest_target(${psd} base/protocols/http/main.bro)
rest_target(${psd} base/protocols/http/partial-content.bro)
rest_target(${psd} base/protocols/http/utils.bro) rest_target(${psd} base/protocols/http/utils.bro)
rest_target(${psd} base/protocols/irc/dcc-send.bro) rest_target(${psd} base/protocols/irc/dcc-send.bro)
rest_target(${psd} base/protocols/irc/main.bro) rest_target(${psd} base/protocols/irc/main.bro)
rest_target(${psd} base/protocols/rpc/main.bro)
rest_target(${psd} base/protocols/smtp/entities-excerpt.bro) rest_target(${psd} base/protocols/smtp/entities-excerpt.bro)
rest_target(${psd} base/protocols/smtp/entities.bro) rest_target(${psd} base/protocols/smtp/entities.bro)
rest_target(${psd} base/protocols/smtp/main.bro) rest_target(${psd} base/protocols/smtp/main.bro)
@ -102,6 +99,7 @@ rest_target(${psd} policy/frameworks/software/vulnerable.bro)
rest_target(${psd} policy/integration/barnyard2/main.bro) rest_target(${psd} policy/integration/barnyard2/main.bro)
rest_target(${psd} policy/integration/barnyard2/types.bro) rest_target(${psd} policy/integration/barnyard2/types.bro)
rest_target(${psd} policy/misc/analysis-groups.bro) rest_target(${psd} policy/misc/analysis-groups.bro)
rest_target(${psd} policy/misc/capture-loss.bro)
rest_target(${psd} policy/misc/loaded-scripts.bro) rest_target(${psd} policy/misc/loaded-scripts.bro)
rest_target(${psd} policy/misc/profiling.bro) rest_target(${psd} policy/misc/profiling.bro)
rest_target(${psd} policy/misc/trim-trace-file.bro) rest_target(${psd} policy/misc/trim-trace-file.bro)
@ -116,6 +114,7 @@ rest_target(${psd} policy/protocols/http/detect-intel.bro)
rest_target(${psd} policy/protocols/http/detect-sqli.bro) rest_target(${psd} policy/protocols/http/detect-sqli.bro)
rest_target(${psd} policy/protocols/http/detect-webapps.bro) rest_target(${psd} policy/protocols/http/detect-webapps.bro)
rest_target(${psd} policy/protocols/http/header-names.bro) rest_target(${psd} policy/protocols/http/header-names.bro)
rest_target(${psd} policy/protocols/http/software-browser-plugins.bro)
rest_target(${psd} policy/protocols/http/software.bro) rest_target(${psd} policy/protocols/http/software.bro)
rest_target(${psd} policy/protocols/http/var-extraction-cookies.bro) rest_target(${psd} policy/protocols/http/var-extraction-cookies.bro)
rest_target(${psd} policy/protocols/http/var-extraction-uri.bro) rest_target(${psd} policy/protocols/http/var-extraction-uri.bro)

3
doc/scripts/genDocSourcesList.sh
View file

@ -34,9 +34,6 @@ blacklist all.bro
blacklist init-default.bro blacklist init-default.bro
blacklist init-bare.bro blacklist init-bare.bro
tmp_blacklist hot.conn.bro
tmp_blacklist scan.bro
statictext="\ statictext="\
# DO NOT EDIT # DO NOT EDIT
# This file is auto-generated from the "genDocSourcesList.sh" script. # This file is auto-generated from the "genDocSourcesList.sh" script.

4
scripts/test-all-policy.bro
View file

@ -24,12 +24,12 @@
@load integration/barnyard2/main.bro @load integration/barnyard2/main.bro
@load integration/barnyard2/types.bro @load integration/barnyard2/types.bro
@load misc/analysis-groups.bro @load misc/analysis-groups.bro
@load misc/capture-loss.bro
@load misc/loaded-scripts.bro @load misc/loaded-scripts.bro
@load misc/profiling.bro @load misc/profiling.bro
@load misc/trim-trace-file.bro @load misc/trim-trace-file.bro
@load protocols/conn/known-hosts.bro @load protocols/conn/known-hosts.bro
@load protocols/conn/known-services.bro @load protocols/conn/known-services.bro
# @load protocols/conn/scan.bro
@load protocols/dns/auth-addl.bro @load protocols/dns/auth-addl.bro
@load protocols/dns/detect-external-names.bro @load protocols/dns/detect-external-names.bro
@load protocols/ftp/detect.bro @load protocols/ftp/detect.bro
@ -39,6 +39,7 @@
@load protocols/http/detect-sqli.bro @load protocols/http/detect-sqli.bro
@load protocols/http/detect-webapps.bro @load protocols/http/detect-webapps.bro
@load protocols/http/header-names.bro @load protocols/http/header-names.bro
@load protocols/http/software-browser-plugins.bro
@load protocols/http/software.bro @load protocols/http/software.bro
@load protocols/http/var-extraction-cookies.bro @load protocols/http/var-extraction-cookies.bro
@load protocols/http/var-extraction-uri.bro @load protocols/http/var-extraction-uri.bro
@ -59,4 +60,3 @@
@load tuning/defaults/remove-high-volume-notices.bro @load tuning/defaults/remove-high-volume-notices.bro
@load tuning/defaults/warnings.bro @load tuning/defaults/warnings.bro
@load tuning/track-all-assets.bro @load tuning/track-all-assets.bro
# @load hot.conn.bro

180
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -1,92 +1,92 @@
#separator \x09 #separator \x09
#path loaded_scripts #path loaded_scripts
#fields depth name #fields name
#types count string #types string
0 scripts/base/init-bare.bro scripts/base/init-bare.bro
1 build/src/base/const.bif.bro build/src/base/const.bif.bro
1 build/src/base/types.bif.bro build/src/base/types.bif.bro
1 build/src/base/strings.bif.bro build/src/base/strings.bif.bro
1 build/src/base/bro.bif.bro build/src/base/bro.bif.bro
1 build/src/base/reporter.bif.bro build/src/base/reporter.bif.bro
1 build/src/base/event.bif.bro build/src/base/event.bif.bro
1 scripts/base/frameworks/logging/__load__.bro scripts/base/frameworks/logging/__load__.bro
2 scripts/base/frameworks/logging/./main.bro scripts/base/frameworks/logging/./main.bro
3 build/src/base/logging.bif.bro build/src/base/logging.bif.bro
2 scripts/base/frameworks/logging/./postprocessors/__load__.bro scripts/base/frameworks/logging/./postprocessors/__load__.bro
3 scripts/base/frameworks/logging/./postprocessors/./scp.bro scripts/base/frameworks/logging/./postprocessors/./scp.bro
2 scripts/base/frameworks/logging/./writers/ascii.bro scripts/base/frameworks/logging/./writers/ascii.bro
0 scripts/base/init-default.bro scripts/base/init-default.bro
1 scripts/base/utils/site.bro scripts/base/utils/site.bro
2 scripts/base/utils/./patterns.bro scripts/base/utils/./patterns.bro
1 scripts/base/utils/addrs.bro scripts/base/utils/addrs.bro
1 scripts/base/utils/conn-ids.bro scripts/base/utils/conn-ids.bro
1 scripts/base/utils/directions-and-hosts.bro scripts/base/utils/directions-and-hosts.bro
1 scripts/base/utils/files.bro scripts/base/utils/files.bro
1 scripts/base/utils/numbers.bro scripts/base/utils/numbers.bro
1 scripts/base/utils/paths.bro scripts/base/utils/paths.bro
1 scripts/base/utils/strings.bro scripts/base/utils/strings.bro
1 scripts/base/utils/thresholds.bro scripts/base/utils/thresholds.bro
1 scripts/base/frameworks/notice/__load__.bro scripts/base/frameworks/notice/__load__.bro
2 scripts/base/frameworks/notice/./main.bro scripts/base/frameworks/notice/./main.bro
2 scripts/base/frameworks/notice/./weird.bro scripts/base/frameworks/notice/./weird.bro
2 scripts/base/frameworks/notice/./actions/drop.bro scripts/base/frameworks/notice/./actions/drop.bro
2 scripts/base/frameworks/notice/./actions/email_admin.bro scripts/base/frameworks/notice/./actions/email_admin.bro
2 scripts/base/frameworks/notice/./actions/page.bro scripts/base/frameworks/notice/./actions/page.bro
2 scripts/base/frameworks/notice/./actions/add-geodata.bro scripts/base/frameworks/notice/./actions/add-geodata.bro
2 scripts/base/frameworks/notice/./extend-email/hostnames.bro scripts/base/frameworks/notice/./extend-email/hostnames.bro
2 scripts/base/frameworks/cluster/__load__.bro scripts/base/frameworks/cluster/__load__.bro
3 scripts/base/frameworks/cluster/./main.bro scripts/base/frameworks/cluster/./main.bro
4 scripts/base/frameworks/control/__load__.bro scripts/base/frameworks/control/__load__.bro
5 scripts/base/frameworks/control/./main.bro scripts/base/frameworks/control/./main.bro
1 scripts/base/frameworks/dpd/__load__.bro scripts/base/frameworks/dpd/__load__.bro
2 scripts/base/frameworks/dpd/./main.bro scripts/base/frameworks/dpd/./main.bro
1 scripts/base/frameworks/signatures/__load__.bro scripts/base/frameworks/signatures/__load__.bro
2 scripts/base/frameworks/signatures/./main.bro scripts/base/frameworks/signatures/./main.bro
1 scripts/base/frameworks/packet-filter/__load__.bro scripts/base/frameworks/packet-filter/__load__.bro
2 scripts/base/frameworks/packet-filter/./main.bro scripts/base/frameworks/packet-filter/./main.bro
2 scripts/base/frameworks/packet-filter/./netstats.bro scripts/base/frameworks/packet-filter/./netstats.bro
1 scripts/base/frameworks/software/__load__.bro scripts/base/frameworks/software/__load__.bro
2 scripts/base/frameworks/software/./main.bro scripts/base/frameworks/software/./main.bro
1 scripts/base/frameworks/communication/__load__.bro scripts/base/frameworks/communication/__load__.bro
2 scripts/base/frameworks/communication/./main.bro scripts/base/frameworks/communication/./main.bro
1 scripts/base/frameworks/metrics/__load__.bro scripts/base/frameworks/metrics/__load__.bro
2 scripts/base/frameworks/metrics/./main.bro scripts/base/frameworks/metrics/./main.bro
2 scripts/base/frameworks/metrics/./non-cluster.bro scripts/base/frameworks/metrics/./non-cluster.bro
1 scripts/base/frameworks/intel/__load__.bro scripts/base/frameworks/intel/__load__.bro
2 scripts/base/frameworks/intel/./main.bro scripts/base/frameworks/intel/./main.bro
1 scripts/base/frameworks/reporter/__load__.bro scripts/base/frameworks/reporter/__load__.bro
2 scripts/base/frameworks/reporter/./main.bro scripts/base/frameworks/reporter/./main.bro
1 scripts/base/protocols/conn/__load__.bro scripts/base/protocols/conn/__load__.bro
2 scripts/base/protocols/conn/./main.bro scripts/base/protocols/conn/./main.bro
2 scripts/base/protocols/conn/./contents.bro scripts/base/protocols/conn/./contents.bro
2 scripts/base/protocols/conn/./inactivity.bro scripts/base/protocols/conn/./inactivity.bro
1 scripts/base/protocols/dns/__load__.bro scripts/base/protocols/dns/__load__.bro
2 scripts/base/protocols/dns/./consts.bro scripts/base/protocols/dns/./consts.bro
2 scripts/base/protocols/dns/./main.bro scripts/base/protocols/dns/./main.bro
1 scripts/base/protocols/ftp/__load__.bro scripts/base/protocols/ftp/__load__.bro
2 scripts/base/protocols/ftp/./utils-commands.bro scripts/base/protocols/ftp/./utils-commands.bro
2 scripts/base/protocols/ftp/./main.bro scripts/base/protocols/ftp/./main.bro
2 scripts/base/protocols/ftp/./file-extract.bro scripts/base/protocols/ftp/./file-extract.bro
1 scripts/base/protocols/http/__load__.bro scripts/base/protocols/http/__load__.bro
2 scripts/base/protocols/http/./main.bro scripts/base/protocols/http/./main.bro
2 scripts/base/protocols/http/./utils.bro scripts/base/protocols/http/./utils.bro
2 scripts/base/protocols/http/./file-ident.bro scripts/base/protocols/http/./file-ident.bro
2 scripts/base/protocols/http/./file-hash.bro scripts/base/protocols/http/./file-hash.bro
2 scripts/base/protocols/http/./file-extract.bro scripts/base/protocols/http/./file-extract.bro
1 scripts/base/protocols/irc/__load__.bro scripts/base/protocols/irc/__load__.bro
2 scripts/base/protocols/irc/./main.bro scripts/base/protocols/irc/./main.bro
2 scripts/base/protocols/irc/./dcc-send.bro scripts/base/protocols/irc/./dcc-send.bro
1 scripts/base/protocols/smtp/__load__.bro scripts/base/protocols/smtp/__load__.bro
2 scripts/base/protocols/smtp/./main.bro scripts/base/protocols/smtp/./main.bro
2 scripts/base/protocols/smtp/./entities.bro scripts/base/protocols/smtp/./entities.bro
2 scripts/base/protocols/smtp/./entities-excerpt.bro scripts/base/protocols/smtp/./entities-excerpt.bro
1 scripts/base/protocols/ssh/__load__.bro scripts/base/protocols/ssh/__load__.bro
2 scripts/base/protocols/ssh/./main.bro scripts/base/protocols/ssh/./main.bro
1 scripts/base/protocols/ssl/__load__.bro scripts/base/protocols/ssl/__load__.bro
2 scripts/base/protocols/ssl/./consts.bro scripts/base/protocols/ssl/./consts.bro
2 scripts/base/protocols/ssl/./main.bro scripts/base/protocols/ssl/./main.bro
2 scripts/base/protocols/ssl/./mozilla-ca-list.bro scripts/base/protocols/ssl/./mozilla-ca-list.bro
1 scripts/base/protocols/syslog/__load__.bro scripts/base/protocols/syslog/__load__.bro
2 scripts/base/protocols/syslog/./consts.bro scripts/base/protocols/syslog/./consts.bro
2 scripts/base/protocols/syslog/./main.bro scripts/base/protocols/syslog/./main.bro
0 scripts/policy/misc/loaded-scripts.bro scripts/policy/misc/loaded-scripts.bro

2
testing/btest/coverage/default-load-baseline.test
View file

@ -9,6 +9,6 @@
# @TEST-EXEC: bro misc/loaded-scripts # @TEST-EXEC: bro misc/loaded-scripts
# @TEST-EXEC: test -e loaded_scripts.log # @TEST-EXEC: test -e loaded_scripts.log
# @TEST-EXEC: cat loaded_scripts.log | egrep -v '#' | awk 'NR>0{print $2}' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix # @TEST-EXEC: cat loaded_scripts.log | egrep -v '#' | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix
# @TEST-EXEC: cat loaded_scripts.log | sed "s#`cat prefix`##g" >canonified_loaded_scripts.log # @TEST-EXEC: cat loaded_scripts.log | sed "s#`cat prefix`##g" >canonified_loaded_scripts.log
# @TEST-EXEC: btest-diff canonified_loaded_scripts.log # @TEST-EXEC: btest-diff canonified_loaded_scripts.log

6
testing/btest/coverage/init-default.test
View file

@ -11,8 +11,8 @@
#@TEST-EXEC: test -e $DIST/scripts/base/init-default.bro #@TEST-EXEC: test -e $DIST/scripts/base/init-default.bro
#@TEST-EXEC: ( cd $DIST/scripts/base && find . -name '*.bro' ) | sort >"all scripts found" #@TEST-EXEC: ( cd $DIST/scripts/base && find . -name '*.bro' ) | sort >"all scripts found"
#@TEST-EXEC: bro misc/loaded-scripts #@TEST-EXEC: bro misc/loaded-scripts
#@TEST-EXEC: cat loaded_scripts.log | egrep -v '/build/|/loaded-scripts.bro|#' | awk 'NR>0{print $2}' | sed 's#/./#/#g' >loaded_scripts.log.tmp #@TEST-EXEC: cat loaded_scripts.log | egrep -v '/build/|/loaded-scripts.bro|#' | sed 's#/./#/#g' >loaded_scripts.log.tmp
#@TEST-EXEC: cat loaded_scripts.log.tmp | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix
#@TEST-EXEC: cat loaded_scripts.log.tmp | sed "s#`cat prefix`#./#g" | sort >init-default.bro #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed "s#`cat prefix`#./#g" | sort >init-default.bro
#@TEST-EXEC: diff -u "all scripts found" init-default.bro | egrep "^-[^-]" > missing_loads #@TEST-EXEC: diff -u "all scripts found" init-default.bro | egrep "^-[^-]" > missing_loads
#@TEST-EXEC: btest-diff missing_loads #@TEST-EXEC: btest-diff missing_loads

2
testing/btest/scripts/base/protocols/http/100-continue.bro
View file

@ -4,7 +4,7 @@
# in a way that correlates the final response with the request. # in a way that correlates the final response with the request.
# #
# @TEST-EXEC: bro -r $TRACES/http-100-continue.trace %INPUT # @TEST-EXEC: bro -r $TRACES/http-100-continue.trace %INPUT
# @TEST-EXEC: grep -q unmatched_HTTP_reply weird.log && exit 0 || exit 1 # @TEST-EXEC: grep -q unmatched_HTTP_reply weird.log && exit 1 || exit 0
# @TEST-EXEC: btest-diff http.log # @TEST-EXEC: btest-diff http.log
# The base analysis scripts are loaded by default. # The base analysis scripts are loaded by default.

6
testing/btest/scripts/base/protocols/http/http-header-crlf.bro
View file

@ -1,9 +1,9 @@
# This tests for what looks like a problem in the HTTP parser: # This tests for what looks like a problem in the HTTP parser:
# it gets confused whether it's in a header or not; it should # it gets confused whether it's in a header or not; it shouldn't report
# not report that weird. # the http_no_crlf_in_header_list wierd.
# #
# @TEST-EXEC: bro -r $TRACES/http-byteranges.trace %INPUT # @TEST-EXEC: bro -r $TRACES/http-byteranges.trace %INPUT
# @TEST-EXEC: grep -q http_no_crlf_in_header_list weird.log && exit 0 || exit 1 # @TEST-EXEC: grep -q http_no_crlf_in_header_list weird.log && exit 1 || exit 0
# The base analysis scripts are loaded by default. # The base analysis scripts are loaded by default.
#@load base/protocols/http #@load base/protocols/http