dev

__init__.py

@@ -82,13 +82,7 @@ def load(app):
     @page_blueprint.route("/admin/containers")
     @admins_only
     def admin_list_containers():
-        page_type = request.args.get("type", "instances")
+        result = AdminContainers.get()
-        if page_type == "logs":
-            result = AdminContainers.logs()
-            session['page_type'] = 'logs'
-        else:
-            result = AdminContainers.get()
-            session['page_type'] = 'containers'
         view_mode = request.args.get('mode', session.get('view_mode', 'list'))
         session['view_mode'] = view_mode
         return render_template("whale_containers.html",

api.py

@@ -31,7 +31,7 @@ class AdminContainers(Resource):
     @admins_only
     def get():
         page = abs(request.args.get("page", 1, type=int))
-        results_per_page = abs(request.args.get("per_page", 10, type=int))
+        results_per_page = abs(request.args.get("per_page", 20, type=int))
         page_start = results_per_page * (page - 1)
         page_end = results_per_page * (page - 1) + results_per_page
 
@@ -46,25 +46,6 @@ class AdminContainers(Resource):
             'page_start': page_start,
         }}
 
-    @staticmethod
-    @admins_only
-    def logs():
-        page = abs(request.args.get("page", 1, type=int))
-        results_per_page = abs(request.args.get("per_page", 10, type=int))
-        page_start = results_per_page * (page - 1)
-        page_end = results_per_page * (page - 1) + results_per_page
-
-        count = DBContainer.get_all_container_logs_count()
-        containers = DBContainer.get_all_container_logs_page(
-            page_start, page_end)
-
-        return {'success': True, 'data': {
-            'containers': containers,
-            'total': count,
-            'pages': int(count / results_per_page) + (count % results_per_page > 0),
-            'page_start': page_start,
-        }}
-
     @staticmethod
     @admins_only
     def patch():

models.py

@@ -105,12 +105,11 @@ class WhaleContainer(db.Model):
                                                                 self.start_time, self.renew_count)
 
 class WhaleContainerLog(db.Model):
-    id = db.Column(db.Integer,primary_key=True, autoincrement=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     user_id = db.Column(None, db.ForeignKey("users.id"))
     challenge_id = db.Column(None, db.ForeignKey("challenges.id"))
     start_time = db.Column(db.DateTime, nullable=False, default=datetime.utcnow)
     uuid = db.Column(db.String(256))
-    port = db.Column(db.Integer, nullable=True, default=0)
     flag = db.Column(db.String(128), nullable=False)
 
     # Relationships
@@ -123,11 +122,10 @@ class WhaleContainerLog(db.Model):
     def __init__(self, container):
         self.user_id = container.user_id
         self.challenge_id = container.challenge_id
-        self.start_time = container.start_time
+        self.start_time = container.challenge_id
         self.uuid = container.uuid
-        self.port = container.port
         self.flag = container.flag
 
     def __repr__(self):
         return "<WhaleContainer ID:{0} {1} {2} {3} {4} {5}>".format(self.id, self.user_id, self.challenge_id,
-                                                                self.start_time, self.uuid, self.port)
+                                                                self.start_time, self.uuid, self.flag)

templates/containers/card.logs.html

@@ -1,44 +0,0 @@
-<style>
-    .info-card.card {
-        height: 11rem;
-    }
-
-    .card-text {
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-    }
-
-    .card-text:hover {
-        white-space: pre-line;
-        overflow: visible;
-    }
-</style>
-
-<div class="row">
-    {% for container in containers %}
-        <div class="col-sm-6 pb-3">
-            <div class="info-card card">
-                <div class="card-body">
-                    <h5 class="d-inline-block card-title">
-                        <a style="width: 5rem;"
-                           href="{{ url_for('admin.challenges_detail', challenge_id=container.challenge.id) }}"
-                        >{{ container.challenge.name | truncate(15) }}
-                        </a>
-                    </h5>
-                    <h6 class="d-inline-block card-subtitle float-right">
-                        <a style="width: 5rem;"
-                           class="btn btn-outline-secondary rounded"
-                           href="{{ url_for('admin.users_detail', user_id=container.user.id) }}"
-                        >{{ container.user.name | truncate(5) }}
-                        </a>
-                    </h6>
-                    <p class="card-text">Container: {{ container.uuid }}</p>
-                    <p class="card-text">{{ container.flag }}</p>
-                    Time Started: {{ container.start_time }}
-                    <span class="badge badge-secondary float-right">Log Record</span>
-                </div>
-            </div>
-        </div>
-    {% endfor %}
-</div>

templates/containers/list.logs.html

@@ -1,63 +0,0 @@
-<div class="row">
-    <div class="col-md-12">
-        <table class="table table-striped border">
-            <thead>
-            <tr>
-                <th class="border-right" data-checkbox>
-                    <div class="form-check text-center">&nbsp;
-                        <input type="checkbox" class="form-check-input" data-checkbox-all>
-                    </div>
-                </th>
-                <th class="sort-col text-center"><b>ID</b></td>
-                <th class="text-center"><b>User</b></td>
-                <th class="sort-col text-center"><b>Challenge</b></td>
-                <th class="text-center"><b>Container</b></td>
-                <th class="text-center"><b>Port</b></td>
-                <th class="text-center"><b>Flag</b></td>
-                <th class="sort-col text-center"><b>Startup Time</b></td>
-            </tr>
-            </thead>
-            <tbody>
-            {% for container in containers %}
-                <tr>
-                    <td class="border-right" data-checkbox>
-                        <div class="form-check text-center">&nbsp;
-                            <input type="checkbox" class="form-check-input" data-user-id="{{ container.user.id if container.user else '' }}">
-                        </div>
-                    </td>
-                    <td class="text-center">
-                        {{ container.id }}
-                    </td>
-                    <td class="text-center">
-                            <a href="{{ url_for('admin.users_detail', user_id=container.user.id) }}">
-                                {{ container.user.name | truncate(12) }}
-                            </a>
-                    </td>
-                    <td class="text-center">
-                        <a href="{{ url_for('admin.challenges_detail', challenge_id=container.challenge.id) }}">
-                            {{ container.challenge.name }}
-                        </a>
-                    </td>
-                    <td class="text-center" style="word-break: break-all; white-space: normal; max-width: 200px;">
-                        <span class="d-inline-block">{{ container.uuid }}</span>
-                        <button class="btn btn-link p-0 click-copy ml-1" data-copy="{{ container.uuid }}" title="复制UUID">
-                            <i class="fas fa-clipboard"></i>
-                        </button>
-                    </td>
-                    <td class="text-center">
-                        {{ container.port if container.port else '-' }}
-                    </td>
-                    <td class="text-center">
-                        <button class="btn btn-link p-0 click-copy" data-copy="{{ container.flag }}">
-                            <i class="fas fa-clipboard"></i>
-                        </button>
-                    </td>
-                    <td class="text-center">
-                        <span data-time="{{ container.start_time | isoformat }}"></span>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </div>
-</div>

templates/whale_config.html

@@ -14,7 +14,7 @@
         <a class="nav-link" data-toggle="pill" href="#challenges">Challenges</a>
     </li>
     <li class="nav-item">
-        <a class="nav-link" href="/plugins/ctfd-whale/admin/containers">🔗 Containers</a>
+        <a class="nav-link" href="/plugins/ctfd-whale/admin/containers">🔗 Instances</a>
     </li>
 {% endblock %}
 

templates/whale_containers.html

@@ -5,12 +5,7 @@
         <a class="nav-link" href="/plugins/ctfd-whale/admin/settings">🔗 Settings</a>
     </li>
     <li class="nav-item">
-        <a class="nav-link{{ ' active' if session.get('page_type', 'containers') == 'containers' else '' }}" 
+        <a class="nav-link active" href="#">Instances</a>
-        href="/plugins/ctfd-whale/admin/containers?type=instances">Instances</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link{{ ' active' if session.get('page_type') == 'logs' else '' }}" 
-        href="/plugins/ctfd-whale/admin/containers?type=logs">Logs</a>
     </li>
 
     <li class="nav-item nav-link">
@@ -30,7 +25,7 @@
         <ul class="pagination">
             <li class="page-item{{ ' disabled' if curr_page <= 1 else '' }}">
                 <a class="page-link" aria-label="Previous"
-                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page - 1 }}&type={{ session.get('page_type', 'containers') }}"
+                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page - 1 }}"
                 >
                     <span aria-hidden="true">&laquo;</span>
                     <span class="sr-only">Previous</span>
@@ -41,13 +36,13 @@
             {% for page in range(range_l, range_r + 1) %}
                 <li class="page-item{{ ' active' if curr_page == page }}">
                     <a class="page-link"
-                       href="/plugins/ctfd-whale/admin/containers?page={{ page }}&type={{ session.get('page_type', 'containers') }}"
+                       href="/plugins/ctfd-whale/admin/containers?page={{ page }}"
                     >{{ page }}</a>
                 </li>
             {% endfor %}
             <li class="page-item{{ ' disabled' if curr_page >= pages else '' }}">
                 <a class="page-link" aria-label="Next"
-                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page + 1 }}&type={{ session.get('page_type', 'containers') }}"
+                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page + 1 }}"
                 >
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Next</span>
@@ -58,22 +53,17 @@
     
     <li class="nav-item nav-link">
         {% if session['view_mode'] == 'card' %}
-            <a href="?mode=list&type={{ session.get('page_type', 'containers') }}">Switch to list mode</a>
+            <a href="?mode=list">Switch to list mode</a>
         {% else %}
-            <a href="?mode=card&type={{ session.get('page_type', 'containers') }}">Switch to card mode</a>
+            <a href="?mode=card">Switch to card mode</a>
         {% endif %}
     </li>
 {% endblock %}
 
 {% block panel %}
-    {% if session.get("page_type", "containers") == "containers" %}
+    {% include "containers/" + session["view_mode"] + ".containers.html" %}
-        {% include "containers/" + session["view_mode"] + ".containers.html" %}
-    {% elif session["page_type"] == "logs" %}
-        {% include "containers/" + session["view_mode"] + ".logs.html" %}
-    {% endif %}
 {% endblock %}
 
-
 {% block scripts %}
     <script defer src="{{ url_for('plugins.ctfd-whale.assets', path='containers.js') }}"></script>
 {% endblock %}

utils/db.py

@@ -2,7 +2,7 @@ import datetime
 
 from CTFd.models import db
 from CTFd.utils import get_config
-from ..models import WhaleContainer, WhaleContainerLog, WhaleRedirectTemplate
+from ..models import WhaleContainer,WhaleContainerLog, WhaleRedirectTemplate
 
 
 class DBContainer:
@@ -16,12 +16,10 @@ class DBContainer:
 
     @staticmethod
     def create_container_log(container):
-        container = WhaleContainerLog(container)
+        log = WhaleContainerLog(container=container)
-        db.session.add(container)
+        db.session.add(log)
         db.session.commit()
 
-        return container
-
     @staticmethod
     def get_current_containers(user_id):
         q = db.session.query(WhaleContainer)
@@ -63,15 +61,6 @@ class DBContainer:
         )
         return q.all()
 
-    @staticmethod
-    def get_all_container_logs_page(page_start, page_end):
-        q = db.session.query(WhaleContainerLog)
-        q = q.order_by(WhaleContainerLog.id.desc())
-        q = q.slice(page_start, page_end)
-
-        return q.all()
-
-
     @staticmethod
     def get_all_container():
         q = db.session.query(WhaleContainer)
@@ -86,16 +75,9 @@ class DBContainer:
             WhaleContainer.start_time >=
             datetime.datetime.now() - datetime.timedelta(seconds=timeout)
         )
-        q = q.order_by(WhaleContainer.id.desc())
         q = q.slice(page_start, page_end)
         return q.all()
 
-    @staticmethod
-    def get_all_container_logs_count():
-        q = db.session.query(WhaleContainerLog)
-
-        return q.count()
-
     @staticmethod
     def get_all_alive_container_count():
         timeout = int(get_config("whale:docker_timeout", "3600"))

utils/docker.py

@@ -43,7 +43,7 @@ class DockerUtils:
                 'if you are using unix:///var/run/docker.sock, check if the socket is correctly mapped'
             )
         credentials = get_config("whale:docker_credentials")
-        if credentials and credentials.count(':') == 3:
+        if credentials and credentials.count(':') == 1:
             try:
                 DockerUtils.client.login(*credentials.split(':'))
             except Exception: