Sync with v0.10.1.1-dev

GovReady · Jun 29, 2022 · 75e6b44 · 75e6b44
2 parents 6b5a14f + 5576ba0
commit 75e6b44
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,21 @@
 GovReady-Q Release Notes
 ========================
 
-v0.10.1-dev (June XX, 2022)
------------------------
+v0.10.1.1-dev (June 29, 2022)
+-----------------------------
+
+**Buf fixes**
+
+* Hot patch to fix OSCAL SSP generation by making sure security_sensitivity_level has value.
+
+v0.10.1-dev (June 28, 2022)
+---------------------------
 
 **Security fixes**
 
 * Upgrade npm modules to address multiple vulnerabilities.
 
+
 v0.10.0 (June 24, 2022)
 -----------------------
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.10.0-dev
+v0.10.1.1-dev
diff --git a/controls/models.py b/controls/models.py
@@ -743,7 +743,10 @@ def get_security_sensitivity_level(self):
         """Get Security Sensitivty level to system"""
 
         # Get or create the security_sensitivity_level smt for system's root_element; should only have 1 statement
-        smt = Statement.objects.get(statement_type=StatementTypeEnum.SECURITY_SENSITIVITY_LEVEL.name, producer_element=self.root_element, consumer_element=self.root_element)
+        if Statement.objects.filter(statement_type=StatementTypeEnum.SECURITY_SENSITIVITY_LEVEL.name, producer_element=self.root_element, consumer_element=self.root_element).exists():
+            smt = Statement.objects.get(statement_type=StatementTypeEnum.SECURITY_SENSITIVITY_LEVEL.name, producer_element=self.root_element, consumer_element=self.root_element)
+        else:
+            smt = Statement.objects.create(statement_type=StatementTypeEnum.SECURITY_SENSITIVITY_LEVEL.name, body="UNKNOWN", producer_element=self.root_element, consumer_element=self.root_element)
         security_sensitivity_level = smt.body
         return security_sensitivity_level
 

diff --git a/controls/views.py b/controls/views.py
@@ -897,7 +897,7 @@ def as_json(self):
                                                                 "description": self.system.root_element.description,
                                                                 "system-ids": [{"id": str(self.system.root_element.uuid),# TODO: identifier-type
                                                                                "identifier-type": "https://ietf.org/rfc/rfc4122"}],
-                                                                "security-sensitivity-level": self.system.get_security_sensitivity_level if self.system.get_security_sensitivity_level else "UNKOWN",
+                                                                "security-sensitivity-level": self.system.get_security_sensitivity_level if self.system.get_security_sensitivity_level else "UNKNOWN",
                                                                 "system-information": {
                                                                     "information-types": information_types},
                                                                 "security-impact-level": {