Merge pull request #20 from tls-attacker/dev

Conradowatz · web-flow · commit a2ee668489d7 · 2025-05-07T13:03:25.000+02:00
Mergde dev into main
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+output
diff --git a/backend/openapi.yaml b/backend/openapi.yaml
@@ -744,6 +744,9 @@ components:
           items:
             $ref: '#/components/schemas/GuidelineReport'
           nullable: true
+        TlsScannerReport:
+          type: string
+          nullable: true
     SeverityLevel:
       type: string
       enum:
diff --git a/backend/src/database/models/report.ts b/backend/src/database/models/report.ts
@@ -33,6 +33,7 @@ export const ReportSchema = new Schema({
   AnvilConfig: String,
   AdditionalConfig: String,
   GuidelineReports: [GuidelineReportSchema],
+  TlsScannerReport: String,
   KeylogFile: Types.ObjectId
 }, {
   statics: {
diff --git a/backend/src/endpoints/UploadReportEndpoint.ts b/backend/src/endpoints/UploadReportEndpoint.ts
@@ -114,6 +114,11 @@ export namespace UploadReportEndpoint {
     if (guidelines) {
       report.GuidelineReports = JSON.parse(guidelines.getData().toString())
     }
+    // tls scanner report
+    const tlsScannerReport = zipFile.getEntry("tls-scanner.txt");
+    if (tlsScannerReport) {
+      report.TlsScannerReport = tlsScannerReport.getData().toString();
+    }
     // key log file
     const keylogfile = zipFile.getEntry("keyfile.log");
     if (keylogfile) {
diff --git a/backend/src/lib/data_types.ts b/backend/src/lib/data_types.ts
@@ -51,7 +51,8 @@ export interface IReport extends ITimestamp {
     Job?: IAnvilJob,
     AnvilConfig: string,
     AdditionalConfig: string,
-    GuidelineReports?: IGuidelineReport[]
+    GuidelineReports?: IGuidelineReport[],
+    TlsScannerReport: string
 }
 
 export interface ITestRunEdit {
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 volumes:
   mongodb_DB:
   mongodb_conf:
@@ -10,28 +8,31 @@ networks:
 services:
   mongo:
     image: mongo:5.0.6
-    restart: always
+    restart: unless-stopped
     volumes:
       - mongodb_DB:/data/db
       - mongodb_conf:/data/configdb
     networks: 
       - app
 
   app:
-    # image: ghcr.io/tls-attacker/anvil-web
-    image: anvil-web
-    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: unless-stopped
     environment:
       - PRODUCTION=1
     ports:
       - 5001:5001
     networks:
       - app
 
-  #worker:
-  #  # image: ghcr.io/tls-attacker/tlsanvil
+  worker:
+    image: ghcr.io/tls-attacker/tlsanvil:v1.2.9
   #  image: tls-anvil
-  #  restart: always
-  #  networks:
-  #    - app
-  #  command: ["worker", "-controller", "app:5001", "-name", "Docker Compose bundeled Worker"]
+    restart: always
+    networks:
+      - app
+    volumes:
+      - ./output:/output/
+    command: ["worker", "-controller", "app:5001", "-name", "Docker Compose bundeled Worker"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,39 +1,37 @@
-version: '3.7'
-
 volumes:
   mongodb_DB:
   mongodb_conf:
+  output:
 
 networks: 
   app:
 
 services:
   mongo:
     image: mongo:5.0.6
-    restart: always
+    restart: unless-stopped
     volumes:
       - mongodb_DB:/data/db
       - mongodb_conf:/data/configdb
     networks: 
       - app
 
   app:
-    image: ghcr.io/tls-attacker/anvil-web:v1.1.0
+    image: ghcr.io/tls-attacker/anvil-web:v1.1.2
     # image: anvil-web
-    restart: always
+    restart: unless-stopped
     environment:
       - PRODUCTION=1
     ports:
       - 5001:5001
     networks:
       - app
-
   worker:
-    image: ghcr.io/tls-attacker/tlsanvil:v1.2.7
+    image: ghcr.io/tls-attacker/tlsanvil:v1.2.9
     # image: tls-anvil
-    restart: always
+    restart: unless-stopped
     networks:
       - app
     volumes:
-      - output
+      - ./output:/output/
     command: ["worker", "-controller", "app:5001", "-name", "Docker Compose bundeled Worker"]
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@picocss/pico": "^1.5.10",
+    "ansi_up": "^6.0.2",
     "vue": "^3.3.4",
     "vue-router": "^4.2.5"
   },
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -16,7 +16,7 @@ import { RouterLink, RouterView } from 'vue-router'
   <!-- <header class="container-fluid">
     Test
   </header> -->
-  <main class="container">
+  <main class="container-fluid">
     <RouterView></RouterView>
   </main>
   <footer class="container-fluid">
diff --git a/frontend/src/components/ReportOverview.vue b/frontend/src/components/ReportOverview.vue
@@ -7,8 +7,8 @@
                         <h4>{{ report.Identifier }}</h4>
                         <div class="grid" style="margin-bottom: 10px;">
                             <span>Date: {{ $api.formatDate(report.Date+"") }}</span>
-                            <span>Elapsed Time: <template v-if="report.Running">{{ elapsedTime }}</template><template v-else>{{ $api.millisecondsToTime(report.ElapsedTime) }}</template></span>
-                            <span>Test Cases: {{ report.TestCaseCount }}</span>
+                            <span>Tests run: {{ report.FinishedTests }}</span>
+                            <span>Time elapsed: <template v-if="report.Running">{{ elapsedTime }}</template><template v-else>{{ $api.millisecondsToTime(report.ElapsedTime) }}</template></span>
                         </div>
                         <TestBar :disabledTests="report.DisabledTests" :succeededTests="report.StrictlySucceededTests+report.ConceptuallySucceededTests"
                             :failedTests="report.FullyFailedTests+report.PartiallyFailedTests" :errors="report.TestSuiteErrorTests"/>
diff --git a/frontend/src/components/TlsScannerModal.vue b/frontend/src/components/TlsScannerModal.vue
@@ -0,0 +1,37 @@
+<template>
+    <dialog open v-if="scannerReport">
+            <article>
+                <header>
+                <a href="" aria-label="Close" class="close" @click.prevent="$emit('close')"></a>
+                Tls Scanner Report
+                </header>
+                <main>
+                    <pre v-html="html"></pre>
+                </main>
+            </article>
+        </dialog>
+</template>
+
+<script lang="ts">
+import { AnsiUp } from "ansi_up";
+
+export default {
+    name: "TlsScannerModal",
+    props: ["scannerReport"],
+    emits: ["close"],
+    data() {
+        return {
+            html: new AnsiUp().ansi_to_html(this.scannerReport).replaceAll("\n", "<br>")
+        }
+    }
+}
+</script>
+
+<style scoped>
+article {
+    max-width: 1000px;
+}
+header {
+    margin-bottom: 1rem;
+}
+</style>
diff --git a/frontend/src/views/ControllerView.vue b/frontend/src/views/ControllerView.vue
diff --git a/frontend/src/views/ReportList.vue b/frontend/src/views/ReportList.vue
diff --git a/frontend/src/views/ReportView.vue b/frontend/src/views/ReportView.vue
diff --git a/frontend/src/views/TestRunView.vue b/frontend/src/views/TestRunView.vue

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ export interface IReport extends ITimestamp {`
`51`	`51`	`Job?: IAnvilJob,`
`52`	`52`	`AnvilConfig: string,`
`53`	`53`	`AdditionalConfig: string,`
`54`		`- GuidelineReports?: IGuidelineReport[]`
	`54`	`+ GuidelineReports?: IGuidelineReport[],`
	`55`	`+ TlsScannerReport: string`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`export interface ITestRunEdit {`