SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add environment variable SSH_PRIVATE_KEY_FILE

Browse Source 
Additionally to the variable SSH_PRIVATE_KEY, which can be used to
reference a private key saved as a string within a variable (the previous
documentation falsely stated, that it references a path and has been
adjusted), the new variable SSH_PRIVATE_KEY_FILE can now be used to reference
the path to a file containing the private key.

Signed-off-by: Jasper Orschulko <jasper@fancydomain.eu>
[Jan: Fix logic for detecting set env vars]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jasper Orschulko
2021-07-03 23:35:40 +02:00
committed by Jan Kiszka
parent 4d2b16e04d
commit 15de0142d4
3 changed files with 105 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kas/libcmds.py
View File

@@ -50,7 +50,8 @@ class Macro:
SetupDir(),
]
if 'SSH_PRIVATE_KEY' in os.environ:
if ('SSH_PRIVATE_KEY' in os.environ
or 'SSH_PRIVATE_KEY_FILE' in os.environ):
self.setup_commands.append(SetupSSHAgent())
self.setup_commands += [
@@ -65,7 +66,9 @@ class Macro:
else:
self.setup_commands = []
if use_common_cleanup and 'SSH_PRIVATE_KEY' in os.environ:
if (use_common_cleanup
and ('SSH_PRIVATE_KEY' in os.environ
or 'SSH_PRIVATE_KEY_FILE' in os.environ)):
self.cleanup_commands = [
CleanupSSHAgent(),
]