Merge pull request github#1 from wurstbrot/master

Pull
Tamronimus · Apr 8, 2023 · 5691cb0 · 5691cb0
2 parents 948bc50 + 34c3ab6
commit 5691cb0
Show file tree

Hide file tree

Showing 32 changed files with 1,413 additions and 455 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,8 +3,6 @@ name: CI
 on:
   push:
     branches: [master]
-  pull_request:
-    branches: [master]
   workflow_dispatch:
   schedule:
     - cron: "0 7 * * *"
@@ -24,7 +22,7 @@ jobs:
         id: version
         run: |
           if [ "${GITHUB_REF##*/}" == "master" ]; then
-            echo "VERSION=3.0.0-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+            echo "VERSION=3.1.0-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
           else
             BRANCH_TO_DOCKER=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]//g')
             echo "VERSION=${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV

diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,5 @@ testem.log
 .DS_Store  
 Thumbs.db 
 /yaml-generation/vendor/
+# Generated YAML
+/src/assets/YAML/generated/generated.yaml
diff --git a/README.md b/README.md
@@ -62,11 +62,10 @@ In case you would like to perform a DevSecOps assessment, the following tools ar
 
 For customized DSOMM, take a look at https://github.com/wurstbrot/DevSecOps-MaturityModel-custom. In case you would like to have perform an assessment for multiple teams, iterate from port 8080 to 8XXX, depending of the size of your team.
 
-You can download your current state from the circular headmap and mount it again via `docker run  -p 8080:8080 -v /tmp/generated.yaml:/app/assets/YAML/generated/generated.yaml  wurstbrot/dsomm:latest`.
+You can download your current state from the circular headmap and mount it again via `docker run -p 8080:8080 -v /tmp/generated.yaml:/usr/share/nginx/html/assets/YAML/generated/generated.yaml wurstbrot/dsomm:latest`.
 
 This approach also allows teams to perform self assessment with changes tracked in a repository.
 
-
 ## Amazon EC2 Instance
 
 1. In the _EC2_ sidenav select _Instances_ and click _Launch Instance_

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/component/mapping/mapping.component.html b/src/app/component/mapping/mapping.component.html
@@ -49,8 +49,13 @@
           <mat-button-toggle
             value="sortByISO"
             (click)="changeTableBasedOnCurrentSort()"
-            >ISO</mat-button-toggle
+            >ISO 27001:2017</mat-button-toggle
           >
+          <mat-button-toggle
+          value="sortByISO22"
+          (click)="changeTableBasedOnCurrentSort()"
+          >ISO 27001:2022</mat-button-toggle
+        >
         </mat-button-toggle-group>
       </section>
     </div>
@@ -80,7 +85,7 @@
         <th mat-header-cell *matHeaderCellDef>SAMM</th>
         <td mat-cell *matCellDef="let element">{{ element.samm2 }}</td>
       </ng-container>
-      <ng-container *ngIf="currentlySortingByTask || currentlySortingByISO">
+      <ng-container *ngIf="currentlySortingByTask || currentlySortingByISO || currentlySortingByISO22">
         <th mat-header-cell *matHeaderCellDef>SAMM</th>
         <td mat-cell *matCellDef="let element">
           <ul>
@@ -94,12 +99,12 @@
 
     <ng-container matColumnDef="ISO">
       <ng-container *ngIf="currentlySortingByISO">
-        <th mat-header-cell *matHeaderCellDef>ISO</th>
+        <th mat-header-cell *matHeaderCellDef>ISO 27001:2017</th>
         <td mat-cell *matCellDef="let element">{{ element.ISO }}</td>
       </ng-container>
 
-      <ng-container *ngIf="currentlySortingByTask || currentlySortingBySAMM">
-        <th mat-header-cell *matHeaderCellDef>ISO</th>
+      <ng-container *ngIf="currentlySortingByTask || currentlySortingBySAMM || currentlySortingByISO22">
+        <th mat-header-cell *matHeaderCellDef>ISO 27001:2017</th>
         <td mat-cell *matCellDef="let element">
           <ul>
             <li *ngFor="let ISOElement of element.ISO">
@@ -110,6 +115,24 @@
       </ng-container>
     </ng-container>
 
+    <ng-container matColumnDef="ISO22">
+      <ng-container *ngIf="currentlySortingByISO22">
+        <th mat-header-cell *matHeaderCellDef>ISO 27001:2022</th>
+        <td mat-cell *matCellDef="let element">{{ element.ISO22 }}</td>
+      </ng-container>
+
+      <ng-container *ngIf="currentlySortingByTask || currentlySortingBySAMM || currentlySortingByISO">
+        <th mat-header-cell *matHeaderCellDef>ISO 27001:2022</th>
+        <td mat-cell *matCellDef="let element">
+          <ul>
+            <li *ngFor="let ISO22Element of element.ISO22">
+              {{ ISO22Element }}
+            </li>
+          </ul>
+        </td>
+      </ng-container>
+    </ng-container>
+
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
   </table>
@@ -132,26 +155,29 @@
       <th>Comments</th>
       <th>Depends On</th>
       <th>SAMM</th>
-      <th>ISO</th>
+      <th>ISO 27001:2017</th>
+      <th>ISO 27001:2022</th>
     </tr>
     <tr *ngFor="let item of allMappingDataSortedByISO">
-      <td>{{ item.dimension }}</td>
-      <td>{{ item.subDimension }}</td>
-      <td>{{ item.taskName }}</td>
-      <td>{{ item.description }}</td>
-      <td>{{ item.risk }}</td>
-      <td>{{ item.measure }}</td>
-      <td>{{ item.knowledge }}</td>
-      <td>{{ item.resources }}</td>
-      <td>{{ item.time }}</td>
-      <td>{{ item.usefulness }}</td>
-      <td>{{ item.implementation }}</td>
-      <td>{{ item.assessment }}</td>
-      <td>{{ item.evidence }}</td>
-      <td>{{ item.comments }}</td>
-      <td>{{ item.dependsOn }}</td>
-      <td>{{ item.samm2 }}</td>
-      <td>{{ item.ISO }}</td>
+      <!-- checking if item is defined and set & truncating at 32767 characters per cell to fit to excel limitations-->
+      <td><ng-container *ngIf="item.dimension && item.dimension.length>0"> {{ item.dimension | slice:0:32767 }}</ng-container></td> 
+      <td><ng-container *ngIf="item.subDimension && item.subDimension.length>0"> {{ item.subDimension | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.taskName && item.taskName.length>0"> {{ item.taskName | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.description && item.description.length>0"> {{ item.description | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.risk && item.risk.length>0"> {{ item.risk | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.measure && item.measure.length>0"> {{ item.measure | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.knowledge && item.knowledge.length>0"> {{ item.knowledge | slice:0:32767  }}</ng-container></td>
+      <td><ng-container *ngIf="item.resources && item.resources.length>0"> {{ item.resources | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.time && item.time.length>0"> {{ item.time | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.usefulness && item.usefulness.length>0"> {{ item.usefulness | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.implementation && item.implementation.length>0"> {{ item.implementation | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.assessment && item.assessment.length>0"> {{ item.assessment | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.evidence && item.evidence.length>0"> {{ item.evidence | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.comments && item.comments.length>0"> {{ item.comments | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.dependsOn && item.dependsOn.length>0"> {{ item.dependsOn | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.samm2 && item.samm2.length>0"> {{ item.samm2 | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.ISO && item.ISO.length>0"> {{ item.ISO | slice:0:32767 }}</ng-container></td>
+      <td><ng-container *ngIf="item.ISO22 && item.ISO22.length>0"> {{ item.ISO22 | slice:0:32767 }}</ng-container></td>
     </tr>
   </table>
 </div>