From c77a1c2d1ff3fa4795b3025cdf229073e0c00f2f Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Fri, 30 Jul 2021 13:13:16 -0400
Subject: [PATCH] Add connection_info to Challenges model (#1965)

* Closes #1964
* Adds connection_info to Challenges
---
 CTFd/models/__init__.py                       |  1 +
 CTFd/plugins/challenges/__init__.py           |  1 +
 CTFd/plugins/dynamic_challenges/__init__.py   |  1 +
 .../admin/templates/challenges/update.html    | 12 ++++++++
 CTFd/themes/core/templates/challenge.html     | 12 ++++++++
 ...dd_connection_info_column_to_challenges.py | 28 +++++++++++++++++++
 6 files changed, 55 insertions(+)
 create mode 100644 migrations/versions/6012fe8de495_add_connection_info_column_to_challenges.py

diff --git a/CTFd/models/__init__.py b/CTFd/models/__init__.py
index b49537b5a..398f64fd4 100644
--- a/CTFd/models/__init__.py
+++ b/CTFd/models/__init__.py
@@ -85,6 +85,7 @@ class Challenges(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(80))
     description = db.Column(db.Text)
+    connection_info = db.Column(db.Text)
     max_attempts = db.Column(db.Integer, default=0)
     value = db.Column(db.Integer)
     category = db.Column(db.String(80))
diff --git a/CTFd/plugins/challenges/__init__.py b/CTFd/plugins/challenges/__init__.py
index 8c7c4f2bc..110b2c821 100644
--- a/CTFd/plugins/challenges/__init__.py
+++ b/CTFd/plugins/challenges/__init__.py
@@ -53,6 +53,7 @@ def read(cls, challenge):
             "name": challenge.name,
             "value": challenge.value,
             "description": challenge.description,
+            "connection_info": challenge.connection_info,
             "category": challenge.category,
             "state": challenge.state,
             "max_attempts": challenge.max_attempts,
diff --git a/CTFd/plugins/dynamic_challenges/__init__.py b/CTFd/plugins/dynamic_challenges/__init__.py
index e5d511bcc..c9db56617 100644
--- a/CTFd/plugins/dynamic_challenges/__init__.py
+++ b/CTFd/plugins/dynamic_challenges/__init__.py
@@ -102,6 +102,7 @@ def read(cls, challenge):
             "decay": challenge.decay,
             "minimum": challenge.minimum,
             "description": challenge.description,
+            "connection_info": challenge.connection_info,
             "category": challenge.category,
             "state": challenge.state,
             "max_attempts": challenge.max_attempts,
diff --git a/CTFd/themes/admin/templates/challenges/update.html b/CTFd/themes/admin/templates/challenges/update.html
index a1fe4050e..f1de26653 100644
--- a/CTFd/themes/admin/templates/challenges/update.html
+++ b/CTFd/themes/admin/templates/challenges/update.html
@@ -34,6 +34,18 @@
 	</div>
 	{% endblock %}
 
+	{% block connection_info %}
+	<div class="form-group">
+		<label>
+			Connection Info<br>
+			<small class="form-text text-muted">
+				Use this to specify a link, hostname, or connection instructions for your challenge.
+			</small>
+		</label>
+		<input type="text" class="form-control chal-connection-info" name="connection_info" value="{{ challenge.connection_info | default('', true) }}">
+	</div>
+	{% endblock %}
+
 	{% block value %}
 	<div class="form-group">
 		<label for="value">
diff --git a/CTFd/themes/core/templates/challenge.html b/CTFd/themes/core/templates/challenge.html
index db5382e6e..d89e95212 100644
--- a/CTFd/themes/core/templates/challenge.html
+++ b/CTFd/themes/core/templates/challenge.html
@@ -38,6 +38,18 @@ <h3 class="challenge-value text-center">
 
 						<span class="challenge-desc">{% block description %}{{ challenge.html }}{% endblock %}</span>
 
+						<span class="challenge-connection-info">
+							{% block connection_info %}
+								{% set conn = challenge.connection_info %}
+								{% if not conn %}
+								{% elif conn.startswith("http") %}
+									{{ conn | urlize(target="_blank") }}
+								{% else %}
+									<code>{{ conn }}</code>
+								{% endif %}
+							{% endblock %}
+						</span>
+
 						<div class="challenge-hints hint-row row">
 							{% for hint in hints %}
 								<div class='col-md-12 hint-button-wrapper text-center mb-3'>
diff --git a/migrations/versions/6012fe8de495_add_connection_info_column_to_challenges.py b/migrations/versions/6012fe8de495_add_connection_info_column_to_challenges.py
new file mode 100644
index 000000000..4ed0fbc4a
--- /dev/null
+++ b/migrations/versions/6012fe8de495_add_connection_info_column_to_challenges.py
@@ -0,0 +1,28 @@
+"""Add connection_info column to Challenges
+
+Revision ID: 6012fe8de495
+Revises: ef87d69ec29a
+Create Date: 2021-07-30 03:50:54.219124
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "6012fe8de495"
+down_revision = "ef87d69ec29a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("challenges", sa.Column("connection_info", sa.Text(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("challenges", "connection_info")
+    # ### end Alembic commands ###