Land rapid7#7829, workspace is now in a table

Author: h00die

lib/msf/ui/console/command_dispatcher/db.rb

@@ -177,11 +177,31 @@ def cmd_workspace(*args)
         return
       end
     else
+      workspace = framework.db.workspace
+      col_names = %w{current name hosts services vulns creds loots notes}
+
+      tbl = Rex::Text::Table.new(
+        'Header'    => 'Workspaces',
+        'Columns'   => col_names,
+        'SortIndex' => 1
+      )
+
       # List workspaces
-      framework.db.workspaces.each do |s|
-        pad = (s.name == framework.db.workspace.name) ? "* " : "  "
-        print_line("#{pad}#{s.name}")
+      framework.db.workspaces.each do |ws|
+        tbl << [
+          ws == workspace ? '*' : '',
+          ws.name,
+          ws.hosts.count,
+          ws.services.count,
+          ws.vulns.count,
+          ws.core_credentials.count,
+          ws.loots.count,
+          ws.notes.count
+        ]
       end
+
+      print_line
+      print_line(tbl.to_s)
     end
   }
   end

spec/lib/msf/ui/console/command_dispatcher/db_spec.rb

@@ -546,7 +546,12 @@
       it "should list default workspace" do
         db.cmd_workspace
         expect(@output).to match_array [
-          "* default"
+          "",
+          "Workspaces",
+          "==========",
+          "current  name     hosts  services  vulns  creds  loots  notes",
+          "-------  ----     -----  --------  -----  -----  -----  -----",
+          "*        default  0      0         0      0      0      0"
         ]
       end
 
@@ -555,8 +560,13 @@
         @output = []
         db.cmd_workspace
         expect(@output).to match_array [
-          "  default",
-          "* foo"
+          "",
+          "Workspaces",
+          "==========",
+          "current  name     hosts  services  vulns  creds  loots  notes",
+          "-------  ----     -----  --------  -----  -----  -----  -----",
+          "         default  0      0         0      0      0      0",
+          "*        foo      0      0         0      0      0      0"
         ]
       end
     end