Codebase list powershell-empire / kali/3.2.0-0kali1
Refresh debian/patches Sophie Brun 4 years ago
3 changed file(s) with 21 addition(s) and 33 deletion(s). Raw diff Collapse all Expand all
+10
-11
debian/patches/change-database-location.patch less more
77 lib/common/agents.py | 21 +++++++++++----------
88 lib/common/empire.py | 5 +++--
99 lib/common/helpers.py | 4 ++--
10 setup/reset.sh | 22 +++++++++++-----------
10 setup/reset.sh | 20 ++++++++++----------
1111 setup/setup_database.py | 2 +-
12 7 files changed, 48 insertions(+), 28 deletions(-)
12 7 files changed, 47 insertions(+), 27 deletions(-)
1313
1414 diff --git a/empire b/empire
15 index feff904..72c6b57 100755
15 index 3fc5175..584669b 100755
1616 --- a/empire
1717 +++ b/empire
1818 @@ -9,6 +9,22 @@ import hashlib
7070 conn.isolation_level = None
7171 return conn
7272 diff --git a/lib/common/agents.py b/lib/common/agents.py
73 index c8a205b..86d1bf5 100644
73 index a104962..6e21b67 100644
7474 --- a/lib/common/agents.py
7575 +++ b/lib/common/agents.py
7676 @@ -87,6 +87,7 @@ class Agents(object):
144144 f.write(task)
145145 f.close()
146146 return pk
147 @@ -1949,8 +1950,8 @@ class Agents(object):
147 @@ -1952,8 +1953,8 @@ class Agents(object):
148148 elif responseName == "TASK_CMD_JOB":
149149 #check if this is the powershell keylogging task, if so, write output to file instead of screen
150150 if keyLogTaskID and keyLogTaskID == taskID:
156156 message = "[!] WARNING: agent {} attempted skywalker exploit!".format(self.sessionID)
157157 signal = json.dumps({
158158 diff --git a/lib/common/empire.py b/lib/common/empire.py
159 index 75e9061..95967b7 100644
159 index d41e7e5..1aeb5d9 100644
160160 --- a/lib/common/empire.py
161161 +++ b/lib/common/empire.py
162162 @@ -182,7 +182,7 @@ class MainMenu(cmd.Cmd):
179179 self.conn.isolation_level = None
180180 return self.conn
181181 diff --git a/lib/common/helpers.py b/lib/common/helpers.py
182 index 45ee960..03d4f6f 100644
182 index 6942283..9dc8058 100644
183183 --- a/lib/common/helpers.py
184184 +++ b/lib/common/helpers.py
185185 @@ -594,7 +594,7 @@ def get_config(fields):
201201 conn.row_factory = dict_factory
202202 cur = conn.cursor()
203203 diff --git a/setup/reset.sh b/setup/reset.sh
204 index 6d38187..dd48b94 100755
204 index 5e291d8..dd48b94 100755
205205 --- a/setup/reset.sh
206206 +++ b/setup/reset.sh
207207 @@ -1,9 +1,9 @@
229229 + rm ~/.local/powershell-empire/empire.db
230230 fi
231231
232 -python ./setup_database.py
233 +python3 ./setup_database.py
232 python3 ./setup_database.py
234233 cd ..
235234
236235 # remove the debug file if it exists
249248 + rm -rf ~/.local/powershell-empire/downloads/
250249 fi
251250 diff --git a/setup/setup_database.py b/setup/setup_database.py
252 index ff1d1ca..20270a0 100755
251 index 9453037..d8f62a4 100755
253252 --- a/setup/setup_database.py
254253 +++ b/setup/setup_database.py
255254 @@ -60,7 +60,7 @@ OBFUSCATE_COMMAND = r'Token\All\1'
+7
-7
debian/patches/rename-jinja2-templates.patch less more
2424
2525 diff --git a/data/agent/stagers/dropbox.jinja2 b/data/agent/stagers/dropbox.jinja2
2626 new file mode 100644
27 index 0000000..212e8cb
27 index 0000000..b03deb5
2828 --- /dev/null
2929 +++ b/data/agent/stagers/dropbox.jinja2
3030 @@ -0,0 +1,133 @@
5151 +def post_message(uri, data):
5252 + global headers
5353 + req = urllib2.Request(uri)
54 + for key, value in headers.iteritems():
54 + for key, value in headers.items():
5555 + req.add_header("%s"%(key),"%s"%(value))
5656 +
5757 + if data:
163163 +exec(agent)
164164 diff --git a/data/agent/stagers/dropbox.py b/data/agent/stagers/dropbox.py
165165 deleted file mode 100644
166 index 38ec345..0000000
166 index a7776cc..0000000
167167 --- a/data/agent/stagers/dropbox.py
168168 +++ /dev/null
169169 @@ -1,135 +0,0 @@
192192 -def post_message(uri, data):
193193 - global headers
194194 - req = urllib2.Request(uri)
195 - for key, value in headers.iteritems():
195 - for key, value in headers.items():
196196 - req.add_header("%s"%(key),"%s"%(value))
197197 -
198198 - if data:
515515 -
516516 -exec(agent)
517517 diff --git a/lib/listeners/dbx.py b/lib/listeners/dbx.py
518 index d737426..3b8ce2d 100755
518 index 3236b8d..d709ac0 100755
519519 --- a/lib/listeners/dbx.py
520520 +++ b/lib/listeners/dbx.py
521521 @@ -418,7 +418,7 @@ class Listener(object):
528528 template_options = {
529529 'staging_folder': stagingFolder,
530530 diff --git a/lib/listeners/http.py b/lib/listeners/http.py
531 index 27945a8..2b79874 100644
531 index 19af31d..2b7a652 100644
532532 --- a/lib/listeners/http.py
533533 +++ b/lib/listeners/http.py
534534 @@ -651,8 +651,8 @@ class Listener(object):
543543 'working_hours': workingHours,
544544 'kill_date': killDate,
545545 diff --git a/lib/listeners/redirector.py b/lib/listeners/redirector.py
546 index 47e7066..2826f70 100644
546 index 843db97..e0e9b47 100644
547547 --- a/lib/listeners/redirector.py
548548 +++ b/lib/listeners/redirector.py
549549 @@ -417,7 +417,7 @@ class Listener(object):
+4
-15
debian/patches/update-shebang-for-python3.patch less more
33
44 ---
55 data/module_source/python/management/socks-src.py | 2 +-
6 lib/modules/python/collection/osx/imessage_dump.py | 2 +-
76 lib/modules/python/collection/osx/keychaindump_chainbreaker.py | 4 ++--
87 lib/modules/python/collection/osx/sniffer.py | 4 ++--
98 .../python/situational_awareness/host/osx/situational_awareness.py | 2 +-
10 5 files changed, 7 insertions(+), 7 deletions(-)
9 4 files changed, 6 insertions(+), 6 deletions(-)
1110
1211 diff --git a/data/module_source/python/management/socks-src.py b/data/module_source/python/management/socks-src.py
1312 index 8ad431a..9905136 100644
1918 from builtins import next
2019 from builtins import hex
2120 from builtins import object
22 diff --git a/lib/modules/python/collection/osx/imessage_dump.py b/lib/modules/python/collection/osx/imessage_dump.py
23 index 5b09512..bfd2b65 100644
24 --- a/lib/modules/python/collection/osx/imessage_dump.py
25 +++ b/lib/modules/python/collection/osx/imessage_dump.py
26 @@ -1,4 +1,4 @@
27 -#!/usr/bin/env python
28 +#!/usr/bin/env python3
29 from builtins import str
30 from builtins import object
31 class Module(object):
3221 diff --git a/lib/modules/python/collection/osx/keychaindump_chainbreaker.py b/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
33 index 0cfb9e4..08f71bd 100644
22 index 13c00b0..c2838b7 100644
3423 --- a/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
3524 +++ b/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
3625 @@ -1207,7 +1207,7 @@ def __profile__():
5241 # Author : n0fate
5342 # E-Mail [email protected], [email protected]
5443 diff --git a/lib/modules/python/collection/osx/sniffer.py b/lib/modules/python/collection/osx/sniffer.py
55 index ebd7e3f..ee0ef16 100644
44 index c6c614c..369d19e 100644
5645 --- a/lib/modules/python/collection/osx/sniffer.py
5746 +++ b/lib/modules/python/collection/osx/sniffer.py
5847 @@ -1,4 +1,4 @@
6958 \ No newline at end of file
7059 + return script
7160 diff --git a/lib/modules/python/situational_awareness/host/osx/situational_awareness.py b/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
72 index 0562932..fe60f3a 100644
61 index 9f7f8a4..8241891 100644
7362 --- a/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
7463 +++ b/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
7564 @@ -1,4 +1,4 @@