Add mmleefparse module to base package

Resolves: rhbz#2404131
imjournal open error handling fix
Resolves: rhbz#2375742

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -61,3 +61,45 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.38.0.tar.gz
 /rsyslog-8.39.0.tar.gz
 /rsyslog-doc-8.39.0.tar.gz
+/rsyslog-8.1904.0.tar.gz
+/rsyslog-doc-8.1904.0.tar.gz
+/rsyslog-8.1907.0.tar.gz
+/rsyslog-doc-8.1907.0.tar.gz
+/rsyslog-8.1910.0.tar.gz
+/rsyslog-doc-8.1910.0.tar.gz
+/rsyslog-8.1911.0.tar.gz
+/rsyslog-doc-8.1911.0.tar.gz
+/rsyslog-8.2001.0.tar.gz
+/rsyslog-doc-8.2001.0.tar.gz
+/rsyslog-8.2002.0.tar.gz
+/rsyslog-doc-8.2002.0.tar.gz
+/rsyslog-8.2008.0.tar.gz
+/rsyslog-doc-8.2008.0.tar.gz
+/rsyslog-8.2010.0.tar.gz
+/rsyslog-doc-8.2010.0.tar.gz
+/qpid-proton-0.31.0.tar.gz
+/rsyslog-8.2102.0.tar.gz
+/rsyslog-doc-8.2102.0.tar.gz
+/qpid-proton-0.34.0.tar.gz
+/rsyslog-8.2204.0.tar.gz
+/rsyslog-doc-8.2204.0.tar.gz
+/rsyslog-8.2210.0.tar.gz
+/rsyslog-doc-8.2210.0.tar.gz
+/rsyslog-8.2306.0.tar.gz
+/rsyslog-doc-8.2306.0.tar.gz
+/rsyslog-8.2308.0.tar.gz
+/rsyslog-doc-8.2308.0.tar.gz
+/qpid-proton-0.39.0.tar.gz
+/rsyslog-8.2310.0.tar.gz
+/rsyslog-doc-8.2310.0.tar.gz
+/rsyslog-8.2312.0.tar.gz
+/rsyslog-doc-8.2312.0.tar.gz
+/rsyslog-8.2408.0.tar.gz
+/rsyslog-doc-8.2408.0.tar.gz
+/rsyslog-8.2412.0.tar.gz
+/rsyslog-doc-8.2412.0.tar.gz
+/rsyslog-8.2506.0.tar.gz
+/rsyslog-doc-8.2506.0.tar.gz
+/rsyslog-8.2508.0.tar.gz
+/qpid-proton-0.40.0.tar.gz
+/rsyslog-8.2510.0.tar.gz

plans/main.fmf

@@ -0,0 +1,6 @@
+summary: Run all tests
+execute:
+  how: tmt
+discover:
+  how: fmf
+

rsyslog-8.34.0-sd-service.patch

@@ -1,14 +0,0 @@
-diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in
---- rsyslog-7.4.1/rsyslog.service.in.orig	2013-06-17 15:28:54.430023493 +0200
-+++ rsyslog-7.4.1/rsyslog.service.in	2013-06-17 15:30:05.874378084 +0200
-@@ -6,7 +6,9 @@ Requires=syslog.socket
- 
- [Service]
- Type=notify
--ExecStart=@sbindir@/rsyslogd -n -iNONE
-+EnvironmentFile=-/etc/sysconfig/rsyslog
-+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
-+UMask=0066
- StandardOutput=null
- Restart=on-failure
- 

rsyslog.conf

@@ -9,19 +9,22 @@
 # Where to place auxiliary files
 global(workDirectory="/var/lib/rsyslog")
 
+#### MODULES ####
+
 # Use default timestamp format
 module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat")
 
+module(load="imuxsock"    # provides support for local system logging (e.g. via logger command)
+       SysSock.Use="off") # Turn off message reception via local log socket; 
+                          # local messages are retrieved through imjournal now.
+module(load="imjournal"             # provides access to the systemd journal
+       FileCreateMode="0600"        # Quiet warning and ensure privacy
+       UsePid="system" # PID nummber is retrieved as the ID of the process the journal entry originates from
+       StateFile="imjournal.state") # File to store the position in the journal
+
 # Include all config files in /etc/rsyslog.d/
 include(file="/etc/rsyslog.d/*.conf" mode="optional")
 
-#### MODULES ####
-
-module(load="imuxsock" 	  # provides support for local system logging (e.g. via logger command)
-       SysSock.Use="off") # Turn off message reception via local log socket; 
-			  # local messages are retrieved through imjournal now.
-module(load="imjournal" 	    # provides access to the systemd journal
-       StateFile="imjournal.state") # File to store the position in the journal
 #module(load="imklog") # reads kernel messages (the same are read from journald)
 #module(load="immark") # provides --MARK-- message capability
 

rsyslog.log

@@ -7,6 +7,6 @@
     missingok
     sharedscripts
     postrotate
-        /usr/bin/systemctl kill -s HUP rsyslog.service >/dev/null 2>&1 || true
+        /usr/bin/systemctl reload rsyslog.service >/dev/null 2>&1 || true
     endscript
 }

rsyslog.service

@@ -0,0 +1,37 @@
+[Unit]
+Description=System Logging Service
+;Requires=syslog.socket
+Documentation=man:rsyslogd(8)
+Documentation=https://www.rsyslog.com/doc/
+Wants=network.target network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=notify
+EnvironmentFile=-/etc/sysconfig/rsyslog
+ExecStart=/usr/sbin/rsyslogd -n $SYSLOGD_OPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
+UMask=0066
+StandardOutput=null
+Restart=on-failure
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+RestrictNamespaces=net
+NoNewPrivileges=yes
+ProtectControlGroups=yes
+ProtectHome=read-only
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+RestrictSUIDSGID=yes
+SystemCallArchitectures=native
+SystemCallFilter=~@clock @debug @module @raw-io @reboot @swap @cpu-emulation @obsolete
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+
+
+# Increase the default a bit in order to allow many simultaneous
+# files to be monitored, we might need a lot of fds.
+LimitNOFILE=16384
+
+[Install]
+WantedBy=multi-user.target
+;Alias=syslog.service

sources

@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.39.0.tar.gz) = f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
-SHA512 (rsyslog-doc-8.39.0.tar.gz) = a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
+SHA512 (rsyslog-8.2510.0.tar.gz) = d2e693fd8c7112e4ccc36ea6fbb19909df885e7cb2778e95c04b7c5e9db8240224decfee52308a46865b7deffcf1e31ade0104c90d84b768a4dece15e5ea190e
+SHA512 (qpid-proton-0.40.0.tar.gz) = 3e7fe56ca1423f45f71d81f5e1d6ec5f21c073cc580628e12a8dbd545a86805b7312834e0d1234dde43797633d575ed639f21a96239b217500cc0a824482aae3

tests/got-audit/got-audit.gdb

@@ -0,0 +1,2 @@
+gef config gef.disable_color True
+got-audit --all

tests/got-audit/main.fmf

@@ -0,0 +1,10 @@
+summary: Audit the GOT for signs of tampering
+description: |
+  Pointers in the server process GOT will be checked to ensure that
+  each function pointer's value is within a shared object file
+  that exports a symbol of that name, and that no shared object
+  files export conflicting symbols.
+contact: Gordon Messmer <gordon.messmer@gmail.com>
+require+:
+  - gdb-gef           # needed to test got-audit
+

tests/got-audit/runtest.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/rsyslog/Sanity/got-audit
+#   Description: Check pointers in the server process GOT for signs of tampering
+#   Author: Gordon Messmer <gordon.messmer@gmail.com>
+#
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlServiceStart rsyslog
+        rlRun "TestDir=\$(pwd)"
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+        rlRun "auditfile=\$(mktemp --tmpdir=${TmpDir})"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Run GEF got-audit"
+        rlRun "SERVICE_PID=\$( systemctl show --property=MainPID rsyslog.service | cut -f2 -d= )"
+        rlRun "echo SERVICE_PID is '$SERVICE_PID'"
+        [ -n "$SERVICE_PID" ] || rlFail "No service pid was found"
+        rlRun "gdb-gef --pid '$SERVICE_PID' --command='$TestDir'/got-audit.gdb --batch > '$auditfile'"
+        # Basic test: ensure that at least one symbol is found in libc.so,
+        #  to verify that the report looks plausible.
+        rlAssertGrep " : /.*/libc.so" "$auditfile"
+        # Ensure the got-audit did not report any errors
+        rlAssertNotGrep " :: ERROR" "$auditfile"
+        rlRun "cp '$auditfile' '$TMT_TEST_DATA'/got-audit.txt"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlServiceRestore rsyslog
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/main.fmf

@@ -0,0 +1,2 @@
+test: ./runtest.sh
+framework: beakerlib