Merge branch 'main' into feat/samm-aram

Author: wurstbrot

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.17.0](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.16.0...v1.17.0) (2025-09-15)
+
+
+### Features
+
+* adjust mappings for SAMM Secure Build ([471c7fc](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/commit/471c7fce17e02ef63675047a6620beaf5aa96d2c))
+
 # [1.16.0](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.15.3...v1.16.0) (2025-06-04)
 
 

README.md

@@ -7,7 +7,7 @@ To test changes to the yaml-files, please run:
 docker run -ti -v $(pwd)/src/assets/YAML/default:/var/www/html/src/assets/YAML/default -v $(pwd)/src/assets/YAML/generated:/var/www/html/src/assets/YAML/generated -v $(pwd)/src/assets/YAML/schema:/var/www/html/src/assets/YAML/schema wurstbrot/dsomm-yaml-generation
 
 # Afterwards, you can use the generated.yaml in a container
-docker  run -v $(pwd)/src/assets/YAML/generated/generated.yaml:/usr/share/nginx/html/assets/YAML/generated/generated.yaml -p 8080:8080 wurstbrot/dsomm
+docker  run -v $(pwd)/src/assets/YAML/generated/generated.yaml:/srv/assets/YAML/generated/generated.yaml -p 8080:8080 wurstbrot/dsomm
 ```
 
 ## Credits

src/assets/YAML/default/Implementation/InfrastructureHardening.yaml

@@ -17,7 +17,6 @@ Implementation:
       usefulness: 4
       level: 1
       implementation:
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/smartcard
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/yubikey
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/sms
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/totp
@@ -54,7 +53,6 @@ Implementation:
       dependsOn:
         - MFA for admins
       implementation:
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/smartcard
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/yubikey
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/sms
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/totp
@@ -379,8 +377,8 @@ Implementation:
       usefulness: 4
       level: 2
       implementation:
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-kubernetes-bench
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-docker-bench-for
+        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-kubernetes-benchmark
+        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-docker-benchmark
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/for-example-for-cont
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/attack-matrix-cloud
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/attack-matrix-containers
@@ -412,8 +410,8 @@ Implementation:
       usefulness: 3
       level: 4
       implementation:
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-kubernetes-bench
-        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-docker-bench-for
+        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-kubernetes-benchmark
+        - $ref: src/assets/YAML/default/implementations.yaml#/implementations/cis-docker-benchmark
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/for-example-for-cont
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/attack-matrix-cloud
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/attack-matrix-containers

src/assets/YAML/default/InformationGathering/Logging.yaml

@@ -16,7 +16,7 @@ Information Gathering:
         time: 1
         resources: 1
       usefulness: 5
-      level: 3
+      level: 2
       dependsOn:
         - Alerting
       implementation: []
@@ -177,7 +177,7 @@ Information Gathering:
         time: 3
         resources: 3
       usefulness: 4
-      level: 2
+      level: 3
       dependsOn:
         - Centralized system logging
         - Centralized application logging

src/assets/YAML/default/TestAndVerification/Consolidation.yaml

@@ -196,7 +196,7 @@ Test and Verification:
       usefulness: 3
       level: 2
       dependsOn:
-        - uuid:c1acc8af-312e-4503-a817-a26220c993a0 # Simple false positive treatment
+        - c1acc8af-312e-4503-a817-a26220c993a0 # Simple false positive treatment
       implementation:
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/owasp-defectdojo
         - $ref: src/assets/YAML/default/implementations.yaml#/implementations/purify
@@ -341,8 +341,8 @@ Test and Verification:
       usefulness: 4
       level: 3
       dependsOn:
-        - uuid:8f2b4d5a-3c1e-4b7a-9d8f-2e6c4a1b5d7f # Artifact-based false positive treatment
-        - uuid:85ba5623-84be-4219-8892-808837be582d # Usage of a vulnerability management system
+        - 8f2b4d5a-3c1e-4b7a-9d8f-2e6c4a1b5d7f # Artifact-based false positive treatment
+        - 85ba5623-84be-4219-8892-808837be582d # Usage of a vulnerability management system
       implementation:
       references:
         samm2:

src/assets/YAML/default/implementations.yaml

@@ -249,16 +249,16 @@ implementations:
     name: OWASP MASVS
     tags: []
     url: https://github.com/OWASP/owasp-masvs
-  cis-kubernetes-bench:
+  cis-kubernetes-benchmark:
     uuid: edaec98d-dac7-4dfd-8ab3-42c471d5b9ff
-    name: CIS Kubernetes Bench for Security
+    name: CIS Kubernetes Benchmark for Security
     tags: []
-    url: https://www.cisecurity.org/cis-benchmarks/#
-  cis-docker-bench-for:
+    url: https://www.cisecurity.org/benchmark/kubernetes
+  cis-docker-benchmark:
     uuid: 4dd23c4a-5a7e-4917-82cf-d00e0f04482f
-    name: CIS Docker Bench for Security
+    name: CIS Docker Benchmark for Security
     tags: []
-    url: https://www.cisecurity.org/cis-benchmarks/
+    url: https://www.cisecurity.org/benchmark/docker
   for-example-for-cont:
     uuid: f4d7c796-8574-4a88-ab00-98d245a115ef
     name: For example for Cont
@@ -355,14 +355,9 @@ implementations:
     uuid: cc55cba1-ea0a-466e-99c5-337c9da2b00e
     name: Plugins
     tags: []
-  smartcard:
-    uuid: e76a395a-8d6a-4e25-a175-6cf25409b755
-    name: Smartcard
-    tags: []
-    url: https://d3fend.mitre.org/technique/d3f:Multi-factorAuthentication/#
   yubikey:
     uuid: d5981117-9bc2-45ed-b4a4-383135dc13d8
-    name: YubiKey
+    name: YubiKey - Smartcard
     tags: []
     url: https://d3fend.mitre.org/technique/d3f:Multi-factorAuthentication/
   sms: