saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't leave any gpg-agent's running behind

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-03-25 11:01:24 +00:00 • committed by Pedro Algarvio
parent b1aaa1e007
commit b5912dd349
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.pylintrc
View file

@ -684,6 +684,7 @@ allowed-3rd-party-modules=msgpack,
setuptools,
pytestsalt,
saltfactories,
psutil,
distro,
os,
re,

36
tests/pytests/unit/modules/test_gpg.py
View file

@ -4,9 +4,12 @@
"""
import datetime
import shutil
import subprocess
import time
import types
import psutil
import pytest
import salt.modules.gpg as gpg
from salt.exceptions import SaltInvocationError
@ -157,7 +160,38 @@ def gpghome(tmp_path):
pub.write_text(GPG_TEST_PUB_KEY)
priv = root / "gpgfile.priv"
priv.write_text(GPG_TEST_PRIV_KEY)
return types.SimpleNamespace(path=root, pub=pub, priv=priv)
try:
yield types.SimpleNamespace(path=root, pub=pub, priv=priv)
finally:
# Make sure we don't leave any gpg-agent's running behind
gpg_connect_agent = shutil.which("gpg-connect-agent")
if gpg_connect_agent:
gnupghome = root / ".gnupg"
if not gnupghome.is_dir():
gnupghome = root
try:
subprocess.run(
[gpg_connect_agent, "killagent", "/bye"],
env={"GNUPGHOME": str(gnupghome)},
shell=False,
check=True,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
)
except subprocess.CalledProcessError:
# This is likely CentOS 7 or Amazon Linux 2
pass
# If the above errored or was not enough, as a last resort, let's check
# the running processes.
for proc in psutil.process_iter():
try:
if "gpg-agent" in proc.name():
for arg in proc.cmdline():
if str(root) in arg:
proc.terminate()
except Exception: # pylint: disable=broad-except
pass
@pytest.fixture