diff --git a/CMakeLists.txt b/CMakeLists.txt index 0740496..ca39542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) project(ZeekPluginPostgres) diff --git a/src/PostgresWriter.cc b/src/PostgresWriter.cc index daa4ba2..a9e9eda 100644 --- a/src/PostgresWriter.cc +++ b/src/PostgresWriter.cc @@ -312,7 +312,7 @@ std::tuple PostgreSQL::CreateParams(const Value* val) case zeek::TYPE_TABLE: case zeek::TYPE_VECTOR: { - bro_int_t size; + zeek_int_t size; Value** vals; std::string out("{"); @@ -330,7 +330,7 @@ std::tuple PostgreSQL::CreateParams(const Value* val) } if ( ! size ) - return std::make_tuple(false, std::string(), 0); + return std::make_tuple(true, std::string("{}"), 2); for ( int i = 0; i < size; ++i ) { @@ -384,7 +384,7 @@ bool PostgreSQL::DoWrite(int num_fields, const Field* const* fields, Value** val params.push_back(CreateParams(vals[i])); std::vector params_char; // vector in which we compile the character pointers that we - // then pass to PQexecParams. These do not have to be cleaned up because the srings will be + // then pass to PQexecParams. These do not have to be cleaned up because the strings will be // cleaned up automatically. std::vector params_length; // vector in which we compile the lengths of the parameters that we // then pass to PQexecParams diff --git a/tests/Baseline/postgres.write-basic/ssh.out b/tests/Baseline/postgres.write-basic/ssh.out index 41257d5..1ef697c 100644 --- a/tests/Baseline/postgres.write-basic/ssh.out +++ b/tests/Baseline/postgres.write-basic/ssh.out @@ -1,20 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -id|b|i|e|c|p|sn|a|d|t|iv|s|sc|ss|se|vc|ve|f|vo|so -1|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|hurz|{4,2,3,1}|{CC,BB,AA}||{10,20,30}||SSHTest::foo -{ -if (0 < SSHTest::i) - return (Foo); -else - return (Bar); - -}|| -2|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|hurz|{4,2,3,1}|{"\"","{\"\"\\hello","a b -c d~e","{{{{{}'","","\\\"\\{}"}||{10,20,30}||SSHTest::foo -{ -if (0 < SSHTest::i) - return (Foo); -else - return (Bar); - -}|| -(2 rows) +1 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 XXXXXXXXXX.XXXXXX 100 hurz {4,2,3,1} {CC,BB,AA} {} {10,20,30} {} SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} \N \N +2 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 XXXXXXXXXX.XXXXXX 100 hurz {4,2,3,1} {"\\"","{\\"\\"\\\\hello","a\tb\nc\rd~e","{{{{{}'","","\\\\\\"\\\\{}"} {} {10,20,30} {} SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} \N \N diff --git a/tests/Baseline/postgres.write-bytea/ssh.out b/tests/Baseline/postgres.write-bytea/ssh.out index ed296dd..409255f 100644 --- a/tests/Baseline/postgres.write-bytea/ssh.out +++ b/tests/Baseline/postgres.write-bytea/ssh.out @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. id|b|i|e|c|p|sn|a|d|t|iv|s|sc|ss|se|vc|ve|f -1|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|\x6875727a|{4,2,3,1}|{"\\x4343","\\x4242","\\x4141"}||{10,20,30}||\x535348546573743a3a666f6f0a7b200a6966202830203c20535348546573743a3a6929200a0972657475726e2028466f6f293b0a656c73650a0972657475726e2028426172293b0a0a7d +1|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|\x6875727a|{4,2,3,1}|{"\\x4343","\\x4242","\\x4141"}|{}|{10,20,30}|{}|\x535348546573743a3a666f6f0a7b200a6966202830203c20535348546573743a3a6929200a0972657475726e2028466f6f293b0a656c73650a0972657475726e2028426172293b0a0a7d (1 row) diff --git a/tests/Baseline/postgres.write-error/ssh.out b/tests/Baseline/postgres.write-error/ssh.out index 2f2e42d..d6b4185 100644 --- a/tests/Baseline/postgres.write-error/ssh.out +++ b/tests/Baseline/postgres.write-error/ssh.out @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. id|b|i|e|c|p|sn|a|d|t|iv|s|sc|ss|se|vc|ve|f -1|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|h|{4,2,3,1}|{CC,BB,AA}||{10,20,30}||SSHTest::foo +1|t|-42|SSH::LOG|21|123|10.0.0.0/24|1.2.3.4|3.14|XXXXXXXXXX.XXXXXX|100|h|{4,2,3,1}|{CC,BB,AA}|{}|{10,20,30}|{}|SSHTest::foo { if (0 < SSHTest::i) return (Foo); diff --git a/tests/Baseline/postgres.write-wikipedia/conn.out b/tests/Baseline/postgres.write-wikipedia/conn.out index da5fd50..d1a8baf 100644 --- a/tests/Baseline/postgres.write-wikipedia/conn.out +++ b/tests/Baseline/postgres.write-wikipedia/conn.out @@ -1,36 +1,37 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. id|ts|uid|id.orig_h|id.orig_p|id.resp_h|id.resp_p|proto|service|duration|orig_bytes|resp_bytes|conn_state|local_orig|local_resp|missed_bytes|history|orig_pkts|orig_ip_bytes|resp_pkts|resp_ip_bytes|tunnel_parents -1|1300475167.096535|CHhAvVGS1DHFjwGM9|141.142.220.202|5353|224.0.0.251|5353|udp|dns||||S0|||0|D|1|73|0|0| -2|1300475167.097012|ClEkJM2Vm5giqnMf4h|fe80::217:f2ff:fed7:cf65|5353|ff02::fb|5353|udp|dns||||S0|||0|D|1|199|0|0| -3|1300475167.099816|C4J4Th3PJpwUYZZ6gc|141.142.220.50|5353|224.0.0.251|5353|udp|dns||||S0|||0|D|1|179|0|0| -4|1300475168.853899|CmES5u32sYpV7JYN|141.142.220.118|43927|141.142.2.2|53|udp|dns|0.000435|38|89|SF|||0|Dd|1|66|1|117| -5|1300475168.854378|CP5puj4I8PtEU4qzYg|141.142.220.118|37676|141.142.2.2|53|udp|dns|0.00042|52|99|SF|||0|Dd|1|80|1|127| -6|1300475168.854837|C37jN32gN3y3AZzyf6|141.142.220.118|40526|141.142.2.2|53|udp|dns|0.000392|38|183|SF|||0|Dd|1|66|1|211| -7|1300475168.857956|C0LAHyvtKSQHyJxIl|141.142.220.118|32902|141.142.2.2|53|udp|dns|0.000317|38|89|SF|||0|Dd|1|66|1|117| -8|1300475168.858306|CFLRIC3zaTU1loLGxh|141.142.220.118|59816|141.142.2.2|53|udp|dns|0.000343|52|99|SF|||0|Dd|1|80|1|127| -9|1300475168.858713|C9rXSW3KSpTYvPrlI1|141.142.220.118|59714|141.142.2.2|53|udp|dns|0.000375|38|183|SF|||0|Dd|1|66|1|211| -10|1300475168.891644|C9mvWx3ezztgzcexV7|141.142.220.118|58206|141.142.2.2|53|udp|dns|0.000339|38|89|SF|||0|Dd|1|66|1|117| -11|1300475168.892037|CNnMIj2QSd84NKf7U3|141.142.220.118|38911|141.142.2.2|53|udp|dns|0.000335|52|99|SF|||0|Dd|1|80|1|127| -12|1300475168.892414|C7fIlMZDuRiqjpYbb|141.142.220.118|59746|141.142.2.2|53|udp|dns|0.000421|38|183|SF|||0|Dd|1|66|1|211| -13|1300475168.893988|CpmdRlaUoJLN3uIRa|141.142.220.118|45000|141.142.2.2|53|udp|dns|0.000384|38|89|SF|||0|Dd|1|66|1|117| -14|1300475168.894422|C1Xkzz2MaGtLrc1Tla|141.142.220.118|48479|141.142.2.2|53|udp|dns|0.000317|52|99|SF|||0|Dd|1|80|1|127| -15|1300475168.894787|CqlVyW1YwZ15RhTBc4|141.142.220.118|48128|141.142.2.2|53|udp|dns|0.000423|38|183|SF|||0|Dd|1|66|1|211| -16|1300475168.901749|CBA8792iHmnhPLksKa|141.142.220.118|56056|141.142.2.2|53|udp|dns|0.000402|36|131|SF|||0|Dd|1|64|1|159| -17|1300475168.902195|CGLPPc35OzDQij1XX8|141.142.220.118|55092|141.142.2.2|53|udp|dns|0.000374|36|198|SF|||0|Dd|1|64|1|226| -18|1300475169.899438|Cipfzj1BEnhejw8cGf|141.142.220.44|5353|224.0.0.251|5353|udp|dns||||S0|||0|D|1|85|0|0| -19|1300475170.862384|CV5WJ42jPYbNW9JNWf|141.142.220.226|137|141.142.220.255|137|udp|dns|2.613017|350|0|S0|||0|D|7|546|0|0| -20|1300475171.675372|CPhDKt12KQPUVbQz06|fe80::3074:17d5:2052:c324|65373|ff02::1:3|5355|udp|dns|0.100096|66|0|S0|||0|D|2|162|0|0| -21|1300475171.677081|CAnFrb2Cvxr5T7quOc|141.142.220.226|55131|224.0.0.252|5355|udp|dns|0.100021|66|0|S0|||0|D|2|122|0|0| -22|1300475173.116749|C8rquZ3DjgNW06JGLl|fe80::3074:17d5:2052:c324|54213|ff02::1:3|5355|udp|dns|0.099801|66|0|S0|||0|D|2|162|0|0| -23|1300475173.117362|CzrZOtXqhwwndQva3|141.142.220.226|55671|224.0.0.252|5355|udp|dns|0.099849|66|0|S0|||0|D|2|122|0|0| -24|1300475173.153679|CaGCc13FffXe6RkQl9|141.142.220.238|56641|141.142.220.255|137|udp|dns||||S0|||0|D|1|78|0|0| -25|1300475168.652003|CtPZjS20MLrsMUOJi2|141.142.220.118|35634|208.80.152.2|80|tcp||0.061329|463|350|OTH|||0|DdA|2|567|1|402| -26|1300475168.902635|CiyBAq1bBLNaTiTAc|141.142.220.118|35642|208.80.152.2|80|tcp|http|0.120041|534|412|S1|||0|ShADad|4|750|3|576| -27|1300475168.855305|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|tcp|http|0.218501|1171|733|S1|||0|ShADad|6|1491|4|949| -28|1300475168.85533|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|tcp|http|0.21972|1125|734|S1|||0|ShADad|6|1445|4|950| -29|1300475168.859163|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|tcp|http|0.215893|1130|734|S1|||0|ShADad|6|1450|4|950| -30|1300475168.892913|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|tcp|http|0.220961|1137|733|S1|||0|ShADad|6|1457|4|949| -31|1300475168.892936|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|tcp|http|0.229603|1148|734|S1|||0|ShADad|6|1468|4|950| -32|1300475168.895267|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|tcp|http|0.227284|1178|734|S1|||0|ShADad|6|1498|4|950| -33|1300475168.724007|CUM0KZ3MLUfNB0cl11|141.142.220.118|48649|208.80.152.118|80|tcp|http|0.119905|525|232|S1|||0|ShADad|4|741|3|396| -34|1300475169.780331|CFSwNi4CNGxcuffo49|141.142.220.235|6705|173.192.163.128|80|tcp|||||OTH|||0|^h|0|0|1|48| +1|XXXXXXXXXX.XXXXXX|CHhAvVGS1DHFjwGM9|141.142.220.202|5353|224.0.0.251|5353|udp|dns||||S0|f|f|0|D|1|73|0|0| +2|XXXXXXXXXX.XXXXXX|ClEkJM2Vm5giqnMf4h|fe80::217:f2ff:fed7:cf65|5353|ff02::fb|5353|udp|dns||||S0|t|f|0|D|1|199|0|0| +3|XXXXXXXXXX.XXXXXX|C4J4Th3PJpwUYZZ6gc|141.142.220.50|5353|224.0.0.251|5353|udp|dns||||S0|f|f|0|D|1|179|0|0| +4|XXXXXXXXXX.XXXXXX|CmES5u32sYpV7JYN|141.142.220.118|43927|141.142.2.2|53|udp|dns|0.000435|38|89|SF|f|f|0|Dd|1|66|1|117| +5|XXXXXXXXXX.XXXXXX|CP5puj4I8PtEU4qzYg|141.142.220.118|37676|141.142.2.2|53|udp|dns|0.00042|52|99|SF|f|f|0|Dd|1|80|1|127| +6|XXXXXXXXXX.XXXXXX|C37jN32gN3y3AZzyf6|141.142.220.118|40526|141.142.2.2|53|udp|dns|0.000392|38|183|SF|f|f|0|Dd|1|66|1|211| +7|XXXXXXXXXX.XXXXXX|C0LAHyvtKSQHyJxIl|141.142.220.118|32902|141.142.2.2|53|udp|dns|0.000317|38|89|SF|f|f|0|Dd|1|66|1|117| +8|XXXXXXXXXX.XXXXXX|CFLRIC3zaTU1loLGxh|141.142.220.118|59816|141.142.2.2|53|udp|dns|0.000343|52|99|SF|f|f|0|Dd|1|80|1|127| +9|XXXXXXXXXX.XXXXXX|C9rXSW3KSpTYvPrlI1|141.142.220.118|59714|141.142.2.2|53|udp|dns|0.000375|38|183|SF|f|f|0|Dd|1|66|1|211| +10|XXXXXXXXXX.XXXXXX|C9mvWx3ezztgzcexV7|141.142.220.118|58206|141.142.2.2|53|udp|dns|0.000339|38|89|SF|f|f|0|Dd|1|66|1|117| +11|XXXXXXXXXX.XXXXXX|CNnMIj2QSd84NKf7U3|141.142.220.118|38911|141.142.2.2|53|udp|dns|0.000335|52|99|SF|f|f|0|Dd|1|80|1|127| +12|XXXXXXXXXX.XXXXXX|C7fIlMZDuRiqjpYbb|141.142.220.118|59746|141.142.2.2|53|udp|dns|0.000421|38|183|SF|f|f|0|Dd|1|66|1|211| +13|XXXXXXXXXX.XXXXXX|CpmdRlaUoJLN3uIRa|141.142.220.118|45000|141.142.2.2|53|udp|dns|0.000384|38|89|SF|f|f|0|Dd|1|66|1|117| +14|XXXXXXXXXX.XXXXXX|C1Xkzz2MaGtLrc1Tla|141.142.220.118|48479|141.142.2.2|53|udp|dns|0.000317|52|99|SF|f|f|0|Dd|1|80|1|127| +15|XXXXXXXXXX.XXXXXX|CqlVyW1YwZ15RhTBc4|141.142.220.118|48128|141.142.2.2|53|udp|dns|0.000423|38|183|SF|f|f|0|Dd|1|66|1|211| +16|XXXXXXXXXX.XXXXXX|CBA8792iHmnhPLksKa|141.142.220.118|56056|141.142.2.2|53|udp|dns|0.000402|36|131|SF|f|f|0|Dd|1|64|1|159| +17|XXXXXXXXXX.XXXXXX|CGLPPc35OzDQij1XX8|141.142.220.118|55092|141.142.2.2|53|udp|dns|0.000374|36|198|SF|f|f|0|Dd|1|64|1|226| +18|XXXXXXXXXX.XXXXXX|Cipfzj1BEnhejw8cGf|141.142.220.44|5353|224.0.0.251|5353|udp|dns||||S0|f|f|0|D|1|85|0|0| +19|XXXXXXXXXX.XXXXXX|CV5WJ42jPYbNW9JNWf|141.142.220.226|137|141.142.220.255|137|udp|dns|2.613017|350|0|S0|f|f|0|D|7|546|0|0| +20|XXXXXXXXXX.XXXXXX|CPhDKt12KQPUVbQz06|fe80::3074:17d5:2052:c324|65373|ff02::1:3|5355|udp|dns|0.100096|66|0|S0|t|f|0|D|2|162|0|0| +21|XXXXXXXXXX.XXXXXX|CAnFrb2Cvxr5T7quOc|141.142.220.226|55131|224.0.0.252|5355|udp|dns|0.100021|66|0|S0|f|f|0|D|2|122|0|0| +22|XXXXXXXXXX.XXXXXX|C8rquZ3DjgNW06JGLl|fe80::3074:17d5:2052:c324|54213|ff02::1:3|5355|udp|dns|0.099801|66|0|S0|t|f|0|D|2|162|0|0| +23|XXXXXXXXXX.XXXXXX|CzrZOtXqhwwndQva3|141.142.220.226|55671|224.0.0.252|5355|udp|dns|0.099849|66|0|S0|f|f|0|D|2|122|0|0| +24|XXXXXXXXXX.XXXXXX|CaGCc13FffXe6RkQl9|141.142.220.238|56641|141.142.220.255|137|udp|dns||||S0|f|f|0|D|1|78|0|0| +25|XXXXXXXXXX.XXXXXX|CtPZjS20MLrsMUOJi2|141.142.220.118|35634|208.80.152.2|80|tcp||0.061329|463|350|OTH|f|f|0|DdA|2|567|1|402| +26|XXXXXXXXXX.XXXXXX|CiyBAq1bBLNaTiTAc|141.142.220.118|35642|208.80.152.2|80|tcp|http|0.120041|534|412|S1|f|f|0|ShADad|4|750|3|576| +27|XXXXXXXXXX.XXXXXX|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|tcp|http|0.218501|1171|733|S1|f|f|0|ShADad|6|1491|4|949| +28|XXXXXXXXXX.XXXXXX|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|tcp|http|0.21972|1125|734|S1|f|f|0|ShADad|6|1445|4|950| +29|XXXXXXXXXX.XXXXXX|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|tcp|http|0.215893|1130|734|S1|f|f|0|ShADad|6|1450|4|950| +30|XXXXXXXXXX.XXXXXX|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|tcp|http|0.220961|1137|733|S1|f|f|0|ShADad|6|1457|4|949| +31|XXXXXXXXXX.XXXXXX|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|tcp|http|0.229603|1148|734|S1|f|f|0|ShADad|6|1468|4|950| +32|XXXXXXXXXX.XXXXXX|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|tcp|http|0.227284|1178|734|S1|f|f|0|ShADad|6|1498|4|950| +33|XXXXXXXXXX.XXXXXX|CUM0KZ3MLUfNB0cl11|141.142.220.118|48649|208.80.152.118|80|tcp|http|0.119905|525|232|S1|f|f|0|ShADad|4|741|3|396| +34|XXXXXXXXXX.XXXXXX|CFSwNi4CNGxcuffo49|141.142.220.235|6705|173.192.163.128|80|tcp|||||OTH|f|f|0|^h|0|0|1|48| (34 rows) diff --git a/tests/Baseline/postgres.write-wikipedia/http.out b/tests/Baseline/postgres.write-wikipedia/http.out index fde6b25..a637338 100644 --- a/tests/Baseline/postgres.write-wikipedia/http.out +++ b/tests/Baseline/postgres.write-wikipedia/http.out @@ -1,16 +1,17 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. id|ts|uid|id.orig_h|id.orig_p|id.resp_h|id.resp_p|trans_depth|method|host|uri|referrer|version|user_agent|origin|request_body_len|response_body_len|status_code|status_msg|info_code|info_msg|tags|username|password|proxied|orig_fuids|orig_filenames|orig_mime_types|resp_fuids|resp_filenames|resp_mime_types -1|1300475168.78402|CUM0KZ3MLUfNB0cl11|141.142.220.118|48649|208.80.152.118|80|1|GET|bits.wikimedia.org|/skins-1.5/monobook/main.css|http://www.wikipedia.org/|1.1|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -2|1300475168.916018|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/6/63/Wikipedia-logo.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -3|1300475168.916183|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/b/bb/Wikipedia_wordmark.svg/174px-Wikipedia_wordmark.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -4|1300475168.918358|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/b/bd/Bookshelf-40x201_6.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -5|1300475168.952307|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/8/8a/Wikinews-logo.png/35px-Wikinews-logo.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -6|1300475168.952296|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/4/4a/Wiktionary-logo-en-35px.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -7|1300475168.95482|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/f/fa/Wikiquote-logo.svg/35px-Wikiquote-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -8|1300475168.962687|CiyBAq1bBLNaTiTAc|141.142.220.118|35642|208.80.152.2|80|1|GET|meta.wikimedia.org|/images/wikimedia-button.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -9|1300475168.975934|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/f/fa/Wikibooks-logo.svg/35px-Wikibooks-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -10|1300475168.976436|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/d/df/Wikispecies-logo.svg/35px-Wikispecies-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -11|1300475168.979264|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/4/4c/Wikisource-logo.svg/35px-Wikisource-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -12|1300475169.014619|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/4/4a/Commons-logo.svg/35px-Commons-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -13|1300475169.014593|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/9/91/Wikiversity-logo.svg/35px-Wikiversity-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| -14|1300475169.014927|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/7/75/Wikimedia_Community_Logo.svg/35px-Wikimedia_Community_Logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||||||||||| +1|XXXXXXXXXX.XXXXXX|CUM0KZ3MLUfNB0cl11|141.142.220.118|48649|208.80.152.118|80|1|GET|bits.wikimedia.org|/skins-1.5/monobook/main.css|http://www.wikipedia.org/|1.1|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +2|XXXXXXXXXX.XXXXXX|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/6/63/Wikipedia-logo.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +3|XXXXXXXXXX.XXXXXX|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/b/bb/Wikipedia_wordmark.svg/174px-Wikipedia_wordmark.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +4|XXXXXXXXXX.XXXXXX|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/b/bd/Bookshelf-40x201_6.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +5|XXXXXXXXXX.XXXXXX|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/8/8a/Wikinews-logo.png/35px-Wikinews-logo.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +6|XXXXXXXXXX.XXXXXX|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/4/4a/Wiktionary-logo-en-35px.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +7|XXXXXXXXXX.XXXXXX|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|1|GET|upload.wikimedia.org|/wikipedia/commons/thumb/f/fa/Wikiquote-logo.svg/35px-Wikiquote-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +8|XXXXXXXXXX.XXXXXX|CiyBAq1bBLNaTiTAc|141.142.220.118|35642|208.80.152.2|80|1|GET|meta.wikimedia.org|/images/wikimedia-button.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +9|XXXXXXXXXX.XXXXXX|CwjjYJ2WqgTbAqiHl6|141.142.220.118|49997|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/f/fa/Wikibooks-logo.svg/35px-Wikibooks-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +10|XXXXXXXXXX.XXXXXX|C3eiCBGOLw3VtHfOj|141.142.220.118|49996|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/d/df/Wikispecies-logo.svg/35px-Wikispecies-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +11|XXXXXXXXXX.XXXXXX|Ck51lg1bScffFj34Ri|141.142.220.118|49998|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/4/4c/Wikisource-logo.svg/35px-Wikisource-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +12|XXXXXXXXXX.XXXXXX|CtxTCR2Yer0FR1tIBg|141.142.220.118|50000|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/4/4a/Commons-logo.svg/35px-Commons-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +13|XXXXXXXXXX.XXXXXX|CykQaM33ztNt0csB9a|141.142.220.118|49999|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/9/91/Wikiversity-logo.svg/35px-Wikiversity-logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| +14|XXXXXXXXXX.XXXXXX|CLNN1k2QMum1aexUK7|141.142.220.118|50001|208.80.152.3|80|2|GET|upload.wikimedia.org|/wikipedia/commons/thumb/7/75/Wikimedia_Community_Logo.svg/35px-Wikimedia_Community_Logo.svg.png|http://www.wikipedia.org/|1.0|Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15||0|0|304|Not Modified|||{}||||||||| (14 rows) diff --git a/tests/postgres/read-basic.zeek b/tests/postgres/read-basic.zeek index 911939b..112fc17 100644 --- a/tests/postgres/read-basic.zeek +++ b/tests/postgres/read-basic.zeek @@ -43,8 +43,8 @@ ALTER SEQUENCE ssh_id_seq OWNED BY ssh.id; ALTER TABLE ONLY ssh ALTER COLUMN id SET DEFAULT nextval('ssh_id_seq'::regclass); COPY ssh (id, b, i, e, c, p, sn, a, d, t, iv, s, sc, ss, se, vc, ve, f) FROM stdin; -1 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz {2,4,1,3} {CC,AA,BB} \N {10,20,30} \N SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} -2 t -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz {2,4,1,3} {"", "\\"", "{\\"\\"},\\"", "\\\\\\"\\\\{}", "NULL"} \N {10,20,30} \N SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} +1 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz {2,4,1,3} {CC,AA,BB} {} {10,20,30} {} SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} +2 t -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz {2,4,1,3} {"", "\\"", "{\\"\\"},\\"", "\\\\\\"\\\\{}", "NULL"} {} {10,20,30} {} SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} \. SELECT pg_catalog.setval('ssh_id_seq', 1, true); diff --git a/tests/postgres/read-no-real-array.zeek b/tests/postgres/read-no-real-array.zeek index 8758f9e..6d713e2 100644 --- a/tests/postgres/read-no-real-array.zeek +++ b/tests/postgres/read-no-real-array.zeek @@ -43,7 +43,7 @@ ALTER SEQUENCE ssh_id_seq OWNED BY ssh.id; ALTER TABLE ONLY ssh ALTER COLUMN id SET DEFAULT nextval('ssh_id_seq'::regclass); COPY ssh (id, b, i, e, c, p, sn, a, d, t, iv, s, sc, ss, se, vc, ve, f) FROM stdin; -1 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz 2,4,1,3 CC,AA,BB \N 10,20,30 \N SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} +1 t -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14000000000000012 1454444233.58016205 100 hurz 2,4,1,3 CC,AA,BB 10,20,30 SSHTest::foo\n{ \nif (0 < SSHTest::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n} \. SELECT pg_catalog.setval('ssh_id_seq', 1, true); diff --git a/tests/postgres/write-basic.zeek b/tests/postgres/write-basic.zeek index b4b62fc..d4263cc 100644 --- a/tests/postgres/write-basic.zeek +++ b/tests/postgres/write-basic.zeek @@ -5,7 +5,7 @@ # @TEST-EXEC: sleep 5 # @TEST-EXEC: createdb -p 7772 testdb # @TEST-EXEC: zeek %INPUT || true -# @TEST-EXEC: echo "select * from ssh" | psql -A -p 7772 testdb >ssh.out 2>&1 || true +# @TEST-EXEC: echo "copy ssh to stdout" | psql -A -p 7772 testdb >ssh.out 2>&1 || true # TEST-EXEC: pg_dump -p 7772 -a testdb > ssh.out 2>&1 || true # @TEST-EXEC: pg_ctl stop -D postgres -m fast # @TEST-EXEC: btest-diff ssh.out