Corrected bug with port and delete the flag content in cheat monitor

Author: Jonathan

__init__.py

@@ -35,7 +35,7 @@
 PLUGIN_PATH = os.path.dirname(__file__)
 CONFIG = json.load(open("{}/config.json".format(PLUGIN_PATH)))
 
-directory_name = PLUGIN_PATH.split(os.sep)[-1]
+directory_name = PLUGIN_PATH.split(os.sep)[-1] # Get the directory name of this file
 
 red = Blueprint(directory_name, __name__, template_folder="templates")
 
@@ -84,28 +84,30 @@ def create(request):
         # Check if there is teams that are created
         teams = Teams.query.all()
         if len(teams) > 0:
+
+            # Get the last port used
+            last_container = Containers.query.order_by(Containers.port.desc()).first()
+            if last_container_port is None:
+                port = globals.PORT_CONTAINERS_START
+            else:
+                port = last_container.port + 1
+
             # For each team, create a flag and a container for the challenge
             for team in teams:
                 generated_flag = generate_flag()
 
-                # Get the last port used
-                last_container_port = Containers.query.order_by(Containers.port.desc()).first()
-                
-                if last_container_port is None:
-                    port = globals.PORT_CONTAINERS_START
-                else:
-                    port = last_container_port.port + 1
-
                 # Generate the container
                 container_name = create_docker_container(buildfile=buildfile, flag=generated_flag, port=port, challenge_name=challenge.name, team_id=team.id)
 
                 # Save the container in the database
                 container = Containers(name=container_name, port=port, dockerfile=buildfile, challengeid=challenge.id, teamid=team.id)
+                port += 1
                 db.session.add(container)
 
                 # Save the flag in the database
                 flag = Flags(challenge_id = challenge.id, type = "red_herring", content = generated_flag, data = team.id)
                 db.session.add(flag)
+                
 
             db.session.commit()
 

hooks.py

@@ -9,6 +9,14 @@ def on_team_create(mapper, conn, team):
     # When a team is created, create a new flag for each challenge that is a "red_herring" type
     red_herring_challenges = Challenges.query.filter_by(type="red_herring").all()
 
+    port = globals.PORT_CONTAINERS_START
+    if len(red_herring_challenges) != 0:
+
+        # Get the last port used
+        last_container = Containers.query.order_by(Containers.port.desc()).first()
+        if last_container is not None:
+            port = last_container.port + 1
+
     for challenge in red_herring_challenges:
         generated_flag = generate_flag()
 
@@ -17,14 +25,6 @@ def on_team_create(mapper, conn, team):
         db.session.add(flag)
 
         # Create the container
-        # Get the next port to use
-        last_container_port = Containers.query.order_by(Containers.port.desc()).first()
-        
-        if last_container_port is None:
-            port = globals.PORT_CONTAINERS_START
-        else:
-            port = last_container_port.port + 1
-
         # Get the buildfile of the challenge
         buildfile = challenge.dockerfile
 
@@ -33,6 +33,7 @@ def on_team_create(mapper, conn, team):
 
         # Save the container in the database
         container = Containers(name=container_name, port=port, dockerfile=buildfile, challengeid=challenge.id, teamid=team.id)
+        port += 1
         db.session.add(container)
 
 def load_hooks():

models.py

@@ -58,9 +58,6 @@ def shared_team_name(self):
 
     def challenge_name(self):
         return Challenges.query.filter_by(id=self.challengeid).first().name
-    
-    def flag_content(self):
-        return Flags.query.filter_by(id=self.flagid).first().content
 
 class Containers(db.Model):
     id = db.Column(db.Integer, primary_key=True)

templates/red_herring.html

@@ -19,7 +19,6 @@ <h1>RedHerring - Cheat Monitor</h1>
                             <td scope="col"><b>Challenge</b></td>
                             <td scope="col"><b>Cheat Team</b></td>
                             <td scope="col"><b>Sharer Team</b></td>
-                            <td scope="col"><b>Flag shared</b></td>
                             <td scope="col"><b>Date</b></td>
                         </tr>
                     </thead>
@@ -30,7 +29,6 @@ <h1>RedHerring - Cheat Monitor</h1>
                             <td><a href="{{ request.script_root }}/admin/challenges/{{ cheater.challengeid }}">{{ cheater.challenge_name() }}</a></td>
                             <td><a href="{{ request.script_root }}/teams/{{ cheater.cheatteamid }}">{{ cheater.cheated_team_name() }}</a></td>
                             <td><a href="{{ request.script_root }}/teams/{{ cheater.sharerteamid }}">{{ cheater.shared_team_name() }}</a></td>
-                            <td>{{ cheater.flag_content() }}</td>
                             <td>{{ cheater.date}}</td>
                         </tr>
                     {% endfor %}