Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0 bug fixes #46

Merged
merged 25 commits into from
Dec 30, 2019
Merged

3.0 bug fixes #46

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6e3f56d
Fixed error in windows/macro - #30
Cx01N Dec 24, 2019
3c655b3
Fixed upload file - #30
Cx01N Dec 24, 2019
ed28673
Updated changelog
Cx01N Dec 24, 2019
3f207e7
Updated wmi.py authors
Cx01N Dec 24, 2019
8950e11
Updated version number
Cx01N Dec 25, 2019
6a4f7c9
fix for #31
Hubbl3 Dec 26, 2019
c9c5fe9
Fixed upload for large files - #30
Cx01N Dec 26, 2019
a947f39
Fix for sysinfo error
invalid-email-address Dec 26, 2019
48f241c
fix sysinfo python error
invalid-email-address Dec 26, 2019
99831de
Removed 24 Jun 18 commit changes to address #16 Long running module l…
Hubbl3 Dec 26, 2019
6f66417
Merge branch '3.0-bug-fixes' of https://github.com/BC-SECURITY/Empire…
Hubbl3 Dec 26, 2019
95fb73b
Merge branch 'pr36' into 3.0-bug-fixes
Cx01N Dec 27, 2019
647b5d6
Fixed screenshot and download errors
Cx01N Dec 28, 2019
5da0e2f
Merge branch 'screenshot-fixes' into 3.0-bug-fixes
Cx01N Dec 28, 2019
ec21f24
Removed duplicate sysinfo print
Cx01N Dec 28, 2019
72e0c81
Fixed misspelling
Cx01N Dec 28, 2019
b6afd79
updating? to upstream ?
invalid-email-address Dec 28, 2019
dfe2ffd
Merge recent commits from upstream into fork
invalid-email-address Dec 28, 2019
53aa102
gitignore gitignore
invalid-email-address Dec 28, 2019
683baa1
Fixed meterpreter error
Cx01N Dec 29, 2019
cf44f2f
Fixes error message related to hashing in scriptimport
invalid-email-address Dec 29, 2019
bef9504
Cleaned up print results
Cx01N Dec 30, 2019
36bc64a
Merge pull request #45 from Invoke-Mimikatz/3.0-bug-fixes
vinnybod Dec 30, 2019
e52a7ea
Updated changelog
Cx01N Dec 30, 2019
381cbc7
Updated changelog
Cx01N Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ setup/bomutils/
.venv
.DS_Store
venv/

addons/
.gitignore
6 changes: 3 additions & 3 deletions lib/common/empire.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2291,17 +2291,17 @@ def do_scriptimport(self, line):
self.mainMenu.agents.add_agent_task_db(self.sessionID, "TASK_SCRIPT_IMPORT", script_data)

# dispatch this event
message = "[*] Tasked agent to import {}: {}".format(path, hashlib.md5(script_data).hexdigest())
message = "[*] Tasked agent to import {}: {}".format(path, hashlib.md5(script_data.encode('utf-8')).hexdigest())
signal = json.dumps({
'print': False,
'message': message,
'import_path': path,
'import_md5': hashlib.md5(script_data).hexdigest()
'import_md5': hashlib.md5(script_data.encode('utf-8')).hexdigest()
})
dispatcher.send(signal, sender="agents/{}".format(self.sessionID))

# update the agent log with the filename and MD5
msg = "Tasked agent to import %s : %s" % (path, hashlib.md5(script_data).hexdigest())
msg = "Tasked agent to import %s : %s" % (path, hashlib.md5(script_data.encode('utf-8')).hexdigest())
self.mainMenu.agents.save_agent_log(self.sessionID, msg)

# extract the functions from the script so we can tab-complete them
Expand Down