Add ssh keygen directly to the test

RedHat-SP-Security/keylime-tests#403
RedHat-SP-Security · Aug 30, 2023 · 8e18d14 · 8e18d14
1 parent 238edaf
commit 8e18d14
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/functional/basic-attestation-on-containers/test.sh b/functional/basic-attestation-on-containers/test.sh
@@ -23,6 +23,11 @@ rlJournalStart
         #create network for containers
         rlRun "limeconCreateNetwork ${CONT_NETWORK_NAME} 172.18.0.0/16"
 
+        #preparation for ssh access
+        rlRun "rlFileBackup --clean ~/.ssh/"
+	    rlRun 'ls /root/.ssh/id_*.pub &>/dev/null || ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa'
+        rlRun "cp /root/.ssh/id_*.pub ."
+
         #build verifier container
         TAG_ATTESTATION_SERVER="keylime_server_image"
         rlRun "limeconPrepareImage ${limeLibraryDir}/${DOCKERFILE_SYSTEMD} ${TAG_ATTESTATION_SERVER}"
@@ -90,6 +95,7 @@ EOF"
         limeSubmitCommonLogs
         limeClearData
         limeRestoreConfig
+        rlRun "rlFileRestore"
     rlPhaseEnd
 
 rlJournalEnd

diff --git a/functional/basic-attestation-with-custom-certificates/test.sh b/functional/basic-attestation-with-custom-certificates/test.sh
@@ -61,6 +61,11 @@ rlJournalStart
         # assign cert ownership to keylime user if it exists
         id keylime && rlRun "chown -R keylime:keylime $CERTDIR"
 
+        rlRun "rlFileBackup --clean ~/.ssh/"
+        #preparation for ssh access
+        rlRun 'ls /root/.ssh/id_*.pub &>/dev/null || ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa'
+        rlRun "cp /root/.ssh/id_*.pub ."
+
         #build verifier container
         TAG_ATTESTATION_SERVER="keylime_server_image"
         rlRun "limeconPrepareImage ${limeLibraryDir}/${DOCKERFILE_SYSTEMD} ${TAG_ATTESTATION_SERVER}"
@@ -146,6 +151,7 @@ EOF"
         limeSubmitCommonLogs
         limeClearData
         limeRestoreConfig
+        rlRun "rlFileRestore"
     rlPhaseEnd
 
 rlJournalEnd

diff --git a/functional/basic-attestation-with-postgresql-db/test.sh b/functional/basic-attestation-with-postgresql-db/test.sh
@@ -36,6 +36,11 @@ rlJournalStart
         #create network for containers
         rlRun "limeconCreateNetwork ${CONT_NETWORK_NAME} 172.18.0.0/16"
 
+        rlRun "rlFileBackup --clean ~/.ssh/"
+        #preparation for ssh access
+        rlRun 'ls /root/.ssh/id_*.pub &>/dev/null || ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa'
+        rlRun "cp /root/.ssh/id_*.pub ."
+
         #build verifier container
         TAG_ATTESTATION_SERVER="keylime_server_image"
         rlRun "limeconPrepareImage ${limeLibraryDir}/${DOCKERFILE_SYSTEMD} ${TAG_ATTESTATION_SERVER}"
@@ -112,7 +117,7 @@ EOF"
         limeClearData
         limeRestoreConfig
 	rlServiceStop postgresql
-        rlFileRestore
+        rlRun "rlFileRestore"
 	rlServiceRestore postgresql
     rlPhaseEnd