Merge pull request #6 from emsec/dev

Fix
- [object Object] in crash reporter
- Pseuodnyms starting with 0 are discarded in crash reporter
- screenshots are taken too early before switch click is correctly rendered
- timeout not cleared for IntroduceElements and IntroduceDrawingTools
- skip button could be double clicked since clearing the tweens would cause the `setInteractive()` to be called early

Changes:
- new statistics parser (statistics3)
- refactor gameConfig to be a class instead of a module

Author: Jannled

.vscode/launch.json

@@ -57,7 +57,7 @@
 			}
 		},
 		{
-			"name": "Firefox & BurpProxy",
+			"name": "Firefox & Proxy",
 			"type": "firefox",
 			"request": "launch",
 			"reAttach": true,
@@ -66,19 +66,84 @@
 			"skipFiles": [
 				"static/src/externalLibraries/**"
 			],
-			"preferences": { // Burp Proxy
+			"preferences": { // Burp/mitmproxy etc.
 				"network.proxy.http": "127.0.0.1",
 				"network.proxy.http_port": 8080,
 				"network.proxy.type": 1,
 				"network.proxy.allow_hijacking_localhost": true
 			}
-		}
+		},
+		{
+			"name": "Statistics Generator",
+			"type": "debugpy",
+			"request": "launch",
+			"module": "app.statistics.statistics2",
+			"args": [
+				"${input:statsGroup}",
+				"--log",
+				"info",
+				"${input:skipScreenshots}",
+				"--allowDebug"
+			],
+			"env": {
+				"REVERSIM_INSTANCE": "${input:instancePath}"
+			},
+			"justMyCode": true,
+			"console": "integratedTerminal",
+		},
+		{
+			"name": "Statistics3",
+			"type": "debugpy",
+			"request": "launch",
+			"module": "app.statistics3.statistics3",
+			"args": [
+			],
+			"env": {
+				"REVERSIM_INSTANCE": "${input:instancePath}"
+			},
+			"justMyCode": true,
+			"console": "integratedTerminal",
+		},
 	],
 	"inputs": [
 		{
 			"id": "screenshotGeneratorPseudonym",
 			"description": "The pseudonym to generate the screenshots with. Create it by starting the game in a group with the level viewer.",
 			"type": "promptString"
-		}
+		},
+		{
+			"id": "statsGroup",
+			"description": "The script to be used to generate the csv file. \"app/statistics/csvGenerators/\"",
+			"type": "promptString",
+			"default": "paper"
+		},
+		{
+			"id": "statsFolder",
+			"description": "Select the folder containing the log files",
+			"type": "promptString",
+			"default": "instance/statistics"
+		},
+		{
+			"id": "skipScreenshots",
+			"type": "pickString",
+			"description": "Set this flag if the validation of the screenshots shall be skipped",
+			"default": "--skipScreenshots",
+			"options": [
+				"",
+				"--skipScreenshots"
+			]
+		},
+		{
+			"id": "configFile",
+			"description": "Select the gameConfig.json that was used for this group",
+			"type": "promptString",
+			"default": "instance/conf/gameConfig.json"
+		},
+		{
+			"id": "instancePath",
+			"description": "Select the instance folder that was used to launch the game",
+			"type": "promptString",
+			"default": "instance"
+		},
 	]
 }

.vscode/settings.json

@@ -41,7 +41,7 @@
 
 	// Syntax highlighting for Jinja templates
 	"files.associations": {
-		"**/templates/*.html": "jinja",
+		"**/templates/*.html": "jinja-html",
 		"**/logFile_*.txt": "log",
 	},
 
@@ -130,6 +130,7 @@
 		"gameplay",
 		"gamerule",
 		"gamerules",
+		"gamestate",
 		"getpid",
 		"gnds",
 		"graphviz",
@@ -156,6 +157,7 @@
 		"ipympl",
 		"ISDEBUGGROUP",
 		"itsdangerous",
+		"jquery",
 		"kaniko",
 		"keepends",
 		"kolloqskill",
@@ -184,6 +186,7 @@
 		"Nmbr",
 		"noopener",
 		"noreferrer",
+		"noscript",
 		"NOTREACHED",
 		"NOTSTARTED",
 		"nullable",
@@ -224,6 +227,7 @@
 		"splitted",
 		"sqlalchemy",
 		"sqlite",
+		"stylesheet",
 		"subfolders",
 		"Teilnehmer",
 		"thinkaloud",

Dockerfile

@@ -18,7 +18,7 @@ ARG PROMETHEUS_MULTIPROC_DIR="/tmp/prometheus_multiproc"
 MAINTAINER Max Planck Institute for Security and Privacy
 LABEL org.opencontainers.image.authors="Max Planck Institute for Security and Privacy"
 # NOTE Also change the version in config.py
-LABEL org.opencontainers.image.version="2.1.2"
+LABEL org.opencontainers.image.version="2.1.3"
 LABEL org.opencontainers.image.licenses="AGPL-3.0-only"
 LABEL org.opencontainers.image.description="Ready to deploy Docker container to use ReverSim for research. ReverSim is an open-source environment for the browser, originally developed at the Max Planck Institute for Security and Privacy (MPI-SP) to study human aspects in hardware reverse engineering."
 LABEL org.opencontainers.image.source="https://github.com/emsec/ReverSim"

app/authentication.py

@@ -4,7 +4,7 @@
 
 from flask_httpauth import HTTPTokenAuth  # type: ignore
 
-from app.config import BEARER_TOKEN_BYTES
+from app.gameConfig import BEARER_TOKEN_BYTES
 from app.model.ApiKey import ApiKey
 from app.storage.database import db
 from app.utilsGame import safe_join