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

Add changelog

Browse source
This commit is contained in:
Shane Lee 2024-01-30 15:38:33 -07:00 • committed by Pedro Algarvio
parent 6645801eee
commit 4157fe7ed0
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/65954.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo

1
salt/utils/rsax931.py
View file

@ -2,7 +2,6 @@
Create and verify ANSI X9.31 RSA signatures using OpenSSL libcrypto
"""
import ctypes.util
import glob
import os

26
tests/pytests/unit/utils/test_rsax931.py
View file

@ -1,7 +1,6 @@
"""
Test the RSA ANSI X9.31 signer and verifier
"""
import ctypes
import ctypes.util
import fnmatch
@ -19,7 +18,7 @@ from salt.utils.rsax931 import (
_find_libcrypto,
_load_libcrypto,
)
from tests.support.mock import patch, MagicMock
from tests.support.mock import patch
@pytest.fixture
@ -215,6 +214,7 @@ def test_find_libcrypto_darwin_catalina():
assert "/usr/lib/libcrypto.44.dylib" == lib_path
@pytest.mark.skip_unless_on_darwin
def test_find_libcrypto_darwin_pip_install():
"""
Test _find_libcrypto on a macOS host where there salt has been installed
@ -223,15 +223,17 @@ def test_find_libcrypto_darwin_pip_install():
bin_path = "/Library/Frameworks/Python.framework/Versions/3.10/bin/python3.10"
expected = "/Library/Frameworks/Python.framework/Versions/3.10/lib/libcrypto.dylib"
glob_effect = ([], [], ["yay"], [], [], [], [])
with patch("salt.utils.platform.is_darwin", lambda: True),\
patch("sys.executable", bin_path),\
patch("os.path.islink", return_value=False),\
patch.object(glob, "glob", side_effect=glob_effect) as mock_glob:
with patch("salt.utils.platform.is_darwin", lambda: True), patch(
"sys.executable", bin_path
), patch("os.path.islink", return_value=False), patch.object(
glob, "glob", side_effect=glob_effect
) as mock_glob:
lib_path = _find_libcrypto()
assert lib_path == "yay"
mock_glob.assert_any_call(expected)
@pytest.mark.skip_unless_on_darwin
def test_find_libcrypto_darwin_pip_install_venv():
"""
Test _find_libcrypto on a macOS host where there salt has been installed
@ -241,11 +243,13 @@ def test_find_libcrypto_darwin_pip_install_venv():
lnk_path = "/Users/bill/src/salt/venv/bin/python"
expected = "/Library/Frameworks/Python.framework/Versions/3.10/lib/libcrypto.dylib"
glob_effect = ([], [], ["yay"], [], [], [], [])
with patch("salt.utils.platform.is_darwin", lambda: True), \
patch("sys.executable", lnk_path), \
patch("os.path.islink", return_value=True), \
patch("os.path.realpath", return_value=src_path), \
patch.object(glob, "glob", side_effect=glob_effect) as mock_glob:
with patch("salt.utils.platform.is_darwin", lambda: True), patch(
"sys.executable", lnk_path
), patch("os.path.islink", return_value=True), patch(
"os.path.realpath", return_value=src_path
), patch.object(
glob, "glob", side_effect=glob_effect
) as mock_glob:
lib_path = _find_libcrypto()
assert lib_path == "yay"
mock_glob.assert_any_call(expected)