wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

src/models/tool.ts

@@ -19,9 +19,12 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 
 import type { Comparable } from '../_helpers/sortable'
 import { SortableComparables } from '../_helpers/sortable'
-import {type Component, ComponentRepository} from "./component";
+import type { Component } from "./component";
+import { ComponentRepository} from "./component";
 import { ExternalReferenceRepository } from './externalReference'
 import { HashDictionary } from './hash'
+import type { Service } from "./service";
+import { ServiceRepository } from "./service";
 
 export interface OptionalToolProperties {
   vendor?: Tool['vendor']
@@ -64,32 +67,41 @@ export class Tool implements Comparable<Tool> {
       externalReferences: component.externalReferences
     })
   }
+
+  static fromService(service: Service): Tool {
+    return new Tool({
+      vendor: service.group,
+      name: service.name,
+      version: service.version,
+      externalReferences: service.externalReferences
+    })
+  }
 }
 
 export class ToolRepository extends SortableComparables<Tool> {
 }
 
 
 export interface OptionalToolsProperties {
-  components?: ComponentRepository
-  // TODO: services
-  tools?: ToolRepository
+  components?: Tools['components']
+  services?: Tools['services']
+  tools?: Tools['tools']
 }
 
 export class Tools {
   components: ComponentRepository
-  // TODO: services
+  services: ServiceRepository
   tools: ToolRepository
 
   constructor(op: OptionalToolsProperties = {}) {
     this.components = op.components ?? new ComponentRepository()
-    // TODO: this.services
+    this.services = op.services ?? new ServiceRepository()
     this.tools = op.tools ?? new ToolRepository()
   }
 
   get size(): number {
     return this.components.size
-      // TODO: this.services
+      + this.services.size
       + this.tools.size
   }
 }

src/serialize/json/normalize.ts

@@ -297,13 +297,13 @@ export class ToolsNormalizer extends BaseJsonNormalizer<Models.Tools> {
       return this._factory.makeForTool().normalizeIterable(
         new ToolRepository(chainI<Models.Tool>(
           Array.from(data.components, Tool.fromComponent),
-          // TODO services
+          Array.from(data.services, Tool.fromService),
           data.tools,
         )), options)
     }
     return {
-      components: this._factory.makeForComponent().normalizeIterable(data.components, options)
-      // TODO services
+      components: this._factory.makeForComponent().normalizeIterable(data.components, options),
+      services: this._factory.makeForService().normalizeIterable(data.services, options)
     }
   }
 }

src/serialize/json/types.ts

@@ -120,7 +120,7 @@ export namespace Normalized {
   /** since CDX 1.5 */
   export interface Tools {
     components: Component[]
-    // TODO: services
+    services: Service[]
   }
 
   export type ToolsType = Tools | Tool[]

src/serialize/xml/normalize.ts

@@ -380,7 +380,7 @@ export class ToolsNormalizer extends BaseXmlNormalizer<Models.Tools> {
       children = this._factory.makeForTool().normalizeIterable(
         new ToolRepository(chainI(
           Array.from(data.components, Tool.fromComponent),
-          // TODO services
+          Array.from(data.services, Tool.fromService),
           data.tools,
         )), options, 'tool')
     } else {
@@ -392,7 +392,13 @@ export class ToolsNormalizer extends BaseXmlNormalizer<Models.Tools> {
           children: this._factory.makeForComponent().normalizeIterable(data.components, options, 'component')
         })
       }
-      // TODO data.services
+      if (data.components.size > 0) {
+        children.push({
+          type: 'element',
+          name: 'services',
+          children: this._factory.makeForService().normalizeIterable(data.services, options, 'service')
+        })
+      }
     }
     return {
       type: 'element',