From: Juliana Fajardini Date: Wed, 7 Sep 2022 19:11:44 +0000 (-0300) Subject: tests/pgsql: adjust to new startup message format X-Git-Tag: suricata-6.0.9~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f3d1fd7915702bdea92d637d760a3ba51b35c49;p=thirdparty%2Fsuricata-verify.git tests/pgsql: adjust to new startup message format With the pgsql improving, we made database an optional parameter (as it is, according to the documentation). Then the tests had to be updated. --- diff --git a/tests/pgsql/pgsql-5000-query-results/test.yaml b/tests/pgsql/pgsql-5000-query-results/test.yaml index af445d8d0..a9eac58f1 100644 --- a/tests/pgsql/pgsql-5000-query-results/test.yaml +++ b/tests/pgsql/pgsql-5000-query-results/test.yaml @@ -1,6 +1,6 @@ requires: # Pgsql was released on version 7.0 - min-version: 7.0 + min-version: 7.0 args: - -k none @@ -29,9 +29,9 @@ checks: event_type: pgsql pcap_cnt: 25 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: rules - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: rules + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: rules pgsql.response.authentication_md5_password: Z\xdc\xfdf pgsql.tx_id: 2 @@ -47,9 +47,9 @@ checks: event_type: pgsql pcap_cnt: 11 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: rules - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: rules + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: rules pgsql.response.authentication_md5_password: "\\xcaT\r'" pgsql.tx_id: 2 diff --git a/tests/pgsql/pgsql-pwd-output-disabled/test.yaml b/tests/pgsql/pgsql-pwd-output-disabled/test.yaml index 1cc162d7f..051101383 100644 --- a/tests/pgsql/pgsql-pwd-output-disabled/test.yaml +++ b/tests/pgsql/pgsql-pwd-output-disabled/test.yaml @@ -1,6 +1,6 @@ requires: # Pgsql was released on version 7.0 - min-version: 7.0 + min-version: 7.0 args: - -k none @@ -27,9 +27,9 @@ checks: event_type: pgsql pcap_cnt: 9 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: Test - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: Test + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: ju-Test pgsql.response.message: authentication_cleartext_password pgsql.tx_id: 2 diff --git a/tests/pgsql/pgsql-simple-query-rollback/test.yaml b/tests/pgsql/pgsql-simple-query-rollback/test.yaml index 5fb2c4d3a..d423a87c7 100644 --- a/tests/pgsql/pgsql-simple-query-rollback/test.yaml +++ b/tests/pgsql/pgsql-simple-query-rollback/test.yaml @@ -27,9 +27,9 @@ checks: event_type: pgsql pcap_cnt: 9 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: Test - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: Test + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: ju-Test pgsql.response.message: authentication_sasl pgsql.tx_id: 2 diff --git a/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml b/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml index 644d9c004..6a96de1c0 100644 --- a/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml +++ b/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml @@ -1,6 +1,6 @@ requires: # Pgsql was released on version 7.0 - min-version: 7.0 + min-version: 7.0 args: - -k none @@ -29,9 +29,9 @@ checks: event_type: pgsql pcap_cnt: 11 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: indexer - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: indexer + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: indexer pgsql.response.authentication_md5_password: \x88'N5 pgsql.tx_id: 2 @@ -61,9 +61,9 @@ checks: event_type: pgsql pcap_cnt: 25 pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: indexer - pgsql.request.startup_parameters.optional_parameters[0].application_name: psql - pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8 + pgsql.request.startup_parameters.optional_parameters[0].database: indexer + pgsql.request.startup_parameters.optional_parameters[1].application_name: psql + pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8 pgsql.request.startup_parameters.user: indexer pgsql.response.authentication_md5_password: "\\x9fi\x1A\\x8e" pgsql.tx_id: 2 diff --git a/tests/pgsql/pgsql-upgrade-tls/test.yaml b/tests/pgsql/pgsql-upgrade-tls/test.yaml index 955d13b80..b0fd4e20a 100644 --- a/tests/pgsql/pgsql-upgrade-tls/test.yaml +++ b/tests/pgsql/pgsql-upgrade-tls/test.yaml @@ -70,9 +70,9 @@ checks: src_port: 60359 event_type: pgsql pgsql.request.protocol_version: '3.0' - pgsql.request.startup_parameters.database: replication - pgsql.request.startup_parameters.optional_parameters[0].replication: 'true' - pgsql.request.startup_parameters.optional_parameters[1].application_name: walreceiver + pgsql.request.startup_parameters.optional_parameters[0].database: replication + pgsql.request.startup_parameters.optional_parameters[1].replication: 'true' + pgsql.request.startup_parameters.optional_parameters[2].application_name: walreceiver pgsql.request.startup_parameters.user: rep pgsql.response.code: '28000' pgsql.response.file: auth.c