usnistgov/macos_security
1
0
Fork 0
mirror of https://github.com/usnistgov/macos_security.git synced 2026-02-03 14:03:24 +00:00
Code Issues 21 Actions Packages Projects Releases Wiki Activity

fix: sync up dependencies and default macos

Browse Source
This commit is contained in:
Dan Brodjieski
2026-01-14 18:43:41 -05:00
parent 4f14a3da70
commit 940a8c9f3b
3 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mscp.py
View File

@@ -1,4 +1,4 @@
#! .venv/bin/python3
#! /usr/bin/env python3
# filename: mscp.py
# Standard python modules

12
pyproject.toml
View File

@@ -18,15 +18,17 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"jinja2==3.1.6",
"jinja2==3.1.5",
"loguru==0.7.3",
"lxml==5.4.0",
"matplotlib==3.10.3",
"matplotlib==3.10.0",
"openpyxl==3.1.5",
"pandas==2.3.0",
"pydantic==2.11.6",
"numpy==2.2.5",
"pandas==2.2.3",
"pydantic==2.10.6",
"pyyaml==6.0.2",
"jsonschema==4.24.0",
"jsonschema==4.23.0",
"yaspin==3.4.0,
]
[project.urls]

101
src/mscp/cli.py
View File

@@ -39,6 +39,8 @@ def get_macos_version() -> float:
if version_str:
major = int(version_str.split(".")[0])
return float(major)
else
return 26.0
def validate_file(arg: str) -> Path | None:
@@ -192,7 +194,7 @@ def parse_cli() -> None:
"-r",
"--reference",
default=None,
help="Use the reference ID instead of rule ID for identification.",
help="Use the reference ID instead of rule ID for logging in the generated compliance script.",
action="store",
)
guidance_parser.add_argument(
@@ -251,6 +253,7 @@ def parse_cli() -> None:
"-c",
"--csv",
default=None,
required=True,
help="CSV to create custom rule files from a mapping",
type=validate_file,
)
@@ -298,59 +301,59 @@ def parse_cli() -> None:
action="store_true",
)
local_report_parser: argparse.ArgumentParser = subparsers.add_parser(
"local_report",
help="Creates local report in Excel format.",
parents=[parent_parser],
add_help=False,
)
local_report_parser.set_defaults(func=generate_local_report)
local_report_parser.add_argument(
"-p", "--plist", help="Plist input file", type=validate_file, action="store"
)
local_report_parser.add_argument(
"-o",
"--output",
help="Location to output report to.",
type=Path,
action="store",
)
# local_report_parser: argparse.ArgumentParser = subparsers.add_parser(
# "local_report",
# help="Creates local report in Excel format.",
# parents=[parent_parser],
# add_help=False,
# )
# local_report_parser.set_defaults(func=generate_local_report)
# local_report_parser.add_argument(
# "-p", "--plist", help="Plist input file", type=validate_file, action="store"
# )
# local_report_parser.add_argument(
# "-o",
# "--output",
# help="Location to output report to.",
# type=Path,
# action="store",
# )
checklist_parser: argparse.ArgumentParser = subparsers.add_parser(
"stig_checklist",
help="Creates DISA STIG Checklist",
parents=[parent_parser],
add_help=False,
)
checklist_parser.set_defaults(func=generate_checklist)
checklist_parser.add_argument(
"-p", "--plist", help="Plist input file", type=validate_file, action="store"
)
# checklist_parser: argparse.ArgumentParser = subparsers.add_parser(
# "stig_checklist",
# help="Creates DISA STIG Checklist",
# parents=[parent_parser],
# add_help=False,
# )
# checklist_parser.set_defaults(func=generate_checklist)
# checklist_parser.add_argument(
# "-p", "--plist", help="Plist input file", type=validate_file, action="store"
# )
checklist_parser.add_argument(
"-d", "--disastig", help="DISA STIG File", type=validate_file, action="store"
)
# checklist_parser.add_argument(
# "-d", "--disastig", help="DISA STIG File", type=validate_file, action="store"
# )
checklist_parser.add_argument(
"-j", "--json", help="Create JSON export", default=None, action="store_true"
)
# checklist_parser.add_argument(
# "-j", "--json", help="Create JSON export", default=None, action="store_true"
# )
checklist_parser.add_argument(
"-b",
"--baseline",
help="Baseline YAML file used to create the guide.",
type=validate_file,
action="store",
)
# checklist_parser.add_argument(
# "-b",
# "--baseline",
# help="Baseline YAML file used to create the guide.",
# type=validate_file,
# action="store",
# )
checklist_parser.add_argument(
"-V",
"--checklist_version",
help="STIG Checklist Version",
default="3",
action="store",
choices=["2", "3"],
)
# checklist_parser.add_argument(
# "-V",
# "--checklist_version",
# help="STIG Checklist Version",
# default="3",
# action="store",
# choices=["2", "3"],
# )
validate_parser: argparse.ArgumentParser = subparsers.add_parser(
"validate",