From 75877210da42214dbe1e1541bb8b6c0370042e8a Mon Sep 17 00:00:00 2001
From: mostwanted002 <mayankmalik012@gmail.com>
Date: Sat, 27 Jul 2019 22:44:18 +0530
Subject: [PATCH 01/11] Added User and Root Submission IP Column in Database

---
 .idea/RTB-CTF-Framework.iml        |  13 +
 .idea/libraries/R_User_Library.xml |   6 +
 .idea/misc.xml                     |   7 +
 .idea/modules.xml                  |   8 +
 .idea/vcs.xml                      |   6 +
 .idea/workspace.xml                | 365 +++++++++++++++++++++++++++++
 src/FlaskRTBCTF/ctf/routes.py      |   4 +-
 src/FlaskRTBCTF/models.py          |   3 +
 8 files changed, 411 insertions(+), 1 deletion(-)
 create mode 100644 .idea/RTB-CTF-Framework.iml
 create mode 100644 .idea/libraries/R_User_Library.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/RTB-CTF-Framework.iml b/.idea/RTB-CTF-Framework.iml
new file mode 100644
index 0000000..fb33410
--- /dev/null
+++ b/.idea/RTB-CTF-Framework.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (RTB-Framework)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="R User Library" level="project" />
+    <orderEntry type="library" name="R Skeletons" level="application" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/libraries/R_User_Library.xml b/.idea/libraries/R_User_Library.xml
new file mode 100644
index 0000000..71f5ff7
--- /dev/null
+++ b/.idea/libraries/R_User_Library.xml
@@ -0,0 +1,6 @@
+<component name="libraryTable">
+  <library name="R User Library">
+    <CLASSES />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..aed3892
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (RTB-Framework)" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..af82055
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" filepath="$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..d251d67
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/main/routes.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#44#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="225">
+              <caret line="78" column="64" selection-start-line="78" selection-start-column="64" selection-end-line="78" selection-end-column="64" />
+              <folding>
+                <element signature="e#24#75#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/create_db.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/run.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/config.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-120">
+              <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+              <folding>
+                <element signature="e#0#9#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/docker-entrypoint.sh">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/docker-compose.yml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Dockerfile">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-408">
+              <folding>
+                <element signature="e#0#23#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/models.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="91">
+              <caret line="51" column="42" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
+              <folding>
+                <element signature="e#16#45#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" />
+        <option value="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectConfigurationFiles">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" />
+        <option value="$PROJECT_DIR$/.idea/misc.xml" />
+        <option value="$PROJECT_DIR$/.idea/modules.xml" />
+        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
+        <option value="$PROJECT_DIR$/.idea/libraries/R_User_Library.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="10" />
+    <option name="y" value="42" />
+    <option name="width" value="1346" />
+    <option name="height" value="706" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="FlaskRTBCTF" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="FlaskRTBCTF" type="462c0819:PsiDirectoryNode" />
+              <item name="ctf" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="" />
+      <created>1564236883086</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1564236883086</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="20" width="1366" height="748" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Python Console" weight="0.32838285" />
+      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.32838285" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="R Packages" />
+      <window_info anchor="right" id="R Graphics" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py</url>
+          <line>2</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/admin/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#27#50#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/utils.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/forms.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/templates/machine.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-405" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/forms.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/routes.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#79#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/main/routes.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#44#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/create_db.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/run.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/docker-entrypoint.sh">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-408">
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docker-compose.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Dockerfile">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/config.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-120">
+          <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="91">
+          <caret line="51" column="42" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
+          <folding>
+            <element signature="e#16#45#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="78" column="64" selection-start-line="78" selection-start-column="64" selection-end-line="78" selection-end-column="64" />
+          <folding>
+            <element signature="e#24#75#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/FlaskRTBCTF/ctf/routes.py b/src/FlaskRTBCTF/ctf/routes.py
index fc2cdb1..0a8f912 100644
--- a/src/FlaskRTBCTF/ctf/routes.py
+++ b/src/FlaskRTBCTF/ctf/routes.py
@@ -1,6 +1,6 @@
 ''' views / routes '''
 
-from flask import Blueprint, render_template, flash
+from flask import Blueprint, render_template, flash, request
 from flask_login import current_user, login_required
 from FlaskRTBCTF import db, bcrypt
 from FlaskRTBCTF.models import User, Score
@@ -50,6 +50,7 @@ def validateRootHash():
                 score.rootHash = True
                 score.points += rootScore
                 score.timestamp = datetime.utcnow()
+                score.rootSubmissionIP = request.access_route[0]
                 db.session.commit()
                 flash("Congrats! correct system hash.", "success")
         else:
@@ -75,6 +76,7 @@ def validateUserHash():
                 score.userHash = True
                 score.points += userScore
                 score.timestamp = datetime.utcnow()
+                score.userSubmissionIP = request.access_route[0]
                 db.session.commit()
                 flash("Congrats! correct user hash.", "success")
         else:
diff --git a/src/FlaskRTBCTF/models.py b/src/FlaskRTBCTF/models.py
index b2265cb..102b9c1 100644
--- a/src/FlaskRTBCTF/models.py
+++ b/src/FlaskRTBCTF/models.py
@@ -1,6 +1,7 @@
 ''' Models '''
 
 from flask import current_app
+from flask import request
 from FlaskRTBCTF import db, login_manager
 from flask_login import UserMixin
 from datetime import datetime
@@ -47,6 +48,8 @@ class Score(db.Model):
     rootHash = db.Column(db.Boolean, default=False)
     points = db.Column(db.Integer)
     timestamp = db.Column(db.DateTime(), default=datetime.utcnow)
+    rootSubmissionIP = db.Column(db.String)
+    userSubmissionIP = db.Column(db.String)
 
     def __repr__(self):
         return f"Score('{self.user_id}', '{self.points}')"

From 8fc6dc185e3ced52b845e4472c5598ce40e1e946 Mon Sep 17 00:00:00 2001
From: mostwanted002 <mayankmalik012@gmail.com>
Date: Sat, 27 Jul 2019 22:50:01 +0530
Subject: [PATCH 02/11] Added User and Root Submission IP Column in Database

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fc5e901..5258d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ venv/
 *.pyc
 .vscode/
 *.db
+.idea/

From f19e046019c8ae0e65afbab2ecfe5688ce49173f Mon Sep 17 00:00:00 2001
From: mostwanted002 <mayankmalik012@gmail.com>
Date: Sat, 27 Jul 2019 23:02:02 +0530
Subject: [PATCH 03/11] Added User and Root Submission IP Column in Database

---
 .idea/workspace.xml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d251d67..a79a8ed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" afterDir="false" />
-    </list>
+    <list default="true" id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -27,8 +24,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="78" column="64" selection-start-line="78" selection-start-column="64" selection-end-line="78" selection-end-column="64" />
+            <state relative-caret-position="315">
+              <caret line="84" column="89" lean-forward="true" selection-start-line="84" selection-start-column="89" selection-end-line="84" selection-end-column="89" />
               <folding>
                 <element signature="e#24#75#0" expanded="true" />
               </folding>
@@ -111,6 +108,19 @@
         <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
+    <favorite-branches>
+      <branch-storage>
+        <map>
+          <entry type="LOCAL">
+            <value>
+              <list>
+                <branch-info repo="$PROJECT_DIR$" source="v1.1alpha" />
+              </list>
+            </value>
+          </entry>
+        </map>
+      </branch-storage>
+    </favorite-branches>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -175,6 +185,7 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RunDashboard">
@@ -207,12 +218,12 @@
     <editor active="true" />
     <layout>
       <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Version Control" />
       <window_info anchor="bottom" id="Python Console" weight="0.32838285" />
-      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.32838285" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" sideWeight="0.49924242" visible="true" weight="0.32838285" />
+      <window_info active="true" anchor="bottom" id="Event Log" sideWeight="0.5007576" side_tool="true" visible="true" weight="0.32838285" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -353,8 +364,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="78" column="64" selection-start-line="78" selection-start-column="64" selection-end-line="78" selection-end-column="64" />
+        <state relative-caret-position="315">
+          <caret line="84" column="89" lean-forward="true" selection-start-line="84" selection-start-column="89" selection-end-line="84" selection-end-column="89" />
           <folding>
             <element signature="e#24#75#0" expanded="true" />
           </folding>

From adc459b22f1da497d15eed79880dc9b609ecca13 Mon Sep 17 00:00:00 2001
From: mostwanted002 <mayankmalik012@gmail.com>
Date: Sat, 27 Jul 2019 23:04:52 +0530
Subject: [PATCH 04/11] Added User and Root Submission IP Column in Database

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fa4ca42..67a7d6e 100644
--- a/README.md
+++ b/README.md
@@ -98,3 +98,4 @@ Please see: [issues](https://github.com/abs0lut3pwn4g3/RTB-CTF-Framework/issues)
 <img src="screenshots/home_ss.png" width=400 />
 <img src="screenshots/scoreboard_ss.png" width=400 />
 <img src="screenshots/machine_ss.png" width=400 />
+

From 5a3a0846411eb09b2f0395480c070b64ec2ffa95 Mon Sep 17 00:00:00 2001
From: mostwanted002 <mayankmalik012@gmail.com>
Date: Mon, 29 Jul 2019 16:23:49 +0530
Subject: [PATCH 05/11] Completed Logging Implementation.

---
 src/FlaskRTBCTF/__init__.py     |  6 +++++-
 src/FlaskRTBCTF/admin/views.py  |  2 +-
 src/FlaskRTBCTF/config.py       |  5 ++++-
 src/FlaskRTBCTF/ctf/routes.py   | 23 ++++++++++++++++++++---
 src/FlaskRTBCTF/models.py       | 27 ++++++++++++++++++++++++---
 src/FlaskRTBCTF/users/routes.py | 11 +++++++++--
 src/create_db.py                |  3 ++-
 src/docker-entrypoint.sh        |  2 +-
 src/run.py                      |  1 +
 9 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/src/FlaskRTBCTF/__init__.py b/src/FlaskRTBCTF/__init__.py
index ad58ca5..9b3f049 100644
--- a/src/FlaskRTBCTF/__init__.py
+++ b/src/FlaskRTBCTF/__init__.py
@@ -4,7 +4,7 @@
 from flask_login import LoginManager
 from flask_admin import Admin
 from flask_mail import Mail
-from FlaskRTBCTF.config import Config
+from FlaskRTBCTF.config import Config, LOGGING
 import os
 
 db = SQLAlchemy()
@@ -26,9 +26,13 @@ def create_app(config_class=Config):
 	# Add model views
 	from FlaskRTBCTF.admin.views import MyModelView
 	from FlaskRTBCTF.models import User, Score, Notification
+	if LOGGING:
+		from FlaskRTBCTF.models import Logs
 	admin_manager.add_view(MyModelView(User, db.session))
 	admin_manager.add_view(MyModelView(Score, db.session))
 	admin_manager.add_view(MyModelView(Notification, db.session))
+	if LOGGING:
+		admin_manager.add_view(MyModelView(Logs, db.session))
 	mail.init_app(app)
 
 	from flask_sslify import SSLify
diff --git a/src/FlaskRTBCTF/admin/views.py b/src/FlaskRTBCTF/admin/views.py
index 3f223d2..39f180e 100644
--- a/src/FlaskRTBCTF/admin/views.py
+++ b/src/FlaskRTBCTF/admin/views.py
@@ -27,4 +27,4 @@ def _handle_view(self, name, **kwargs):
                 abort(403)
             #else:
                 # login
-            #    return redirect(url_for('user.login', next=request.url))
\ No newline at end of file
+            #    return redirect(url_for('user.login', next=request.url))
diff --git a/src/FlaskRTBCTF/config.py b/src/FlaskRTBCTF/config.py
index 01e7b06..4d9d71b 100644
--- a/src/FlaskRTBCTF/config.py
+++ b/src/FlaskRTBCTF/config.py
@@ -61,4 +61,7 @@ class Config:
 userScore = 10
 rootScore = 20
 
-# NOTE: CHANGE DEFAULT ADMIN CREDENTIALS in create_db.py !!!
\ No newline at end of file
+# Logging: Set to 'True' to enable Logging in Admin Views
+
+LOGGING = False
+# NOTE: CHANGE DEFAULT ADMIN CREDENTIALS in create_db.py !!!
diff --git a/src/FlaskRTBCTF/ctf/routes.py b/src/FlaskRTBCTF/ctf/routes.py
index 0a8f912..8265acf 100644
--- a/src/FlaskRTBCTF/ctf/routes.py
+++ b/src/FlaskRTBCTF/ctf/routes.py
@@ -3,9 +3,11 @@
 from flask import Blueprint, render_template, flash, request
 from flask_login import current_user, login_required
 from FlaskRTBCTF import db, bcrypt
+from FlaskRTBCTF.config import organization, box, userHash, rootHash, userScore, rootScore, LOGGING
 from FlaskRTBCTF.models import User, Score
+if LOGGING:
+    from FlaskRTBCTF.models import Logs
 from FlaskRTBCTF.ctf.forms import UserHashForm, RootHashForm
-from FlaskRTBCTF.config import organization, box, userHash, rootHash, userScore, rootScore
 from datetime import datetime
 
 ctf = Blueprint('ctf', __name__)
@@ -29,6 +31,13 @@ def scoreboard():
 @ctf.route("/machine")
 @login_required
 def machine():
+    user = User.query.get(current_user.id)
+    if user.visitedMachine is False and user.isAdmin is False:
+        user.visitedMachine = True
+        if LOGGING:
+            log = Logs.query.get(current_user.id)
+            log.machineVisitTime = datetime.utcnow()
+        db.session.commit()
     userHashForm = UserHashForm()
     rootHashForm = RootHashForm()
     return render_template('machine.html', userHashForm=userHashForm,
@@ -50,7 +59,11 @@ def validateRootHash():
                 score.rootHash = True
                 score.points += rootScore
                 score.timestamp = datetime.utcnow()
-                score.rootSubmissionIP = request.access_route[0]
+                if LOGGING:
+                    log = Logs.query.get(current_user.id)
+                    log.rootSubmissionIP = request.access_route[0]
+                    log.rootSubmissionTime = datetime.utcnow()
+                    log.rootOwnTime = str(log.rootSubmissionTime - log.machineVisitTime)
                 db.session.commit()
                 flash("Congrats! correct system hash.", "success")
         else:
@@ -76,7 +89,11 @@ def validateUserHash():
                 score.userHash = True
                 score.points += userScore
                 score.timestamp = datetime.utcnow()
-                score.userSubmissionIP = request.access_route[0]
+                if LOGGING:
+                    log = Logs.query.get(current_user.id)
+                    log.userSubmissionIP = request.access_route[0]
+                    log.userSubmissionTime = datetime.utcnow()
+                    log.userOwnTime = str(log.userSubmissionTime - log.machineVisitTime)
                 db.session.commit()
                 flash("Congrats! correct user hash.", "success")
         else:
diff --git a/src/FlaskRTBCTF/models.py b/src/FlaskRTBCTF/models.py
index 102b9c1..c72516c 100644
--- a/src/FlaskRTBCTF/models.py
+++ b/src/FlaskRTBCTF/models.py
@@ -1,7 +1,7 @@
 ''' Models '''
 
 from flask import current_app
-from flask import request
+from FlaskRTBCTF.config import LOGGING
 from FlaskRTBCTF import db, login_manager
 from flask_login import UserMixin
 from datetime import datetime
@@ -20,7 +20,10 @@ class User(db.Model, UserMixin):
     password = db.Column(db.String(60), nullable=False)
     confirmed_at = db.Column(db.DateTime(), default=datetime.utcnow)
     isAdmin = db.Column(db.Boolean, default=False)
+    visitedMachine = db.Column(db.Boolean, default=False)
     score = db.relationship('Score', backref='user', lazy=True, uselist=False)
+    if LOGGING:
+        logs = db.relationship('Logs', backref='user', lazy=True, uselist=False)
 
     def get_reset_token(self, expires_sec=1800):
         s = Serializer(current_app.config['SECRET_KEY'], expires_sec)
@@ -48,8 +51,7 @@ class Score(db.Model):
     rootHash = db.Column(db.Boolean, default=False)
     points = db.Column(db.Integer)
     timestamp = db.Column(db.DateTime(), default=datetime.utcnow)
-    rootSubmissionIP = db.Column(db.String)
-    userSubmissionIP = db.Column(db.String)
+
 
     def __repr__(self):
         return f"Score('{self.user_id}', '{self.points}')"
@@ -65,3 +67,22 @@ class Notification(db.Model):
 
     def __repr__(self):
         return f"Notif('{self.title}', '{self.body}')"
+
+
+''' Logging Table '''
+if LOGGING:
+    class Logs(db.Model):
+        user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False, primary_key=True)
+        accountCreationTime = db.Column(db.DateTime, nullable=False)
+        machineVisitTime = db.Column(db.DateTime, nullable=True)
+        userSubmissionTime = db.Column(db.DateTime, nullable=True)
+        rootSubmissionTime = db.Column(db.DateTime, nullable=True)
+        userOwnTime = db.Column(db.String, nullable=True)
+        rootOwnTime = db.Column(db.String, nullable=True)
+        userSubmissionIP = db.Column(db.String, nullable=True)
+        rootSubmissionIP = db.Column(db.String, nullable=True)
+
+        def __repr__(self):
+            return f"Logs('{self.user_id}','{self.machineVisitTime}','{self.userSubmissionTime}'," \
+                f"'{self.rootSubmissionTime}','{self.userOwnTime}','{self.rootOwnTime}','{self.userSubmissionIP}," \
+                f" '{self.rootSubmissionIP}'"
diff --git a/src/FlaskRTBCTF/users/routes.py b/src/FlaskRTBCTF/users/routes.py
index 2749ee3..5a15afd 100644
--- a/src/FlaskRTBCTF/users/routes.py
+++ b/src/FlaskRTBCTF/users/routes.py
@@ -1,11 +1,14 @@
 from flask import render_template, url_for, flash, redirect, request, Blueprint
 from flask_login import login_user, current_user, logout_user, login_required
 from FlaskRTBCTF import db, bcrypt
+from FlaskRTBCTF.config import organization, LOGGING
+from datetime import datetime
 from FlaskRTBCTF.models import User, Score
+if LOGGING:
+    from FlaskRTBCTF.models import Logs
 from FlaskRTBCTF.users.forms import (RegistrationForm, LoginForm, UpdateAccountForm,
                                    RequestResetForm, ResetPasswordForm)
 from FlaskRTBCTF.users.utils import send_reset_email
-from FlaskRTBCTF.config import organization
 
 users = Blueprint('users', __name__)
 
@@ -21,8 +24,12 @@ def register():
         hashed_password = bcrypt.generate_password_hash(
             form.password.data).decode('utf-8')
         user = User(username=form.username.data,
-                    email=form.email.data, password=hashed_password)
+                    email=form.email.data, password=hashed_password, visitedMachine=False)
         score = Score(user=user, userHash=False, rootHash=False, points=0)
+        if LOGGING:
+            log = Logs(user=user, accountCreationTime=datetime.utcnow(), machineVisitTime=None, userSubmissionTime=None,
+                       rootSubmissionTime=None, userSubmissionIP=None, rootSubmissionIP=None)
+            db.session.add(log)
         db.session.add(user)
         db.session.add(score)
         db.session.commit()
diff --git a/src/create_db.py b/src/create_db.py
index 32fbde0..00e4c3d 100644
--- a/src/create_db.py
+++ b/src/create_db.py
@@ -16,7 +16,8 @@
         email='admin@admin.com',
         password=bcrypt.generate_password_hash('admin').decode('utf-8'),
         confirmed_at=datetime.datetime.now(),
-        isAdmin = True
+        isAdmin = True,
+        visitedMachine = True
     )
     admin_score = Score(user=admin_user, userHash=False, rootHash=False, points=0)
     db.session.add(admin_user)
diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh
index 7514fcc..eedd1f1 100644
--- a/src/docker-entrypoint.sh
+++ b/src/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 
 WORKERS=4 # change here to the change number of workers
 
-echo "Starting CTFd"
+echo "Starting RTB-CTFd"
 exec gunicorn 'FlaskRTBCTF:create_app()' \
     --bind '0.0.0.0:8080' \
     --workers $WORKERS
\ No newline at end of file
diff --git a/src/run.py b/src/run.py
index e4a715c..ab1cfcf 100644
--- a/src/run.py
+++ b/src/run.py
@@ -1,5 +1,6 @@
 from FlaskRTBCTF import create_app
 
+
 app = create_app()
 
 if __name__ == '__main__':

From e05338ecc213033863c1d37891a164974a576202 Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 13:58:54 +0530
Subject: [PATCH 06/11] Logging errors fixed, Finalized #7

---
 src/FlaskRTBCTF/config.py       | 13 +++++++------
 src/FlaskRTBCTF/ctf/routes.py   | 10 +++++-----
 src/FlaskRTBCTF/models.py       |  7 +++----
 src/FlaskRTBCTF/users/routes.py |  7 ++++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/FlaskRTBCTF/config.py b/src/FlaskRTBCTF/config.py
index 4d9d71b..f6da71e 100644
--- a/src/FlaskRTBCTF/config.py
+++ b/src/FlaskRTBCTF/config.py
@@ -39,10 +39,10 @@ class Config:
 # Specify CTFs Running Time
 
 RunningTime = { 
-    "from": datetime(2019,7,7,15,00,00,0, pytz.timezone('Asia/Calcutta')), 
-    "to": datetime(2019,7,8,0,00,00,0, pytz.timezone('Asia/Calcutta')), 
-    "TimeZone": "IST"
-} # Use `pytz.utc` for UTC timezone
+    "from": datetime(2019,7,7,15,00,00,0, pytz.utc), 
+    "to": datetime(2019,7,8,0,00,00,0, pytz.utc), 
+    "TimeZone": "UTC"
+} # We do not recommended changing the Timezone.
 
 # Specify Your Pwnable Box/Machine settings
 
@@ -61,7 +61,8 @@ class Config:
 userScore = 10
 rootScore = 20
 
-# Logging: Set to 'True' to enable Logging in Admin Views
+# Logging: Set to 'True' to enable Logging in Admin Views.
+
+LOGGING = True # We recommend to leave it on.
 
-LOGGING = False
 # NOTE: CHANGE DEFAULT ADMIN CREDENTIALS in create_db.py !!!
diff --git a/src/FlaskRTBCTF/ctf/routes.py b/src/FlaskRTBCTF/ctf/routes.py
index 8265acf..7cd12de 100644
--- a/src/FlaskRTBCTF/ctf/routes.py
+++ b/src/FlaskRTBCTF/ctf/routes.py
@@ -32,12 +32,12 @@ def scoreboard():
 @login_required
 def machine():
     user = User.query.get(current_user.id)
-    if user.visitedMachine is False and user.isAdmin is False:
-        user.visitedMachine = True
-        if LOGGING:
-            log = Logs.query.get(current_user.id)
+    if LOGGING:
+        log = Logs.query.get(current_user.id)
+        if log.visitedMachine is False:
+            log.visitedMachine = True
             log.machineVisitTime = datetime.utcnow()
-        db.session.commit()
+            db.session.commit()
     userHashForm = UserHashForm()
     rootHashForm = RootHashForm()
     return render_template('machine.html', userHashForm=userHashForm,
diff --git a/src/FlaskRTBCTF/models.py b/src/FlaskRTBCTF/models.py
index c72516c..cb83580 100644
--- a/src/FlaskRTBCTF/models.py
+++ b/src/FlaskRTBCTF/models.py
@@ -18,9 +18,7 @@ class User(db.Model, UserMixin):
     username = db.Column(db.String(40), unique=True, nullable=False)
     email = db.Column(db.String(120), unique=True, nullable=False)
     password = db.Column(db.String(60), nullable=False)
-    confirmed_at = db.Column(db.DateTime(), default=datetime.utcnow)
     isAdmin = db.Column(db.Boolean, default=False)
-    visitedMachine = db.Column(db.Boolean, default=False)
     score = db.relationship('Score', backref='user', lazy=True, uselist=False)
     if LOGGING:
         logs = db.relationship('Logs', backref='user', lazy=True, uselist=False)
@@ -39,7 +37,7 @@ def verify_reset_token(token):
         return User.query.get(user_id)
 
     def __repr__(self):
-        return f"User('{self.username}', '{self.email}') | Score('{self.score}')"
+        return f"User('{self.username}', '{self.email}'))"
 
 
 ''' Score Table '''
@@ -52,7 +50,6 @@ class Score(db.Model):
     points = db.Column(db.Integer)
     timestamp = db.Column(db.DateTime(), default=datetime.utcnow)
 
-
     def __repr__(self):
         return f"Score('{self.user_id}', '{self.points}')"
 
@@ -70,10 +67,12 @@ def __repr__(self):
 
 
 ''' Logging Table '''
+
 if LOGGING:
     class Logs(db.Model):
         user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False, primary_key=True)
         accountCreationTime = db.Column(db.DateTime, nullable=False)
+        visitedMachine = db.Column(db.Boolean, default=False)
         machineVisitTime = db.Column(db.DateTime, nullable=True)
         userSubmissionTime = db.Column(db.DateTime, nullable=True)
         rootSubmissionTime = db.Column(db.DateTime, nullable=True)
diff --git a/src/FlaskRTBCTF/users/routes.py b/src/FlaskRTBCTF/users/routes.py
index 5a15afd..ab633ce 100644
--- a/src/FlaskRTBCTF/users/routes.py
+++ b/src/FlaskRTBCTF/users/routes.py
@@ -2,7 +2,6 @@
 from flask_login import login_user, current_user, logout_user, login_required
 from FlaskRTBCTF import db, bcrypt
 from FlaskRTBCTF.config import organization, LOGGING
-from datetime import datetime
 from FlaskRTBCTF.models import User, Score
 if LOGGING:
     from FlaskRTBCTF.models import Logs
@@ -10,6 +9,8 @@
                                    RequestResetForm, ResetPasswordForm)
 from FlaskRTBCTF.users.utils import send_reset_email
 
+from datetime import datetime
+
 users = Blueprint('users', __name__)
 
 ''' User management '''
@@ -24,10 +25,10 @@ def register():
         hashed_password = bcrypt.generate_password_hash(
             form.password.data).decode('utf-8')
         user = User(username=form.username.data,
-                    email=form.email.data, password=hashed_password, visitedMachine=False)
+                    email=form.email.data, password=hashed_password)
         score = Score(user=user, userHash=False, rootHash=False, points=0)
         if LOGGING:
-            log = Logs(user=user, accountCreationTime=datetime.utcnow(), machineVisitTime=None, userSubmissionTime=None,
+            log = Logs(user=user, accountCreationTime=datetime.utcnow(), visitedMachine=False, machineVisitTime=None, userSubmissionTime=None,
                        rootSubmissionTime=None, userSubmissionIP=None, rootSubmissionIP=None)
             db.session.add(log)
         db.session.add(user)

From fc490f38febb2d0773503a3cd5a2ba391e93d8ba Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 13:59:10 +0530
Subject: [PATCH 07/11] Logging related errors fixed | #7

---
 src/create_db.py | 77 ++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/create_db.py b/src/create_db.py
index 00e4c3d..ae3af96 100644
--- a/src/create_db.py
+++ b/src/create_db.py
@@ -1,43 +1,48 @@
-import datetime
+from datetime import datetime
 
 from FlaskRTBCTF import create_app, db, bcrypt
-from FlaskRTBCTF.models import User, Score, Notification
-from FlaskRTBCTF.config import organization
+from FlaskRTBCTF.models import User, Score, Notification, Logs
+from FlaskRTBCTF.config import organization, LOGGING
 
 app = create_app()
 
 # create_app().app_context().push()
 with app.app_context():
-    db.create_all()
-
-    # NOTE: CHANGE DEFAULT CREDENTIALS !!!
-    admin_user = User(
-        username='admin',
-        email='admin@admin.com',
-        password=bcrypt.generate_password_hash('admin').decode('utf-8'),
-        confirmed_at=datetime.datetime.now(),
-        isAdmin = True,
-        visitedMachine = True
-    )
-    admin_score = Score(user=admin_user, userHash=False, rootHash=False, points=0)
-    db.session.add(admin_user)
-    db.session.add(admin_score)
-
-    notif = Notification(
-        title=f"Welcome to {organization['ctfname']}",
-        body = "The CTF is live now. Please read rules!"
-    )
-    db.session.add(notif)
-
-    '''    
-    test = User(
-        username='test',
-        email='test@test.com',
-        password=bcrypt.generate_password_hash('test').decode('utf-8'),
-    )
-    testscore = Score(user=test, userHash=False, rootHash=False, points=0)
-    db.session.add(test)
-    db.session.add(testscore)
-    '''
-
-    db.session.commit()
+	db.create_all()
+
+	default_time = datetime.utcnow()
+
+	# NOTE: CHANGE DEFAULT CREDENTIALS !!!
+	admin_user = User(
+		username='admin',
+		email='admin@admin.com',
+		password=bcrypt.generate_password_hash('admin').decode('utf-8'),
+		isAdmin = True
+	)
+	admin_score = Score(user=admin_user, userHash=False, rootHash=False, points=0)
+	db.session.add(admin_user)
+	db.session.add(admin_score)
+
+	notif = Notification(
+		title=f"Welcome to {organization['ctfname']}",
+		body = "The CTF is live now. Please read rules!"
+	)
+	db.session.add(notif)
+
+	test_user = User(
+		username='test',
+		email='test@test.com',
+		password=bcrypt.generate_password_hash('test').decode('utf-8')
+	)
+	test_score = Score(user=test_user, userHash=False, rootHash=False, points=0)
+	db.session.add(test_user)
+	db.session.add(test_score)
+	
+	if LOGGING:
+		admin_log = Logs(user=admin_user, accountCreationTime=default_time, 
+							visitedMachine=True, machineVisitTime=default_time)
+		db.session.add(admin_log)
+		test_log = Logs(user=test_user, accountCreationTime=default_time)
+		db.session.add(test_log)
+
+	db.session.commit()

From 36b19c8a70f8c56d574c9581d824f1d2eb5bdcd3 Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 13:59:23 +0530
Subject: [PATCH 08/11] name typo

---
 src/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh
index eedd1f1..a10f345 100644
--- a/src/docker-entrypoint.sh
+++ b/src/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 
 WORKERS=4 # change here to the change number of workers
 
-echo "Starting RTB-CTFd"
+echo "Starting RTB-CTF-Framework"
 exec gunicorn 'FlaskRTBCTF:create_app()' \
     --bind '0.0.0.0:8080' \
     --workers $WORKERS
\ No newline at end of file

From cf4e4c6641902fa62c8265fe728147573a3df903 Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 14:03:44 +0530
Subject: [PATCH 09/11] Logging related errors fixed | #7

---
 src/create_db.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/create_db.py b/src/create_db.py
index ae3af96..851e3e3 100644
--- a/src/create_db.py
+++ b/src/create_db.py
@@ -1,9 +1,12 @@
 from datetime import datetime
 
 from FlaskRTBCTF import create_app, db, bcrypt
-from FlaskRTBCTF.models import User, Score, Notification, Logs
+from FlaskRTBCTF.models import User, Score, Notification
 from FlaskRTBCTF.config import organization, LOGGING
 
+if LOGGING:
+	from FlaskRTBCTF.models import Logs
+
 app = create_app()
 
 # create_app().app_context().push()

From 4b06cc62f0dafc8a9ea487d5902dbf04f6caf605 Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 14:05:41 +0530
Subject: [PATCH 10/11] ignoring .idea

---
 .idea/RTB-CTF-Framework.iml        |  13 -
 .idea/libraries/R_User_Library.xml |   6 -
 .idea/misc.xml                     |   7 -
 .idea/modules.xml                  |   8 -
 .idea/vcs.xml                      |   6 -
 .idea/workspace.xml                | 376 -----------------------------
 6 files changed, 416 deletions(-)
 delete mode 100644 .idea/RTB-CTF-Framework.iml
 delete mode 100644 .idea/libraries/R_User_Library.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/RTB-CTF-Framework.iml b/.idea/RTB-CTF-Framework.iml
deleted file mode 100644
index fb33410..0000000
--- a/.idea/RTB-CTF-Framework.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.7 (RTB-Framework)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="R User Library" level="project" />
-    <orderEntry type="library" name="R Skeletons" level="application" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/libraries/R_User_Library.xml b/.idea/libraries/R_User_Library.xml
deleted file mode 100644
index 71f5ff7..0000000
--- a/.idea/libraries/R_User_Library.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="libraryTable">
-  <library name="R User Library">
-    <CLASSES />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index aed3892..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (RTB-Framework)" project-jdk-type="Python SDK" />
-  <component name="PyCharmProfessionalAdvertiser">
-    <option name="shown" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index af82055..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" filepath="$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index a79a8ed..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/main/routes.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#0#44#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="84" column="89" lean-forward="true" selection-start-line="84" selection-start-column="89" selection-end-line="84" selection-end-column="89" />
-              <folding>
-                <element signature="e#24#75#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/create_db.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/run.py">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/config.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-120">
-              <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#9#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/docker-entrypoint.sh">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/docker-compose.yml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Dockerfile">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-408">
-              <folding>
-                <element signature="e#0#23#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/models.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="91">
-              <caret line="51" column="42" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
-              <folding>
-                <element signature="e#16#45#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-    <favorite-branches>
-      <branch-storage>
-        <map>
-          <entry type="LOCAL">
-            <value>
-              <list>
-                <branch-info repo="$PROJECT_DIR$" source="v1.1alpha" />
-              </list>
-            </value>
-          </entry>
-        </map>
-      </branch-storage>
-    </favorite-branches>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/FlaskRTBCTF/models.py" />
-        <option value="$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectConfigurationFiles">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/.idea/RTB-CTF-Framework.iml" />
-        <option value="$PROJECT_DIR$/.idea/misc.xml" />
-        <option value="$PROJECT_DIR$/.idea/modules.xml" />
-        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
-        <option value="$PROJECT_DIR$/.idea/libraries/R_User_Library.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="10" />
-    <option name="y" value="42" />
-    <option name="width" value="1346" />
-    <option name="height" value="706" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
-              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
-              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
-              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="FlaskRTBCTF" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="RTB-CTF-Framework" type="b2602c69:ProjectViewProjectNode" />
-              <item name="RTB-CTF-Framework" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="FlaskRTBCTF" type="462c0819:PsiDirectoryNode" />
-              <item name="ctf" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="cb95c0bd-076d-4ccc-9570-30000c776aff" name="Default Changelist" comment="" />
-      <created>1564236883086</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1564236883086</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="20" width="1366" height="748" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Favorites" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" weight="0.32838285" />
-      <window_info anchor="bottom" id="Terminal" sideWeight="0.49924242" visible="true" weight="0.32838285" />
-      <window_info active="true" anchor="bottom" id="Event Log" sideWeight="0.5007576" side_tool="true" visible="true" weight="0.32838285" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="R Packages" />
-      <window_info anchor="right" id="R Graphics" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py</url>
-          <line>2</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/admin/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#27#50#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/utils.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#31#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/templates/machine.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-405" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#31#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/users/routes.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#79#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/main/routes.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#44#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/create_db.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/run.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/docker-entrypoint.sh">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docker-compose.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/config.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-120">
-          <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="91">
-          <caret line="51" column="42" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
-          <folding>
-            <element signature="e#16#45#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FlaskRTBCTF/ctf/routes.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="84" column="89" lean-forward="true" selection-start-line="84" selection-start-column="89" selection-end-line="84" selection-end-column="89" />
-          <folding>
-            <element signature="e#24#75#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file

From 0cff71b3275eb3835c6360cf31dab3ab6c1f52da Mon Sep 17 00:00:00 2001
From: eshaan7 <ishubansal2000@gmail.com>
Date: Wed, 31 Jul 2019 14:06:23 +0530
Subject: [PATCH 11/11] not important

---
 src/run.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/run.py b/src/run.py
index ab1cfcf..e4a715c 100644
--- a/src/run.py
+++ b/src/run.py
@@ -1,6 +1,5 @@
 from FlaskRTBCTF import create_app
 
-
 app = create_app()
 
 if __name__ == '__main__':