Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with ambiguity of control product #12454

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Fix issue with ambiguity of control product #12454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
220b799
Fix issue with ambiguity of control product and partial match of prod…
teacup-on-rockingchair Oct 2, 2024
ab875b0
Consider the option policy product to remain None
teacup-on-rockingchair Oct 3, 2024
83eaa21
Replace type() with isinstance()
teacup-on-rockingchair Oct 9, 2024
adf59e6
Update docs to reflect correct usage of the product field
teacup-on-rockingchair Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/manual/developer/03_creating_content.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ original_title: used as a reference for policies not yet available in English
source: a link to the original policy, eg. a URL of a PDF document
controls_dir: a directory containing files representing controls that will be imported into this policy
reference_type: Reference type represented by control IDs in this policy.
product: product ID, set if the policy is specific to a single product.
product: list of product IDs, set if the policy is specific to a single or number of products.
levels: a list of levels, the first one is default
- id: level ID (required key)
inherits_from: a list of IDs of levels inheriting from
Expand Down
6 changes: 5 additions & 1 deletion ssg/controls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,11 @@ def load(self):
self.title = ssg.utils.required_key(yaml_contents, "title")
self.source = yaml_contents.get("source", "")
self.reference_type = yaml_contents.get("reference_type", None)
self.product = yaml_contents.get("product", None)
yaml_product = yaml_contents.get("product", None)
if isinstance(yaml_product, list):
self.product = yaml_product
elif yaml_product is not None:
self.product = [yaml_product]

default_level_dict = {"id": "default"}
level_list = yaml_contents.get("levels", [default_level_dict])
Expand Down
Loading