Merge branch 'update/upstream'

Update/upstream

See merge request Klagarge/mse2425-grp09!6

docs/questions-part3.md

@@ -0,0 +1,10 @@
+# Questions
+
+## Part 3
+
+- **Q3.1**: Setup your CI/CD pipeline with an additional SAST solution. I propose that you use `semgrep` for this task. Get your inspiration here: https://semgrep.dev/for/gitlab and https://docs.gitlab.com/ee/user/application_security/sast/ 
+- **Q3.2**: Describe the found problems (alerts) in the `calculator app` (in the original code, git tag `v3.0`)
+- **Q3.3**: Install DAST OWASP ZAP on your host or in a Docker. Play with OWASP ZAP, analyze the calculator code
+- **Q3.4**: Implement a DAST solution in your pipeline. Get some inspiration here https://docs.gitlab.com/ee/user/application_security/dast/ . Describe what you have integrated in your pipeline. *Note: you must ensure that your application is running while you are testing!*
+- **Q3.5 (optional)**: Normally, the provided code has some bugs, which are discovered by SAST solution. Describe the found bugs (in the original code, git tag `v3.0`) and provide solution to remediate the problems. Indicate which commit/tag contains the corrected code
+- **Q3.6 (optional)**: Describe the found bugs (in the original code, git tag `v3.0`) with DAST and provide solution to remediate the problems. Indicate which commit/tag contains the corrected code. Do corrections only in the provided code (no libraries)

misc/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  nginx:
+    ports:
+      - "80:80"
+    container_name: nginx-1.20.0
+    image: nginx:1.20.0
+    volumes:
+      - .:/usr/share/nginx/html:ro
+

misc/index.html

@@ -1 +1 @@
-Hello
+<h1>Hello class, TSM_Cybersec</h1>

misc/start_juiceshop.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker run --rm -p 3000:3000 bkimminich/juice-shop
+