merge conf{

ObedAmpahECS · ObedAmpahECS · commit f7066a94b417 · 2026-03-02T12:20:45.000-08:00
diff --git a/.github/workflows/get_opa_hash.yml b/.github/workflows/get_opa_hash.yml
@@ -7,7 +7,7 @@ jobs:
       contents: write
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: repo
         ref: main
diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml
@@ -10,11 +10,11 @@ jobs:
     name: Build distrbution
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.x"
         cache: "pip"
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python-version: ["3.13"]
+        python-version: ["3.14"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
diff --git a/.github/workflows/run_link_checker_cron_job.yml b/.github/workflows/run_link_checker_cron_job.yml
@@ -11,7 +11,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: tcort/github-action-markdown-link-check@v1
       with:
         config-file: 'mlc_config.json'
diff --git a/.github/workflows/run_link_checker_for_md_edits.yml b/.github/workflows/run_link_checker_for_md_edits.yml
@@ -7,7 +7,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: tcort/github-action-markdown-link-check@v1
       with:
         base-branch: 'main'
diff --git a/.github/workflows/run_opa_tests.yml b/.github/workflows/run_opa_tests.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup OPA
       uses: open-policy-agent/setup-opa@v2
diff --git a/.github/workflows/run_release.yml b/.github/workflows/run_release.yml
@@ -16,7 +16,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: tcort/github-action-markdown-link-check@v1
       with:
         base-branch: 'main'
@@ -33,9 +33,9 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Install Python dependencies
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -118,6 +118,7 @@ jobs:
           opa-version: ${{ needs.configuration.outputs.opa-version }}
           python-version: ${{ matrix.python-version }}
 
+<<<<<<< HEAD
       - name: Install Pytest Coverage dependencies
         run: |
           pip install pytest pytest-cov
@@ -126,6 +127,8 @@ jobs:
         run: |
           python -m pip install .
 
+=======
+>>>>>>> 299903ff48b3046c8c15f95f491061c10d1b5bf8
       - name: Run ScubaGoggles and check for correct output (macos-latest)
         if: ${{ matrix.operating-system == 'macos-latest'}}
         id: mac-path
@@ -176,6 +179,7 @@ jobs:
         with:
           path: /home/runner/scubagoggles
           key: ${{ runner.os }}-baseline-${{ steps.linux-path.outputs.cachepath }}
+<<<<<<< HEAD
 
       - name: Pytest Coverage Repository
         run: |
@@ -191,6 +195,8 @@ jobs:
         uses: pypa/gh-action-pip-audit@v1.1.0
         with:
           inputs: requirements.txt
+=======
+>>>>>>> 299903ff48b3046c8c15f95f491061c10d1b5bf8
 
   lhci:
     runs-on: ubuntu-latest
diff --git a/docs/installation/DownloadAndInstall.md b/docs/installation/DownloadAndInstall.md
@@ -19,7 +19,7 @@ Each of the above steps is detailed in the following sections.
 
 ## Installing Python 3
 
-Running ScubaGoggles requires Python 3.9 or higher.  If Python is not installed
+Running ScubaGoggles requires Python 3.10 or higher.  If Python is not installed
 in your environment, please visit the [Python website](https://www.python.org/)
 for instructions on how to download and install Python.
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,11 +8,11 @@ dynamic = ["version"]
 classifiers = ["Development Status :: 4 - Beta",
                "Intended Audience :: Information Technology",
                "Topic :: Security",
-               "Programming Language :: Python :: 3.9",
                "Programming Language :: Python :: 3.10",
                "Programming Language :: Python :: 3.11",
                "Programming Language :: Python :: 3.12",
-               "Programming Language :: Python :: 3.13"]
+               "Programming Language :: Python :: 3.13",
+               "Programming Language :: Python :: 3.14"]
 dependencies = ["dnspython>=2.6.1",
                 "google-api-python-client>=2.142.0",
                 "google-auth-httplib2>=0.2.0",
@@ -21,7 +21,7 @@ dependencies = ["dnspython>=2.6.1",
                 "pyyaml>=6.0.2",
                 "requests>=2.32.3",
                 "tqdm>=4.66.5"]
-requires-python = ">= 3.9"
+requires-python = ">= 3.10"
 description='SCuBA security baseline assessment tool'
 authors = [{name = "CISA"}]
 license = "CC0-1.0"
diff --git a/scubagoggles/Testing/Python/test_utils.py b/scubagoggles/Testing/Python/test_utils.py
@@ -0,0 +1,187 @@
+"""Unit tests for utility functions (utils.py) in the project."""
+from pathlib import Path       # Standard library
+from importlib.metadata import version, PackageNotFoundError  # Standard library
+import os                      # Standard library
+import pytest                  # Third-party
+from scubagoggles import utils
+
+class TestUtils:
+    """Test suite for utility functions.
+    This class contains tests for verifying
+      the behavior of various
+    utility functions in the project.
+    """
+
+    @pytest.mark.parametrize(
+        "dictionary, keys, expected",
+        [
+            ({1:['a','b','c'], 2:['a','d'], 3:['b','c','d']},
+             [1], {'a':[1], 'b':[1], 'c':[1]}),
+            ({1:['a','b'], 2:['a','c','d'], 3:['b','e'], 4:['a','e']},
+             [1,3,4], {'a':[1, 4], 'b':[1, 3], 'e':[3, 4]}),
+            ({1:['a','b'], 2:['a','c','d'], 3:['b','e'], 4:['a','e']},
+             [], {}),
+            ({1:['a','b','c'],2:['d','e']},
+             [], {}),
+            ({1:['a','b','c'],2:[],3:['a','b','c','d'],4:['a','e']},
+             [1,2], {'a':[1], 'b':[1], 'c':[1]}),
+            ({1:['a','b','c'],2:[],3:['a','b','c','d'],4:['a','e']},
+             [1,2,3], {'a':[1,3], 'b':[1,3], 'c':[1,3], 'd':[3]}),
+            ({1:[],2:[],3:[],4:[]},
+             [1,3], {}),
+            ({1:['a','b','c'],2:['a', 'b']}, [1,3],
+             {'a':[1], 'b':[1], 'c':[1]}),
+             ({1:['a', 'b', 'c']}, [2],
+             {})
+        ],
+    )
+    def test_create_subset_inverted_dict(self, dictionary, keys, expected):
+        """ Unit test for create_subset_inverted_dict """
+        assert utils.create_subset_inverted_dict(dictionary, keys) == expected
+
+
+    @pytest.mark.parametrize(
+        "keys, expected",
+        [
+            ([1,2,3],{1:[], 2:[], 3:[]}),
+            ([1,2],{1:[], 2:[]}),
+            ([1],{1:[]}),
+            ([],{})
+        ],
+    )
+    def test_create_key_to_list(self,keys,expected):
+        """ Unit test for create_key_to_list """
+        assert utils.create_key_to_list(keys) == expected
+
+
+    @pytest.mark.parametrize(
+        "dict1, dict2, expected",
+        [
+            ({'a':[1], 'b':[2]},
+             {'b':[3], 'c':[1]},
+             {'a':[1], 'b':[2,3], 'c':[1]}),
+            ({'a':[1], 'b':[2]},
+             {'b':[2], 'c':[1]},
+             {'a':[1], 'b':[2,2], 'c':[1]}),
+            ({'a':[1], 'b':[2], 'c':[3]},
+             {'a':[2], 'b':[2], 'd':[1,2,3]},
+             {'a':[1,2], 'b':[2,2], 'c':[3], 'd':[1,2,3]}),
+            ({'a':[], 'b':[1,2], 'c':[1]},
+             {'b':[3], 'c':[]},
+             {'a':[], 'b':[1,2,3], 'c':[1]}),
+            ({'a':[], 'b':[1,2], 'c':[1]},
+             {'a':[], 'b':[3], 'c':[], 'd':[]},
+             {'a':[], 'b':[1,2,3], 'c':[1], 'd':[]}),
+             ({},{'a':[1], 'b':[2], 'c':[3]},
+              {'a':[1], 'b':[2], 'c':[3]})
+        ]
+    )
+    def test_merge_dicts(self, dict1, dict2, expected):
+        """ Unit test for merge_dicts """
+        assert utils.merge_dicts(dict1, dict2) == expected
+
+
+    @pytest.mark.parametrize(
+        "base_filename, rel_segments",
+        [
+            ("plain_file.txt",
+            ["Testing", "Python", "testing_directory", "plain_file.txt"]),
+            ("non_existent_file.txt",
+            ["Testing", "Python", "testing_directory", "plain_file.txt"]),
+            ("requirements.txt",
+            ["requirements.txt"]),
+            ("plain_file_2.txt",
+            ["Testing", "Python", "testing_directory", "secondary_directory", "plain_file_2.txt"]),
+        ]
+    )
+    def test_rel_abs_path(self, base_filename, rel_segments):
+        """ Unit test for rel_abs_path """
+        # build relative path
+        rel_path = os.path.join(*rel_segments)
+        cwd_path = Path.cwd()
+        full_path = cwd_path / rel_path
+        # assert expected result
+        assert utils.rel_abs_path(base_filename, rel_path) == full_path
+
+
+    @pytest.mark.parametrize(
+        "package, included",
+        [
+            ("pyyaml", True),
+            ("requests", True),
+            ("tqdm", True),
+            ("polars", False)
+        ]
+    )
+    def test_get_package_version(self, package, included):
+        """ Unit test for get_package_version """
+        if included:
+            v = version(package)
+            assert v == utils.get_package_version(package)
+        else:
+            with pytest.raises(PackageNotFoundError):
+                utils.get_package_version(package)
+
+
+    @pytest.mark.parametrize(
+        "path",
+        [
+            "requirements.txt",
+            "Testing/Python/testing_directory",
+            "Testing/Python/testing_directory/plainfile.txt",
+            ".",            # special case: use an absolute path
+            "~",
+            "$CWD/subdir",
+            "$HOME/tmp",
+        ]
+    )
+    def test_path_parser(self, path, monkeypatch):
+        """ Unit test for path_parser """
+        home_dir = Path.home()
+        monkeypatch.setenv("HOME", str(home_dir))
+        monkeypatch.setenv("CWD", str(home_dir))
+        expanded = os.path.expandvars(path)
+        expanded = os.path.expanduser(expanded)
+        abs_path = Path(os.path.abspath(expanded))
+        assert abs_path == utils.path_parser(path)
+
+    @pytest.mark.parametrize(
+        "prompt,user_input,default,expected",
+        [
+            ("Do you wish to continue?", "y", True, True),
+            ("Do you wish to continue?", "n", True, False),
+            ("Do you wish to continue?", "false", False, False),
+            ("Do you wish to continue?", "yes", False, True),
+            ("Do you wish to continue?", "false", True, False),
+            ("Do you wish to continue?", "", True, True),   # default used
+            ("Do you wish to continue?", "", False, False), # default used
+            ("Do you wish to continue?", "red", True, ValueError) # invalid input
+        ],
+    )
+    def test_prompt_boolean(self, monkeypatch, prompt, user_input, default, expected):  # pylint: disable=too-many-positional-arguments
+        """ Unit test for prompt_boolean """
+        monkeypatch.setattr("builtins.input", lambda _: user_input)
+        if user_input == "red":
+            with pytest.raises(ValueError):
+                utils.prompt_boolean(prompt, default=default)
+        else:
+            assert utils.prompt_boolean(prompt, default=default) == expected
+
+    @pytest.mark.parametrize(
+        "strval, expected, included",
+        [
+            ("y", True, True),
+            ("1", True, True),
+            ("TRUE", True, True),
+            ("no", False, True),
+            ("off", False, True),
+            ("red", None, False)
+        ]
+    )
+    def test_strtobool(self, strval, expected, included):
+        """ Unit test for test_strtobool """
+        if included:
+            assert utils.strtobool(strval) == expected
+        else:
+            with pytest.raises(ValueError):
+                utils.strtobool(strval)
diff --git a/scubagoggles/Testing/Python/testing_directory/plain_file.txt b/scubagoggles/Testing/Python/testing_directory/plain_file.txt
@@ -0,0 +1 @@
+This is a file with text in it.
diff --git a/scubagoggles/Testing/Python/testing_directory/secondary_directory/plain_file_2.txt b/scubagoggles/Testing/Python/testing_directory/secondary_directory/plain_file_2.txt
@@ -0,0 +1 @@
+This is yet another file with text in it.
diff --git a/scubagoggles/Testing/Unit/Python/test_purge.py b/scubagoggles/Testing/Unit/Python/test_purge.py
diff --git a/scubagoggles/Testing/Unit/Python/test_robust_dns.py b/scubagoggles/Testing/Unit/Python/test_robust_dns.py
diff --git a/scubagoggles/baselines/drive.md b/scubagoggles/baselines/drive.md
diff --git a/scubagoggles/policy_api.py b/scubagoggles/policy_api.py
diff --git a/scubagoggles/scuba_constants.py b/scubagoggles/scuba_constants.py
diff --git a/scubagoggles/utils.py b/scubagoggles/utils.py
