Skip to content

Fix python3 issues in exec_info #2

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

Open
erfanio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix python3 issues in exec_info #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions jdwp-shellifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,18 +596,18 @@ def _get_value(self, refTypeId, fieldId):
field = self._parse_entries(buf, formats)[0]
return field

def _create_string(self, data: bytes):
def _create_string(self, data: str):
buf = self._build_string(data)
self._socket.sendall(self._create_packet(CREATESTRING_SIG, data=buf))
buf = self._read_reply()
return self._parse_entries(buf, [(self.objectIDSize, "objId")], False)

def _build_string(self, data: bytes):
return struct.pack(">I", len(data)) + data
def _build_string(self, data: str):
return struct.pack(">I", len(data)) + data.encode('utf-8')

def _read_string(self, data):
def _read_string(self, data: bytes):
size = struct.unpack(">I", data[:4])[0]
return data[4 : 4 + size]
return data[4 : 4 + size].decode('utf-8')

def _suspend_vm(self):
self._socket.sendall(self._create_packet(SUSPENDVM_SIG))
Expand Down Expand Up @@ -806,12 +806,12 @@ def _exec_info(self, threadId: int):
propObjId = propObjIds[0]["objId"]

data = [
chr(TAG_OBJECT) + self._format(self.objectIDSize, propObjId),
struct.pack(">B", TAG_OBJECT) + self._format(self.objectIDSize, propObjId),
]
buf = self._invoke_static(
systemClass["refTypeId"], threadId, getPropertyMeth["methodId"], *data
)
if buf[0] != chr(TAG_STRING):
if buf[0] != TAG_STRING:
print(("[-] %s: Unexpected returned type: expecting String" % propStr))
else:
retId = self._unformat(
Expand Down Expand Up @@ -846,8 +846,6 @@ def _exec_payload(
"""
print(f"[+] Payload to send: '{command}'")

command = command.encode(encoding="utf-8")

# Allocate string containing our command to exec()
cmd_obj_ids = self._create_string(command)
if not cmd_obj_ids:
Expand Down