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

Jump to bottom

str/byte, new server message check, agents listing bug #103

Merged
merged 14 commits into from Feb 29, 2020
Merged

str/byte, new server message check, agents listing bug #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
85daa18
Merge pull request #1 from BC-SECURITY/master
hypnoticpattern Jan 31, 2020
bd1dff4
Fixed osx stager generation byte/str errors
Jan 31, 2020
7e3d8df
Align encode with the standard 'utf-8' option
Feb 1, 2020
8d4407c
Fixed osx stager generation byte/str errors
Feb 1, 2020
148de2d
Fixed bug in the macho launcherCode generation
Feb 3, 2020
240ffa9
Merge branch 'master' into dev
hypnoticpattern Feb 3, 2020
778c913
Merge branch 'dev'
Feb 5, 2020
2b06456
Merge branch 'BC-SECURITY-dev' into dev
Feb 5, 2020
a7247eb
Fixed str/byte erro in Python3 and typo
Feb 11, 2020
34b0a9d
main() exception checking server messages
Feb 12, 2020
2b67480
Fixed format string bug in Python3
Feb 13, 2020
486fbc6
Merge pull request #3 from BC-SECURITY/dev
hypnoticpattern Feb 13, 2020
2dabacb
Changed download, upload description
Feb 16, 2020
b16fe63
Merge branch 'dev' of https://github.com/hypnoticpattern/Empire into dev
Feb 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/agent/agent.py
View file
Open in desktop
Expand Up @@ -1057,7 +1057,7 @@ def get_file_part(filePath, offset=0, chunkSize=512000, base64=True):
except Exception as e:
result = build_response_packet(0, str('[!] Failed to check job buffer!: ' + str(e)))
process_job_tasking(result)
if data == defaultResponse:
if data.strip() == defaultResponse.strip():
missedCheckins = 0
else:
decode_routing_packet(data)
Expand Down
12 changes: 7 additions & 5 deletions lib/common/empire.py
View file
Open in desktop
Expand Up @@ -2215,7 +2215,7 @@ def do_sysinfo(self, line):


def do_download(self, line):
"Task an agent to download a file."
"Task an agent to download a file into the C2."

line = line.strip()

Expand All @@ -2236,7 +2236,7 @@ def do_download(self, line):


def do_upload(self, line):
"Task an agent to upload a file."
"Task the C2 to upload a file into an agent."

# "upload /path/file.ext" or "upload /path/file/file.ext newfile.ext"
# absolute paths accepted
Expand Down Expand Up @@ -3286,7 +3286,7 @@ def do_sysinfo(self, line):


def do_download(self, line):
"Task an agent to download a file."
"Task an agent to download a file into the C2."

line = line.strip()

Expand All @@ -3308,7 +3308,7 @@ def do_download(self, line):


def do_upload(self, line):
"Task an agent to upload a file."
"Task the C2 to upload a file into an agent."

# "upload /path/file.ext" or "upload /path/file/file.ext newfile.ext"
# absolute paths accepted
Expand All @@ -3327,7 +3327,7 @@ def do_upload(self, line):
# TODO: reimplement Python file upload

# # read in the file and base64 encode it for transport
f = open(parts[0], 'r')
f = open(parts[0], 'rb')
fileData = f.read()
f.close()
# Get file size
Expand All @@ -3350,6 +3350,8 @@ def do_upload(self, line):
# get final file size
fileData = helpers.encode_base64(fileData)
# upload packets -> "filename | script data"
if isinstance(fileData, bytes):
fileData = fileData.decode("utf-8")
data = uploadname + "|" + fileData

# dispatch this event
Expand Down
2 changes: 1 addition & 1 deletion lib/common/helpers.py
View file
Open in desktop
Expand Up @@ -822,7 +822,7 @@ def decode_base64(data):

def encode_base64(data):
"""
Decode data as a base64 string.
Encode data as a base64 string.
"""
return base64.encodebytes(data).strip()

Expand Down
6 changes: 3 additions & 3 deletions lib/common/messages.py
View file
Open in desktop
Expand Up @@ -199,9 +199,9 @@ def display_agents(agents):
print(" %.8s %.2s %.15s %.17s %.23s %.18s %.6s %.8s %.31s %.16s" % ('{0: <8}'.format(agent['name']),
'{0: <2}'.format(agent['language']),
'{0: <15}'.format(str(agent['internal_ip']).split(" ")[0]),
'{0: <17}'.format(agent['hostname']),
'{0: <23}'.format(agent['username']),
'{0: <18}'.format(agent['process_name']),
'{0: <17}'.format(str(agent['hostname'])),
'{0: <23}'.format(str(agent['username'])),
'{0: <18}'.format(str(agent['process_name'])),
'{0: <6}'.format(str(agent['process_id'])),
'{0: <8}'.format(str(agent['delay']) + "/" +str(agent['jitter'])),
'{0: <31}'.format(str(helpers.lastseen(agent['lastseen_time'], agent['delay'], agent['jitter']))),
Expand Down