Rename 'container' to 'service'; roll versions

Author: paullj1

app/assets/javascripts/problems.coffee

@@ -7,6 +7,10 @@ setup_hooks = ->
   if !document.getElementById('new_hint') 
     return
 
+  $(document).on 'confirm:complete', (evt, answer) ->
+    if evt.target.value == "Start VM" && answer
+      evt.target.value = "Starting..."
+
   $('.filter').keyup ->
     rex = new RegExp($(this).val(), 'i')
     $('.searchable tr').hide()

app/controllers/problems_controller.rb

@@ -163,12 +163,12 @@ def start_stack
       challenge["user_id"] = current_user.id
       challenge["problem_id"] = @problem.id
       challenge["network"] = @problem.network
-      challenge["containers"] = @problem.stack
+      challenge["services"] = @problem.stack
       challenge["lifespan"] = lifespan.to_s
 
-      CreateStackJob.perform_later challenge
       DestroyStackJob.set(wait: lifespan.minutes)
                                .perform_later(challenge)
+      CreateStackJob.perform_now challenge
 
       redirect_to @problem
     else

app/jobs/create_stack_job.rb

@@ -5,7 +5,7 @@ class CreateStackJob < DockerApiJob
   #   user_id
   #   problem_id
   #   network
-  #   containers
+  #   services
   #   lifespan
   def perform(challenge)
     check_existing(challenge)
@@ -14,16 +14,16 @@ def perform(challenge)
 
   private
     def check_existing(challenge)
-      containers = docker_get_containers(challenge)
+      services = docker_get_services(challenge)
       networks = docker_get_networks(challenge)
 
       # If this user already has a stack initiated, reset it
-      if networks.length > 0 or containers.length > 0
+      if networks.length > 0 or services.length > 0
         user_id = challenge['user_id']
         User.find(user_id).update_attribute(:container_id, '')
         User.find(user_id).update_attribute(:stack_expiry, DateTime.now)
         User.find(user_id).update_attribute(:problem_id, -1)
-        delete_stack(containers, networks)
+        delete_stack(services, networks)
       end
     end
 
@@ -34,7 +34,8 @@ def create_stack(challenge)
       network['Labels'] = {
         "user_id" => "#{challenge['user_id']}",
         "problem_id" => "#{challenge['problem_id']}",
-        "lifetime" => "#{challenge['lifespan']}"
+        "lifetime" => "#{challenge['lifespan']}",
+        "hackthearch" => "This network was generated by HackTheArch"
       }
       res = docker_post_request('/networks/create', network.to_json)
       network_id = JSON(res.body)["Id"]
@@ -43,43 +44,44 @@ def create_stack(challenge)
         raise Exception.new("Couldn't create challenge network.")
       end
 
-      # Then build containers
-      containers = JSON(challenge['containers'])
-      containers.each do |container|
+      # Then build services
+      services = JSON(challenge['services'])
+      services.each do |service|
 
-        if container['Labels'].nil?
-          container['Labels'] = {}
+        if service['Labels'].nil?
+          service['Labels'] = {}
         end
 
-        container['Labels']["user_id"] = "#{challenge['user_id']}"
-        container['Labels']["problem_id"] = "#{challenge['problem_id']}"
-        container['Labels']["lifetime"] = "#{challenge['lifespan']}"
+        service['Labels']["user_id"] = "#{challenge['user_id']}"
+        service['Labels']["problem_id"] = "#{challenge['problem_id']}"
+        service['Labels']["lifetime"] = "#{challenge['lifespan']}"
+        service['Labels']["hackthearch"] = "This service was generated by HackTheArch"
 
-        # Make sure the container is reachable by its designed name
-        container['Networks'] = [{ 
+        # Make sure the service is reachable by its designed name
+        service['Networks'] = [{ 
           "Target": network_id,
           "Aliases": [
-            container['Name'],
-            container['Name'].gsub("-","."),
+            service['Name'],
+            service['Name'].gsub("-","."),
           ]
         }]
 
         # find entrypoint
         is_entry = false
-        if container['Name'].downcase == "entrypoint"
+        if service['Name'].downcase == "entrypoint"
           is_entry = true
         end
 
-        # Add user_id to container name for identification
-        container_name = container['Name']
-        container['Name'] = "hta-#{container_name}-#{challenge['user_id']}"
+        # Add user_id to service name for identification
+        service_name = service['Name']
+        service['Name'] = "hta-#{service_name}-#{challenge['user_id']}"
 
-        res = docker_post_request('/services/create', container.to_json)
+        res = docker_post_request('/services/create', service.to_json)
         if res.code != '201'
-          raise Exception.new("Couldn't create challenge containers.")
+          raise Exception.new("Couldn't create challenge services.")
         end
 
-        # If container is entry point, assign to user
+        # If service is entry point, assign to user
         if is_entry
           id = JSON(res.body)["ID"]
           User.find(challenge['user_id']).update_attribute(:container_id, id)

app/jobs/destroy_stack_job.rb

@@ -2,26 +2,26 @@ class DestroyStackJob < DockerApiJob
   queue_as :default
 
   def perform(challenge)
-    containers = docker_get_containers(challenge)
+    services = docker_get_services(challenge)
     networks = docker_get_networks(challenge)
 
     # If stack hasn't exceeded its lifetime, then it probably has it's own
     # delayed job to clean it up
-    if get_age(containers.first) > challenge['lifespan'].to_f
+    if get_age(services.first) > challenge['lifespan'].to_f
 
       user_id = challenge['user_id']
       User.find(user_id).update_attribute(:container_id, '')
       User.find(user_id).update_attribute(:stack_expiry, DateTime.now)
       User.find(user_id).update_attribute(:problem_id, -1)
-      delete_stack(containers, networks)
+      delete_stack(services, networks)
 
     end
   end
 
   private
-    def get_age(container)
-      if container
-        ((Time.now() - Time.parse(container['CreatedAt'])) / 60) + 10
+    def get_age(service)
+      if service
+        ((Time.now() - Time.parse(service['CreatedAt'])) / 60) + 10
       else
         return Float::INFINITY
       end

app/jobs/docker_api_job.rb

@@ -7,8 +7,22 @@ class DockerApiJob < ApplicationJob
   @@socket_path = "/var/run/docker.sock"
 
   protected
-    # Returns array of containers for assessment
-    def docker_get_containers(assessment)
+    # Get all services
+    def docker_get_hta_services()
+      filter = Hash.new(0)
+      filter['label'] = ["hackthearch"]
+      query = URI.encode_www_form('filters' => filter.to_json)
+
+      res = docker_get_request("/services?#{query}")
+
+      if res.code == '200'
+        return JSON(res.body)
+      end
+      raise Exception.new("HTTP #{res.code} communicating with Docker!")
+    end
+
+    # Returns array of services for assessment
+    def docker_get_services(assessment)
       filter = Hash.new(0)
       filter['label'] = ["user_id=#{assessment['user_id']}"]
       query = URI.encode_www_form('filters' => filter.to_json)
@@ -35,9 +49,9 @@ def docker_get_networks(assessment)
       raise Exception.new("HTTP #{res.code} communicating with Docker!")
     end
 
-    def delete_stack(containers, networks)
+    def delete_stack(services, networks)
 
-      containers.each do |service|
+      services.each do |service|
         docker_delete_service(service['ID'])
       end
 
@@ -85,7 +99,7 @@ def docker_post_request(path, params)
       end
 
       # If auth token exists, use it:
-      auth = "/run/secrets/registry_auth"
+      auth = "/run/secrets/REGISTRY_AUTH"
       if File.exist?(auth) || File.symlink?(auth)
         request["X-Registry-Auth"] = Base64.encode64(File.read(auth, 'r'))
       end

app/views/problems/_problem.html.erb

@@ -19,7 +19,7 @@
     <% if swarm_services_enabled? && !(@problem.stack.nil? || @problem.stack.empty?) %>
       <%= content_tag :span, class: 'pull-right' do %>
         <% if (current_user.problem_id == @problem.id && @active_stack) %>
-          <%= content_tag(:h4, "Challenge Activated ", style: "display:inline") %>
+          <%= content_tag(:h4, "Challenge Activated", style: "display:inline;padding-right:10px") %>
           <% if @problem.vnc %>
             <%= link_to "VNC", nil, id: "vnc_link", class: "btn btn-primary", disabled: :true, target: "_blank" %>
           <% end %>

docker-bake.hcl

@@ -10,7 +10,7 @@ target "web" {
   driver = "docker-container"
   tags = ["docker.io/paullj1/hackthearch:latest",
           "docker.io/paullj1/hackthearch:2.4" ,
-          "docker.io/paullj1/hackthearch:2.4.0" ]
+          "docker.io/paullj1/hackthearch:2.4.1" ]
   platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"]
 }
 
@@ -20,7 +20,7 @@ target "webconsole" {
   output = ["type=registry"]
   driver = "docker-container"
   tags = ["docker.io/paullj1/webconsole:latest",
-          "docker.io/paullj1/webconsole:1.0.1"]
+          "docker.io/paullj1/webconsole:1.1.0"]
   platforms = ["linux/amd64", "linux/arm64"]
 }