-Sync of Kevin Robertson's lateral_movement/inveigh_relay module

-Sync stufus' exfiltration/egresscheck module
-Added module menu dynamic sizing for prettified output

changelog

@@ -1,3 +1,9 @@
+12/22/2015
+----------
+-Sync of Kevin Robertson's lateral_movement/inveigh_relay module
+-Sync stufus' exfiltration/egresscheck module
+-Added module menu dynamic sizing for prettified output
+
 12/16/2015
 ----------
 -Sync of Kevin Robertson's collection/inveigh update

lib/common/empire.py

@@ -9,7 +9,7 @@ menu loops.
 """
 
 # make version for Empire
-VERSION = "1.3.8"
+VERSION = "1.3.9"
 
 
 from pydispatch import dispatcher

lib/common/messages.py

@@ -113,6 +113,7 @@ def display_options(options, color=True):
         else:
             print "\t%s\t%s" % ('{0: <16}'.format(key), wrap_string(options[key]))
 
+
 def agent_print (agents):
     """
     Take an agent dictionary and display everything nicely.
@@ -131,6 +132,7 @@ def agent_print (agents):
 
     print ""
 
+
 def display_agents(agents):
 
     if len(agents)>0:
@@ -139,7 +141,6 @@ def display_agents(agents):
         print helpers.color("[!] No agents currently registered ")
 
 
-
 def display_staleagents(agents):
     """
     Take an agent dictionary and display everything nicely.
@@ -151,14 +152,6 @@ def display_staleagents(agents):
         print helpers.color("[!] No stale agents currently registered ")
 
 
-
-
-
-
-
-
-
-
 def display_agent(agent):
     """
     Display an agent all nice-like.
@@ -382,13 +375,16 @@ def display_module(moduleName, module):
 
     # print out any options, if present
     if module.options:
+
+        # get the size for the first column
+        maxNameLen = len(max(module.options.keys(), key=len))
+
         print "\nOptions:\n"
-        print "  Name             Required    Value                     Description"
-        print "  ----             --------    -------                   -----------"
+        print "  %sRequired    Value                     Description" %('{:<{}s}'.format("Name", maxNameLen+1))
+        print "  %s--------    -------                   -----------" %('{:<{}s}'.format("----", maxNameLen+1))
 
         for option,values in module.options.iteritems():
-            # print "  %s%s%s%s" % ('{0: <17}'.format(option), '{0: <12}'.format(("True" if values['Required'] else "False")), '{0: <25}'.format(values['Value']), wrap_string(values['Description'], indent=56))
-            print "  %s%s%s" % ('{0: <17}'.format(str(option)), '{0: <12}'.format(("True" if values['Required'] else "False")), wrap_columns(str(values['Value']), str(values['Description'])))
+            print "  %s%s%s" % ('{:<{}s}'.format(str(option), maxNameLen+1), '{0: <12}'.format(("True" if values['Required'] else "False")), wrap_columns(str(values['Value']), str(values['Description']), indent=(31 + (maxNameLen-16))))
 
     print ""