From 49a2198dd5a034d080767d13d59e9fef5b7bdf37 Mon Sep 17 00:00:00 2001 From: Vlad Grigorescu Date: Wed, 6 Aug 2014 10:13:22 -0500 Subject: [PATCH] Add memleak and auth btests. --- .../mysql.log | 20 ++++++++++++++++++ testing/btest/Traces/mysql/auth.trace | Bin 0 -> 16895 bytes testing/btest/Traces/mysql/mysql.trace | Bin 0 -> 6567 bytes testing/btest/core/leaks/mysql.test | 10 +++++++++ .../scripts/base/protocols/mysql/auth.test | 6 ++++++ 5 files changed, 36 insertions(+) create mode 100644 testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log create mode 100644 testing/btest/Traces/mysql/auth.trace create mode 100644 testing/btest/Traces/mysql/mysql.trace create mode 100644 testing/btest/core/leaks/mysql.test create mode 100644 testing/btest/scripts/base/protocols/mysql/auth.test diff --git a/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log b/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log new file mode 100644 index 0000000000..6c9e26b441 --- /dev/null +++ b/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log @@ -0,0 +1,20 @@ +#separator \x09 +#set_separator , +#empty_field (empty) +#unset_field - +#path mysql +#open 2014-09-05-02-09-40 +#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p cmd arg result response +#types time string addr port addr port string string string string +1362452327.618353 CsRx2w45OKnoww6xl4 192.168.1.3 55845 192.168.1.8 3306 login root_nope error Access denied for user 'root_nope'@'lumberjack.home' (using password: NO) +1362452330.947463 CRJuHdVW0XPVINV8a 192.168.1.3 55846 192.168.1.8 3306 login root_nope error Access denied for user 'root_nope'@'lumberjack.home' (using password: YES) +1362452332.571339 CPbrpk1qSsw6ESzHV4 192.168.1.3 55847 192.168.1.8 3306 login root_nope error Access denied for user 'root_nope'@'lumberjack.home' (using password: YES) +1362452334.559420 C6pKV8GSxOnSLghOa 192.168.1.3 55857 192.168.1.8 3306 login root_nope error Access denied for user 'root_nope'@'lumberjack.home' (using password: YES) +1362452336.361958 CIPOse170MGiRM1Qf4 192.168.1.3 55860 192.168.1.8 3306 login root_nope error Access denied for user 'root_nope'@'lumberjack.home' (using password: YES) +1362452357.320858 C7XEbhP654jzLoe3a 192.168.1.3 55861 192.168.1.8 3306 login root error Access denied for user 'root'@'lumberjack.home' (using password: NO) +1362452358.565340 CJ3xTn1c4Zw9TmAE05 192.168.1.3 55862 192.168.1.8 3306 login root error Access denied for user 'root'@'lumberjack.home' (using password: YES) +1362452360.410803 CMXxB5GvmoxJFXdTa 192.168.1.3 55863 192.168.1.8 3306 login root error Access denied for user 'root'@'lumberjack.home' (using password: YES) +1362452361.886123 Caby8b1slFea8xwSmb 192.168.1.3 55864 192.168.1.8 3306 login root error Access denied for user 'root'@'lumberjack.home' (using password: YES) +1362452372.452858 Che1bq3i2rO3KD1Syg 192.168.1.3 55865 192.168.1.8 3306 login root ok Affected rows: 0 +1362452372.454995 Che1bq3i2rO3KD1Syg 192.168.1.3 55865 192.168.1.8 3306 query select @@version_comment limit 1 ok Affected rows: 1 +#close 2014-09-05-02-09-40 diff --git a/testing/btest/Traces/mysql/auth.trace b/testing/btest/Traces/mysql/auth.trace new file mode 100644 index 0000000000000000000000000000000000000000..48072e8020a0062862c9a6fe0653cba4a3759423 GIT binary patch literal 16895 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 literal 0 HcmV?d00001 diff --git a/testing/btest/Traces/mysql/mysql.trace b/testing/btest/Traces/mysql/mysql.trace new file mode 100644 index 0000000000000000000000000000000000000000..bfc4d794db3f52abdaddf9b6c281d919aeff1f8e GIT binary patch literal 6567 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 GG58;)>QIXS literal 0 HcmV?d00001 diff --git a/testing/btest/core/leaks/mysql.test b/testing/btest/core/leaks/mysql.test new file mode 100644 index 0000000000..363e3069fd --- /dev/null +++ b/testing/btest/core/leaks/mysql.test @@ -0,0 +1,10 @@ +# Needs perftools support. +# +# @TEST-REQUIRES: bro --help 2>&1 | grep -q mem-leaks +# +# @TEST-GROUP: leaks +# +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -b -m -r $TRACES/mysql/mysql.trace %INPUT +# @TEST-EXEC: btest-bg-wait 30 + +@load base/protocols/mysql diff --git a/testing/btest/scripts/base/protocols/mysql/auth.test b/testing/btest/scripts/base/protocols/mysql/auth.test new file mode 100644 index 0000000000..6c764e496f --- /dev/null +++ b/testing/btest/scripts/base/protocols/mysql/auth.test @@ -0,0 +1,6 @@ +# This tests that successful/unsuccesful auth attempts get logged correctly + +# @TEST-EXEC: bro -b -r $TRACES/mysql/auth.trace %INPUT +# @TEST-EXEC: btest-diff mysql.log + +@load base/protocols/mysql \ No newline at end of file