From 2b8a389da1b56ad5adad36b4d5fa3f734534477e Mon Sep 17 00:00:00 2001
From: Christian Frichot <xntrik@gmail.com>
Date: Mon, 23 Jul 2012 20:30:00 +0800
Subject: [PATCH] Fixes Issue #724 - Console Shell now prints modules which are
 in sub-categories

---
 .../console/lib/command_dispatcher/target.rb  |  6 +++---
 extensions/console/lib/shellinterface.rb      | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/extensions/console/lib/command_dispatcher/target.rb b/extensions/console/lib/command_dispatcher/target.rb
index 609723de7..5a4fe0ec6 100644
--- a/extensions/console/lib/command_dispatcher/target.rb
+++ b/extensions/console/lib/command_dispatcher/target.rb
@@ -28,7 +28,7 @@ class Target
     begin
       driver.interface.getcommands.each { |folder|
         folder['children'].each { |command|
-          @@commands << folder['text'] + "/" + command['text'].gsub(/[-\(\)]/,"").gsub(/\W+/,"_")
+          @@commands << folder['text'] + command['text'].gsub(/[-\(\)]/,"").gsub(/\W+/,"_")
         }
       }
     rescue
@@ -73,8 +73,8 @@ class Target
     
     driver.interface.getcommands.each { |folder|
       folder['children'].each { |command|
-        tbl << [command['id'].to_s,
-                folder['text'] + "/" + command['text'].gsub(/[-\(\)]/,"").gsub(/\W+/,"_"),
+        tbl << [command['id'].to_i,
+                folder['text'] + command['text'].gsub(/[-\(\)]/,"").gsub(/\W+/,"_"),
                 command['status'].gsub(/^Verified /,""),
                 driver.interface.getcommandresponses(command['id']).length] #TODO
       }
diff --git a/extensions/console/lib/shellinterface.rb b/extensions/console/lib/shellinterface.rb
index 70c71c014..55869fae7 100644
--- a/extensions/console/lib/shellinterface.rb
+++ b/extensions/console/lib/shellinterface.rb
@@ -60,6 +60,9 @@ class ShellInterface
     
     tree = []
     BeEF::Modules.get_categories.each { |c|
+        if c[-1,1] != "/"
+          c.concat("/")
+        end
         tree.push({
             'text' => c,
             'cls' => 'folder',
@@ -68,7 +71,21 @@ class ShellInterface
     }
 
     BeEF::Modules.get_enabled.each{|k, mod|
-      update_command_module_tree(tree, mod['category'], get_command_module_status(k), mod['name'],mod['db']['id'])
+
+      flatcategory = ""
+      if mod['category'].kind_of?(Array)
+        # Therefore this module has nested categories (sub-folders), munge them together into a string with '/' characters, like a folder.
+        mod['category'].each {|cat|
+          flatcategory << cat + "/"
+        }
+      else
+        flatcategory = mod['category']
+        if flatcategory[-1,1] != "/"
+          flatcategory.concat("/")
+        end
+      end
+
+      update_command_module_tree(tree, flatcategory, get_command_module_status(k), mod['name'],mod['db']['id'])
     }
 
     # if dynamic modules are found in the DB, then we don't have yaml config for them