Push intermediate version of Stats3

Author: Jannled

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/config.py

@@ -20,6 +20,11 @@ def loadGameConfig(configName: str = "conf/gameConfig.json", instanceFolder: str
 	__gameConfig = GameConfig(instanceFolder=instanceFolder, configName=configName)
 
 
+def setGameConfig(config: GameConfig):
+	global __gameConfig
+	__gameConfig = config
+
+
 @functools.wraps(GameConfig.groups)
 def groups() -> Dict[str, Any]:
 	assert __gameConfig is not None

app/gameConfig.py

@@ -16,7 +16,7 @@
 
 # CONFIG Current Log File Version. 
 # NOTE Also change this in the Dockerfile
-LOGFILE_VERSION = "2.1.0" # Major.Milestone.Subversion
+LOGFILE_VERSION = "2.1.3" # Major.Milestone.Subversion
 
 PSEUDONYM_LENGTH = 32
 LEVEL_ENCODING = 'UTF-8' # was Windows-1252

app/model/Participant.py

@@ -855,8 +855,8 @@ def sessionState(self, timeStamp: int):
 		"""Called in the PreloadScene to determine if the game is already running or if this is the first session"""
 		self.logger.writeToLog(EventType.StartSession, '', timeStamp)
 
-		state = {
-			'scene': self.getPhaseName() if self.startedGame else 'not started',
+		state: dict[str, str] = {
+			'scene': self.getPhaseName() if self.startedGame else PhaseType.NotStarted,
 			'firstSession': 'yes' if self.packetIndex == 0 else 'no',
 		}
 

app/statistics3/GameStateValidator.py

@@ -5,3 +5,24 @@ class GameStateValidator:
 	"""
 
 	# TODO
+
+
+	def validate():
+		
+		# The phase from the game state
+		assert statsParticipant.phaseIdx is not None
+		gamestate_phase = player.phases[statsParticipant.phaseIdx]
+
+		# Check that the phase type matches what was shown during the game
+		if gamestate_phase.name != phaseType:
+			raise LogValidationError(f'{phaseType} does not match the gamestate {gamestate_phase.name}')
+
+		# Assert that a phase with levels really has levels
+		assert phaseType in PHASES_WITH_LEVELS and len(gamestate_phase.levels) > 0, (
+			f'Phase {phaseType} is expected to have no levels, but gameState has {len(gamestate_phase.levels)}'
+		)
+		
+		# Assert that a phase without levels really has no levels
+		assert phaseType not in PHASES_WITH_LEVELS and len(gamestate_phase.levels) < 1, (
+			f'Phase {phaseType} is expected to have levels, but gameState has 0'
+		)