From 6a231ad2b2b1df0ebcf0d3cc6a27c2a674b17b0e Mon Sep 17 00:00:00 2001
From: Scott Poore <spoore@redhat.com>
Date: Wed, 10 Jul 2024 15:09:32 -0500
Subject: [PATCH 1/2] Workaround github container build error

The github action building the fedora container with podman is hitting
an error that looks like:

error running container: error from /usr/bin/crun creating container for
[...]: sd-bus call: Transport endpoint is not connected

This requires a workaround to set XDG_RUNTIME_DIR to empty.
---
 .github/workflows/intg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/intg.yml b/.github/workflows/intg.yml
index ee890d7..988bae8 100644
--- a/.github/workflows/intg.yml
+++ b/.github/workflows/intg.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build the Docker image
-      run: sudo podman build . --file Dockerfile.fedora --tag ${IMAGE}
+      run: sudo -E XDG_RUNTIME_DIR= podman build . --file Dockerfile.fedora --tag ${IMAGE}
     - name: Run the container
       run: sudo podman run --privileged --security-opt seccomp=unconfined --detach -p 80:80 --name=${CONTAINER} ${IMAGE}
     - name: Check the container is up

From a948ed11dce9b362065ac8c1805f6fb7e499c32d Mon Sep 17 00:00:00 2001
From: Scott Poore <spoore@redhat.com>
Date: Mon, 8 Jul 2024 10:31:37 -0500
Subject: [PATCH 2/2] test_session_record_pipe_io_stdin: remove sshpass

Removing reliance on sshpass by adding code in setup to generate an
ssh key and use it in the test code.
---
 lib/tlitest/test_tlog_rec_session.py | 12 ++++++++----
 src/tlitest/tlitest-setup            | 10 +++++++++-
 src/tlitest/tlitest-teardown         |  5 +++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/tlitest/test_tlog_rec_session.py b/lib/tlitest/test_tlog_rec_session.py
index eba34d8..0154b40 100644
--- a/lib/tlitest/test_tlog_rec_session.py
+++ b/lib/tlitest/test_tlog_rec_session.py
@@ -217,10 +217,14 @@ def test_session_record_pipe_io_stdin(self):
         """
         text_in_stdio = 'print("hello world")\n'
         text_out = "hello world"
-        p = Popen(['sshpass', '-p', 'Secret123', 'ssh', '-o',
-                   'StrictHostKeyChecking=no',
-                   'tlitestlocaluser2@localhost', 'python3'],
-        stdout=PIPE, stdin=PIPE, stderr=PIPE, encoding='utf8')
+
+        sessionclass = TlogRecSessionConfig(writer="syslog")
+        sessionclass.generate_config(SYSTEM_TLOG_REC_SESSION_CONF)
+
+        p = Popen(['ssh', '-i', f'~/.ssh/id_rsa_{self.user}',
+                   '-o', 'StrictHostKeyChecking=no',
+                   f'{self.user}@localhost', 'python3'],
+                  stdout=PIPE, stdin=PIPE, stderr=PIPE, encoding='utf8')
         stdout_data = p.communicate(input=text_in_stdio)[0]
         assert text_out in stdout_data
 
diff --git a/src/tlitest/tlitest-setup b/src/tlitest/tlitest-setup
index 3749b95..7250a22 100755
--- a/src/tlitest/tlitest-setup
+++ b/src/tlitest/tlitest-setup
@@ -8,7 +8,6 @@ python3-pytest
 python3-pexpect
 python3-systemd
 tcsh
-sshpass
 "
 
 [[ -z "${CONTAINER_ENV}" ]] && PKGS+="tlog"
@@ -61,3 +60,12 @@ echo "%wheel        ALL=(ALL)       NOPASSWD: ALL" > \
 usermod tlitestlocaladmin1 -aG wheel,systemd-journal
 usermod tlitestlocaluser1 -aG systemd-journal
 usermod tlitestlocaluser2 -s /usr/bin/tlog-rec-session
+
+# Generate ssh key for testing
+user="tlitestlocaluser2"
+rm -rf ~/.ssh/id_rsa_${user}*
+ssh-keygen -t rsa -b 2048 -N "" -C stdin_test -f ~/.ssh/id_rsa_${user}
+user_dir=$(eval echo "~${user}")
+mkdir -p ${user_dir}/.ssh
+cat ~/.ssh/id_rsa_${user}.pub >> ${user_dir}/.ssh/authorized_keys
+chown -R ${user}:${user} ${user_dir}/.ssh
diff --git a/src/tlitest/tlitest-teardown b/src/tlitest/tlitest-teardown
index aa0fa8a..bc8397a 100755
--- a/src/tlitest/tlitest-teardown
+++ b/src/tlitest/tlitest-teardown
@@ -48,3 +48,8 @@ if [ -f /etc/sudoers.d/01_wheel_nopass_tlitest ]; then
     echo "Found test sudoers file...removing"
     rm /etc/sudoers.d/01_wheel_nopass_tlitest
 fi
+
+user="tlitestlocaluser2"
+if [ -f ~/.ssh/id_rsa_${user} ]; then
+    rm -rf ~/.ssh/id_rsa_${user}*
+fi