rebase to main

Signed-off-by: Johannes Feichtner <johannes@web-wack.at>

Author: Churro

cyclonedx/model/license.py

@@ -34,6 +34,7 @@
 from .._internal.compare import ComparableTuple as _ComparableTuple
 from ..exception.model import MutuallyExclusivePropertiesException
 from ..exception.serialization import CycloneDxDeserializationException
+from ..schema import SchemaVersion
 from ..schema.schema import SchemaVersion1Dot5, SchemaVersion1Dot6, SchemaVersion1Dot7
 from . import AttachedText, Property, XsUri
 from .bom_ref import BomRef
@@ -278,6 +279,122 @@ def __repr__(self) -> str:
         return f'<License id={self._id!r}, name={self._name!r}>'
 
 
+@serializable.serializable_class(ignore_unknown_during_deserialization=True)
+class ExpressionDetails:
+    """
+    This is our internal representation of the ``licenseExpressionDetailedType`` complex type that specifies the details
+    and attributes related to a software license identifier within a CycloneDX BOM document.
+
+    .. note::
+        Introduced in CycloneDX v1.7
+
+
+    .. note::
+        See the CycloneDX Schema definition: https://cyclonedx.org/docs/1.7/xml/#type_licenseExpressionDetailedType
+    """
+
+    def __init__(
+        self, license_identifier: str, *,
+        bom_ref: Optional[Union[str, BomRef]] = None,
+        text: Optional[AttachedText] = None,
+        url: Optional[XsUri] = None,
+    ) -> None:
+        self._bom_ref = _bom_ref_from_str(bom_ref)
+        self.license_identifier = license_identifier
+        self.text = text
+        self.url = url
+
+    @property
+    @serializable.xml_name('license-identifier')
+    @serializable.xml_string(serializable.XmlStringSerializationType.NORMALIZED_STRING)
+    @serializable.xml_attribute()
+    def license_identifier(self) -> str:
+        """
+        A valid SPDX license identifier. Refer to https://spdx.org/specifications for syntax requirements.
+        This field serves as the primary key, which uniquely identifies each record.
+
+        Example values:
+         - "Apache-2.0",
+         - "GPL-3.0-only WITH Classpath-exception-2.0"
+         - "LicenseRef-my-custom-license"
+
+        Returns:
+            `str`
+        """
+        return self._license_identifier
+
+    @license_identifier.setter
+    def license_identifier(self, license_identifier: str) -> None:
+        self._license_identifier = license_identifier
+
+    @property
+    @serializable.json_name('bom-ref')
+    @serializable.type_mapping(BomRef)
+    @serializable.xml_attribute()
+    @serializable.xml_name('bom-ref')
+    def bom_ref(self) -> BomRef:
+        """
+        An optional identifier which can be used to reference the component elsewhere in the BOM. Every bom-ref MUST be
+        unique within the BOM.
+
+        Returns:
+            `BomRef`
+        """
+        return self._bom_ref
+
+    @property
+    @serializable.xml_sequence(1)
+    def text(self) -> Optional[AttachedText]:
+        """
+        Specifies the optional full text of the attachment
+
+        Returns:
+            `AttachedText` else `None`
+        """
+        return self._text
+
+    @text.setter
+    def text(self, text: Optional[AttachedText]) -> None:
+        self._text = text
+
+    @property
+    @serializable.xml_sequence(2)
+    def url(self) -> Optional[XsUri]:
+        """
+        The URL to the attachment file. If the attachment is a license or BOM, an externalReference should also be
+        specified for completeness.
+
+        Returns:
+            `XsUri` or `None`
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url: Optional[XsUri]) -> None:
+        self._url = url
+
+    def __comparable_tuple(self) -> _ComparableTuple:
+        return _ComparableTuple((
+            self.bom_ref.value, self.license_identifier, self.url, self.text,
+        ))
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, ExpressionDetails):
+            return self.__comparable_tuple() == other.__comparable_tuple()
+        return False
+
+    def __lt__(self, other: object) -> bool:
+        if isinstance(other, ExpressionDetails):
+            return self.__comparable_tuple() < other.__comparable_tuple()
+        return NotImplemented
+
+    def __hash__(self) -> int:
+        return hash(self.__comparable_tuple())
+
+    def __repr__(self) -> str:
+        return f'<ExpressionDetails bom-ref={self.bom_ref!r}, license_identifier={self.license_identifier}>'
+
+
 @serializable.serializable_class(
     name='expression',
     ignore_unknown_during_deserialization=True
@@ -296,10 +413,12 @@ def __init__(
         self, value: str, *,
         bom_ref: Optional[Union[str, BomRef]] = None,
         acknowledgement: Optional[LicenseAcknowledgement] = None,
+        details: Optional[Iterable[ExpressionDetails]] = None,
     ) -> None:
         self._bom_ref = _bom_ref_from_str(bom_ref)
         self._value = value
         self._acknowledgement = acknowledgement
+        self.details = details or []
 
     @property
     @serializable.view(SchemaVersion1Dot5)
@@ -362,11 +481,30 @@ def acknowledgement(self) -> Optional[LicenseAcknowledgement]:
     def acknowledgement(self, acknowledgement: Optional[LicenseAcknowledgement]) -> None:
         self._acknowledgement = acknowledgement
 
+    @property
+    @serializable.json_name('expressionDetails')
+    @serializable.view(SchemaVersion1Dot7)
+    @serializable.xml_array(serializable.XmlArraySerializationType.FLAT, child_name='details')
+    @serializable.xml_sequence(1)
+    def details(self) -> 'SortedSet[ExpressionDetails]':
+        """
+        Details for parts of the expression.
+
+        Returns:
+            Set of `ExpressionDetails`
+        """
+        return self._details
+
+    @details.setter
+    def details(self, details: Iterable[ExpressionDetails]) -> None:
+        self._details = SortedSet(details)
+
     def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
             self._acknowledgement,
             self._value,
             self._bom_ref.value,
+            _ComparableTuple(self.details),
         ))
 
     def __hash__(self) -> int:
@@ -431,6 +569,40 @@ class LicenseRepository(SortedSet):
 class _LicenseRepositorySerializationHelper(serializable.helpers.BaseHelper):
     """  THIS CLASS IS NON-PUBLIC API  """
 
+    @staticmethod
+    def __supports_expression_details(view: Any) -> bool:
+        try:
+            return view is not None and view().schema_version_enum >= SchemaVersion.V1_7
+        except Exception:  # pragma: no cover
+            return False
+
+    @staticmethod
+    def __serialize_license_expression_details_xml(
+        license_expression: LicenseExpression,
+        view: Optional[type[serializable.ViewType]],
+        xmlns: Optional[str]
+    ) -> Element:
+        elem: Element = license_expression.as_xml(  # type:ignore[attr-defined]
+            view_=view, as_string=False, element_name='expression-detailed', xmlns=xmlns)
+        expression_value = elem.text
+        if expression_value:
+            elem.set(f'{{{xmlns}}}expression' if xmlns else 'expression', expression_value)
+            elem.text = None
+        return elem
+
+    @staticmethod
+    def __deserialize_license_expression_details_xml(
+        li: Element,
+        default_ns: Optional[str]
+    ) -> LicenseExpression:
+        expression_value = li.get('expression')
+        if not expression_value:
+            raise CycloneDxDeserializationException(f'unexpected content: {li!r}')
+        license_expression: LicenseExpression = LicenseExpression.from_xml(  # type:ignore[attr-defined]
+            li, default_ns)
+        license_expression.value = expression_value
+        return license_expression
+
     @classmethod
     def json_normalize(cls, o: LicenseRepository, *,
                        view: Optional[type[serializable.ViewType]],
@@ -482,8 +654,13 @@ def xml_normalize(cls, o: LicenseRepository, *,
             # mixed license expression and license? this is an invalid constellation according to schema!
             # see https://github.com/CycloneDX/specification/pull/205
             # but models need to allow it for backwards compatibility with JSON CDX < 1.5
-            elem.append(expression.as_xml(  # type:ignore[attr-defined]
-                view_=view, as_string=False, element_name='expression', xmlns=xmlns))
+            if expression.details and cls.__supports_expression_details(view):
+                elem.append(cls.__serialize_license_expression_details_xml(expression, view, xmlns))
+            else:
+                if expression.details:
+                    warn('LicenseExpression details are not supported in schema versions < 1.7; skipping serialization')
+                elem.append(expression.as_xml(  # type:ignore[attr-defined]
+                    view_=view, as_string=False, element_name='expression', xmlns=xmlns))
         else:
             elem.extend(
                 li.as_xml(  # type:ignore[attr-defined]
@@ -506,6 +683,8 @@ def xml_denormalize(cls, o: Element,
             elif tag == 'expression':
                 repo.add(LicenseExpression.from_xml(  # type:ignore[attr-defined]
                     li, default_ns))
+            elif tag == 'expression-detailed':
+                repo.add(cls.__deserialize_license_expression_details_xml(li, default_ns))
             else:
                 raise CycloneDxDeserializationException(f'unexpected: {li!r}')
         return repo

tests/_data/models.py

@@ -97,7 +97,13 @@
     ImpactAnalysisState,
 )
 from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource
-from cyclonedx.model.license import DisjunctiveLicense, License, LicenseAcknowledgement, LicenseExpression
+from cyclonedx.model.license import (
+    DisjunctiveLicense,
+    ExpressionDetails,
+    License,
+    LicenseAcknowledgement,
+    LicenseExpression,
+)
 from cyclonedx.model.lifecycle import LifecyclePhase, NamedLifecycle, PredefinedLifecycle
 from cyclonedx.model.release_note import ReleaseNotes
 from cyclonedx.model.service import Service
@@ -1061,6 +1067,15 @@ def get_vulnerability_source_owasp() -> VulnerabilitySource:
 
 
 def get_bom_with_licenses() -> Bom:
+    expression_details = [
+        ExpressionDetails(license_identifier='GPL-3.0-or-later',
+                          url=XsUri('https://www.apache.org/licenses/LICENSE-2.0.txt'),
+                          text=AttachedText(content='specific GPL-3.0-or-later license text')),
+        ExpressionDetails(license_identifier='GPL-2.0',
+                          bom_ref='some-bomref-1234',
+                          text=AttachedText(content='specific GPL-2.0 license text')),
+    ]
+
     return _make_bom(
         metadata=BomMetaData(
             licenses=[DisjunctiveLicense(id='CC-BY-1.0')],
@@ -1090,6 +1105,11 @@ def get_bom_with_licenses() -> Bom:
                           DisjunctiveLicense(name='some other license',
                                              properties=[Property(name='myname', value='proprietary')]),
                       ]),
+            Component(name='c-with-expression-details', type=ComponentType.LIBRARY, bom_ref='C5',
+                      licenses=[LicenseExpression(value='GPL-3.0-or-later OR GPL-2.0',
+                                                  details=expression_details,
+                                                  acknowledgement=LicenseAcknowledgement.DECLARED
+                                                  )]),
         ],
         services=[
             Service(name='s-with-expression', bom_ref='S1',

tests/_data/snapshots/get_bom_with_licenses-1.0.xml.bin

@@ -11,6 +11,11 @@
       <version/>
       <modified>false</modified>
     </component>
+    <component type="library">
+      <name>c-with-expression-details</name>
+      <version/>
+      <modified>false</modified>
+    </component>
     <component type="library">
       <name>c-with-license-properties</name>
       <version/>

tests/_data/snapshots/get_bom_with_licenses-1.1.xml.bin

@@ -18,6 +18,13 @@
         <expression>Apache-2.0 OR MIT</expression>
       </licenses>
     </component>
+    <component type="library" bom-ref="C5">
+      <name>c-with-expression-details</name>
+      <version/>
+      <licenses>
+        <expression>GPL-3.0-or-later OR GPL-2.0</expression>
+      </licenses>
+    </component>
     <component type="library" bom-ref="C4">
       <name>c-with-license-properties</name>
       <version/>

tests/_data/snapshots/get_bom_with_licenses-1.2.json.bin

@@ -25,6 +25,17 @@
       "type": "library",
       "version": ""
     },
+    {
+      "bom-ref": "C5",
+      "licenses": [
+        {
+          "expression": "GPL-3.0-or-later OR GPL-2.0"
+        }
+      ],
+      "name": "c-with-expression-details",
+      "type": "library",
+      "version": ""
+    },
     {
       "bom-ref": "C4",
       "licenses": [
@@ -83,6 +94,9 @@
     {
       "ref": "C4"
     },
+    {
+      "ref": "C5"
+    },
     {
       "ref": "S1"
     },

tests/_data/snapshots/get_bom_with_licenses-1.2.xml.bin

@@ -30,6 +30,13 @@
         <expression>Apache-2.0 OR MIT</expression>
       </licenses>
     </component>
+    <component type="library" bom-ref="C5">
+      <name>c-with-expression-details</name>
+      <version/>
+      <licenses>
+        <expression>GPL-3.0-or-later OR GPL-2.0</expression>
+      </licenses>
+    </component>
     <component type="library" bom-ref="C4">
       <name>c-with-license-properties</name>
       <version/>
@@ -92,6 +99,7 @@
     <dependency ref="C2"/>
     <dependency ref="C3"/>
     <dependency ref="C4"/>
+    <dependency ref="C5"/>
     <dependency ref="S1"/>
     <dependency ref="S2"/>
     <dependency ref="S3"/>

tests/_data/snapshots/get_bom_with_licenses-1.3.json.bin

@@ -25,6 +25,17 @@
       "type": "library",
       "version": ""
     },
+    {
+      "bom-ref": "C5",
+      "licenses": [
+        {
+          "expression": "GPL-3.0-or-later OR GPL-2.0"
+        }
+      ],
+      "name": "c-with-expression-details",
+      "type": "library",
+      "version": ""
+    },
     {
       "bom-ref": "C4",
       "licenses": [
@@ -83,6 +94,9 @@
     {
       "ref": "C4"
     },
+    {
+      "ref": "C5"
+    },
     {
       "ref": "S1"
     },