]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Ensure OPENSSL_CONF is a file if it exists
authorNicki Křížek <nicki@isc.org>
Mon, 6 May 2024 16:04:46 +0000 (18:04 +0200)
committerNicki Křížek <nicki@isc.org>
Thu, 9 May 2024 15:08:11 +0000 (17:08 +0200)
Prevent unexpected behavior in cases where the OPENSSL_CONF path would
exist, but it wouldn't point to a file.

bin/tests/system/isctest/vars/openssl.py

index 9ad20209384761a4c878c74d80c2f013adbd8340..5df12b7247250ebfd83a18d2f062acbe7ac9320e 100644 (file)
@@ -25,12 +25,13 @@ OPENSSL_VARS = {
 
 
 def parse_openssl_config(path: Optional[str]):
-    if path is None or not os.path.isfile(path):
+    if path is None or not os.path.exists(path):
         OPENSSL_VARS["ENGINE_ARG"] = None
         OPENSSL_VARS["SOFTHSM2_MODULE"] = None
         os.environ.pop("ENGINE_ARG", None)
         os.environ.pop("SOFTHSM2_MODULE", None)
         return
+    assert os.path.isfile(path), f"{path} exists, but it's not a file"
 
     regex = re.compile(r"([^=]+)=(.*)")
     log.debug(f"parsing openssl config: {path}")