Common

# Conflicts:
#	models.py
#	templates/containers/card.logs.html
#	templates/containers/list.logs.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", 20, 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
 
@@ -50,7 +50,7 @@ class AdminContainers(Resource):
     @admins_only
     def logs():
         page = abs(request.args.get("page", 1, type=int))
-        results_per_page = abs(request.args.get("per_page", 20, 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
 

models.py

@@ -105,11 +105,12 @@ 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
@@ -124,8 +125,9 @@ class WhaleContainerLog(db.Model):
         self.challenge_id = container.challenge_id
         self.start_time = container.start_time
         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.flag)
+                                                                self.start_time, self.uuid, self.port)

templates/containers/card.logs.html

@@ -33,7 +33,7 @@
                         >{{ container.user.name | truncate(5) }}
                         </a>
                     </h6>
-                    <p class="card-text">UUID: {{ container.uuid }}</p>
+                    <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>

templates/containers/list.logs.html

@@ -11,10 +11,10 @@
                 <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>UUID</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>
-                <th class="text-center"><b>Actions</b></td>
             </tr>
             </thead>
             <tbody>
@@ -22,7 +22,7 @@
                 <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 }}">
+                            <input type="checkbox" class="form-check-input" data-user-id="{{ container.user.id if container.user else '' }}">
                         </div>
                     </td>
                     <td class="text-center">
@@ -38,11 +38,15 @@
                             {{ container.challenge.name }}
                         </a>
                     </td>
-                    <td class="text-center">
+                    <td class="text-center" style="word-break: break-all; white-space: normal; max-width: 200px;">
-                        <button class="btn btn-link p-0 click-copy" data-copy="{{ container.uuid }}">
+                        <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>
@@ -51,9 +55,6 @@
                     <td class="text-center">
                         <span data-time="{{ container.start_time | isoformat }}"></span>
                     </td>
-                    <td class="text-center">
-                        <span class="badge badge-secondary">Log Record</span>
-                    </td>
                 </tr>
             {% endfor %}
             </tbody>

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">🔗 Instances</a>
+        <a class="nav-link" href="/plugins/ctfd-whale/admin/containers">🔗 Containers</a>
     </li>
 {% endblock %}
 

templates/whale_containers.html

@@ -41,13 +41,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={{ request.args.get('type', 'instances') }}"
+                       href="/plugins/ctfd-whale/admin/containers?page={{ page }}&type={{ session.get('page_type', 'containers') }}"
                     >{{ 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={{ request.args.get('type', 'instances') }}"
+                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page + 1 }}&type={{ session.get('page_type', 'containers') }}"
                 >
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Next</span>

utils/db.py

@@ -66,6 +66,7 @@ class DBContainer:
     @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()
@@ -85,6 +86,7 @@ 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()
 

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(':') == 1:
+        if credentials and credentials.count(':') == 3:
             try:
                 DockerUtils.client.login(*credentials.split(':'))
             except Exception: