From d3f176594dadf16c6271c372e7fbcfccf72eb38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Mon, 2 Sep 2019 13:22:02 +0200
Subject: [PATCH 1/2] Add test scenarios for rsyslog_remote_tls

This rule uses a complex regular expression so it might be beneficial
to cover the rule by few test scenarios.
---
 .../tests/correct_multiline.pass.sh                 | 12 ++++++++++++
 .../tests/correct_singleline.pass.sh                |  6 ++++++
 .../rsyslog_remote_tls/tests/missing_option.fail.sh | 12 ++++++++++++
 .../tests/wrong_multiline.fail.sh                   | 13 +++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
 create mode 100644 linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
 create mode 100644 linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
 create mode 100644 linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh

diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
new file mode 100644
index 00000000000..2e729cc0647
--- /dev/null
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# profiles = xccdf_org.ssgproject.content_profile_ospp
+
+cat >> /etc/rsyslog.conf <<EOF
+action(type="omfwd"
+       protocol="tcp"
+       Target="remote.system.com"
+       port="6514"
+       StreamDriver="gtls"
+       StreamDriverMode="1"
+       StreamDriverAuthMode="x509/name")
+EOF
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
new file mode 100644
index 00000000000..ca5bd5e99c8
--- /dev/null
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# profiles = xccdf_org.ssgproject.content_profile_ospp
+
+cat >> /etc/rsyslog.conf <<EOF
+action(type="omfwd" protocol="tcp" Target="remote.system.com" port="6514" StreamDriver="gtls" StreamDriverMode="1" StreamDriverAuthMode="x509/name")
+EOF
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
new file mode 100644
index 00000000000..48670370dd3
--- /dev/null
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# profiles = xccdf_org.ssgproject.content_profile_ospp
+# remediation = none
+
+cat >> /etc/rsyslog.conf <<EOF
+action(type="omfwd"
+       protocol="tcp"
+       Target="remote.system.com"
+       port="6514"
+       StreamDriver="gtls"
+       StreamDriverMode="1")
+EOF
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh
new file mode 100644
index 00000000000..7fc3c327ab4
--- /dev/null
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# profiles = xccdf_org.ssgproject.content_profile_ospp
+# remediation = none
+
+cat >> /etc/rsyslog.conf <<EOF
+action(type="omfwd"
+       protocol="tcp"
+       Target="remote.system.com"
+       port="6514"
+       StreamDriver="ptcp"
+       StreamDriverMode="1"
+       StreamDriverAuthMode="x509/name")
+EOF

From eb329a0fbdf4f75ca57e7777a28c702fc80ba83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Thu, 5 Sep 2019 10:41:11 +0200
Subject: [PATCH 2/2] Remove profile IDs from the scenarios headers

When the profile keyword isn't specified in the header
the test harness will use the virtual (all) profile.
---
 .../rsyslog_remote_tls/tests/correct_multiline.pass.sh           | 1 -
 .../rsyslog_remote_tls/tests/correct_singleline.pass.sh          | 1 -
 .../rsyslog_remote_tls/tests/missing_option.fail.sh              | 1 -
 .../rsyslog_remote_tls/tests/wrong_multiline.fail.sh             | 1 -
 4 files changed, 4 deletions(-)

diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
index 2e729cc0647..56a3bff783e 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_multiline.pass.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# profiles = xccdf_org.ssgproject.content_profile_ospp
 
 cat >> /etc/rsyslog.conf <<EOF
 action(type="omfwd"
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
index ca5bd5e99c8..b35fc09add9 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/correct_singleline.pass.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# profiles = xccdf_org.ssgproject.content_profile_ospp
 
 cat >> /etc/rsyslog.conf <<EOF
 action(type="omfwd" protocol="tcp" Target="remote.system.com" port="6514" StreamDriver="gtls" StreamDriverMode="1" StreamDriverAuthMode="x509/name")
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
index 48670370dd3..35c69e4a7c3 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/missing_option.fail.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# profiles = xccdf_org.ssgproject.content_profile_ospp
 # remediation = none
 
 cat >> /etc/rsyslog.conf <<EOF
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh
index 7fc3c327ab4..59c3f7adb8d 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/wrong_multiline.fail.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# profiles = xccdf_org.ssgproject.content_profile_ospp
 # remediation = none
 
 cat >> /etc/rsyslog.conf <<EOF