feat(bom downloadAttachments): read attachment id from control file

capycli/bom/download_attachments.py

@@ -19,6 +19,7 @@
 from capycli.common.capycli_bom_support import CaPyCliBom, CycloneDxSupport, SbomWriter
 from capycli.common.print import print_red, print_text, print_yellow
 from capycli.common.script_support import ScriptSupport
+from capycli.common.json_support import load_json_file
 from capycli.main.result_codes import ResultCode
 
 LOG = capycli.get_logger(__name__)
@@ -29,7 +30,7 @@ class BomDownloadAttachments(capycli.common.script_base.ScriptBase):
     Download SW360 attachments as specified in the SBOM.
     """
 
-    def download_attachments(self, sbom: Bom, source_folder: str, bompath: str = None,
+    def download_attachments(self, sbom: Bom, control_components: list, source_folder: str, bompath: str = None,
                              attachment_types: Tuple[str] = ("COMPONENT_LICENSE_INFO_XML", "CLEARING_REPORT")) -> Bom:
 
         for component in sbom.components:
@@ -46,27 +47,25 @@ def download_attachments(self, sbom: Bom, source_folder: str, bompath: str = Non
                 if not found:
                     continue
 
-                attachment_id = ext_ref.comment.split(", sw360Id: ")
-                if len(attachment_id) != 2:
-                    print_red("    No sw360Id for attachment!")
-                    continue
-                attachment_id = attachment_id[1]
-
                 release_id = CycloneDxSupport.get_property_value(component, CycloneDxSupport.CDX_PROP_SW360ID)
                 if not release_id:
                     print_red("    No sw360Id for release!")
                     continue
-                print("   ", ext_ref.url, release_id, attachment_id)
-                filename = os.path.join(source_folder, ext_ref.url)
+                url = str(ext_ref.url)
+                filename = os.path.join(source_folder, url)
+
+                details = [e for e in control_components
+                           if e["Sw360Id"] == release_id and (
+                               e.get("CliFile", "") == url
+                               or e.get("ReportFile", "") == url)]
+                if len(details) != 1:
+                    print_red("    ERROR: Found", len(details), "entries for attachment",
+                              ext_ref.url, "of", item_name, "in control file!")
+                    continue
+                attachment_id = details[0]["Sw360AttachmentId"]
 
                 print_text("    Downloading file " + filename)
                 try:
-                    at_info = self.client.get_attachment(attachment_id)
-                    at_info = {k: v for k, v in at_info.items()
-                               if k.startswith("check")
-                               or k.startswith("created")}
-                    print(at_info)
-
                     self.client.download_release_attachment(filename, release_id, attachment_id)
                     ext_ref.url = filename
                     try:
@@ -104,6 +103,7 @@ def run(self, args):
             print("optional arguments:")
             print("    -h, --help            show this help message and exit")
             print("    -i INPUTFILE,         input SBOM to read from, e.g. created by \"project CreateBom\"")
+            print("    -ct CONTROLFILE,      control file to read from as created by \"project CreateBom\"")
             print("    -source SOURCE        source folder or additional source file")
             print("    -o OUTPUTFILE         output file to write to")
             print("    -v                    be verbose")
@@ -113,6 +113,10 @@ def run(self, args):
             print_red("No input file specified!")
             sys.exit(ResultCode.RESULT_COMMAND_ERROR)
 
+        if not args.controlfile:
+            print_red("No control file specified!")
+            sys.exit(ResultCode.RESULT_COMMAND_ERROR)
+
         if not os.path.isfile(args.inputfile):
             print_red("Input file not found!")
             sys.exit(ResultCode.RESULT_FILE_NOT_FOUND)
@@ -127,6 +131,16 @@ def run(self, args):
         if args.verbose:
             print_text(" " + str(len(bom.components)) + "components read from SBOM file")
 
+        print_text("Loading control file " + args.controlfile)
+        try:
+            control = load_json_file(args.controlfile)
+        except Exception as ex:
+            print_red("JSON error reading control file: " + repr(ex))
+            sys.exit(ResultCode.RESULT_ERROR_READING_BOM)
+        if "Components" not in control:
+            print_red("missing Components in control file")
+            sys.exit(ResultCode.RESULT_ERROR_READING_BOM)
+
         source_folder = "./"
         if args.source:
             source_folder = args.source
@@ -144,7 +158,7 @@ def run(self, args):
 
         print_text("Downloading source files to folder " + source_folder + " ...")
 
-        self.download_attachments(bom, source_folder, os.path.dirname(args.outputfile))
+        self.download_attachments(bom, control["Components"], source_folder, os.path.dirname(args.outputfile))
 
         if args.outputfile:
             print_text("Updating path information")

tests/fixtures/sbom_for_download-control.json

@@ -0,0 +1,24 @@
+{
+  "ProjectName": "CaPyCLI, 2.0.0-dev1",
+  "Components": [
+    {
+      "ComponentName": "certifi 2022.12.7",
+      "Sw360Id": "ae8c7ed",
+      "Sw360AttachmentId": "794446",
+      "CreatedBy": "[email protected]",
+      "CreatedTeam": "AA",
+      "CreatedOn": "2020-10-23",
+      "CheckStatus": "ACCEPTED",
+      "CheckedBy": "[email protected]",
+      "CheckedTeam": "BB",
+      "CheckedOn": "2020-10-30",
+      "CliFile": "CLIXML_certifi-2022.12.7.xml"
+    },
+    {
+      "ComponentName": "certifi 2022.12.7",
+      "Sw360Id": "ae8c7ed",
+      "Sw360AttachmentId": "63b368",
+      "ReportFile": "certifi-2022.12.7_clearing_report.docx"
+    }
+  ]
+}