ipv6 support added

Merge branch '2.0_beta' of https://github.com/empireproject/Empire into 2.0_beta

lib/common/empire.py

@@ -728,6 +728,17 @@ class MainMenu(cmd.Cmd):
             offs = len(mline) - len(text)
             return [s[offs:] for s in stagerNames if s.startswith(mline)]
 
+    def complete_setlist(self, text, line, begidx, endidx):
+        "Tab-complete a global list option"
+
+        options = ["listeners", "agents"]
+
+        if line.split(' ')[1].lower() in options:
+            return helpers.complete_path(text, line, arg=True)
+
+        mline = line.partition(' ')[2]
+        offs = len(mline) - len(text)
+        return [s[offs:] for s in options if s.startswith(mline)]
 
     def complete_set(self, text, line, begidx, endidx):
         "Tab-complete a global option."
@@ -777,6 +788,11 @@ class MainMenu(cmd.Cmd):
         offs = len(mline) - len(text)
         return [s[offs:] for s in names if s.startswith(mline)]
 
+    def complete_list(self, text, line, begidx, endidx):
+        "Tab-complete list"
+
+        return self.complete_setlist(text, line, begidx, endidx)
+
 
 class AgentsMenu(cmd.Cmd):
     """

lib/modules/python/collection/osx/screenshot.py

@@ -73,7 +73,7 @@ class Module:
 
         script = """
 # take a screenshot using screencapture
-run_command('screencapture -x /tmp/out.png')
+run_command('screencapture -x %s')
 # base64 up resulting file, delete the file, return the base64 of the png output
 #   mocked from the Empire screenshot module
 f = open('%s', 'rb')
@@ -81,6 +81,6 @@ data = f.read()
 f.close()
 run_command('rm -f %s')
 print data
-""" % (savePath, savePath)
+""" % (savePath, savePath, savePath)
 
         return script