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

Update master #8

Merged
merged 6 commits into from
Jan 5, 2020
Merged

Update master #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0c72ac
Refactoring. Function Win32CryptUnprotectData returns bytes instead o…
MyLoginOnGitHub Jan 3, 2020
74f758b
Changed encoding for outlook passwords
MyLoginOnGitHub Jan 3, 2020
af89c8e
fix chrome - access violation error
AlessandroZ Jan 3, 2020
19708a2
Merge pull request #464 from MyLoginOnGitHub/refactor-456
AlessandroZ Jan 3, 2020
ddcf3b4
revert vault commit
AlessandroZ Jan 3, 2020
6c6949f
Merge branch 'master' of https://github.com/AlessandroZ/LaZagne
AlessandroZ Jan 3, 2020
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
60 changes: 12 additions & 48 deletions Windows/lazagne/config/winstructure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,6 @@ class DATA(Structure):
]


class DATA2(Structure):
_fields_ = [
# ('boolean', BOOL),
# ('short', SHORT),
# ('unsignedShort', WORD),
# ('int', LONG),
# ('unsignedInt', ULONG),
('double', DOUBLE),
('guid', GUID),
('string', LPWSTR),
# ('byteArray', VAULT_BYTE_BUFFER),
# ('protectedArray', VAULT_BYTE_BUFFER),
# ('attribute', PVAULT_CREDENTIAL_ATTRIBUTEW),
('Sid', PSID)
# ('sid', DWORD)
]


class Flag(Structure):
_fields_ = [
('0x00', DWORD),
Expand All @@ -202,9 +184,7 @@ class VAULT_ITEM_DATA(Structure):
_fields_ = [
# ('schemaElementId', DWORD),
# ('unk0', DWORD),
# ('Type', VAULT_ELEMENT_TYPE),
# ('type', Flag),
# ('type', DWORD * 14),
# ('Type', DWORD),
# ('unk1', DWORD),
('data', DATA),
]
Expand All @@ -213,28 +193,14 @@ class VAULT_ITEM_DATA(Structure):
PVAULT_ITEM_DATA = POINTER(VAULT_ITEM_DATA)


class VAULT_ITEM_DATA2(Structure):
_fields_ = [
# ('schemaElementId', DWORD),
# ('unk0', DWORD),
# ('Type', VAULT_ELEMENT_TYPE),
# ('type', Flag),
# ('type', DWORD * 14),
# ('unk1', DWORD),
('data', DATA2),
]


PVAULT_ITEM_DATA2 = POINTER(VAULT_ITEM_DATA2)


# From https://github.com/gentilkiwi/mimikatz/blob/b008188f9fe5668b5dae80c210290c7efa872ffa/mimikatz/modules/kuhl_m_vault.h#L157
class VAULT_ITEM_WIN8(Structure):
_fields_ = [
('id', GUID),
('pName', PWSTR),
('pResource', PVAULT_ITEM_DATA),
('pUsername', PVAULT_ITEM_DATA),
('pPassword', PVAULT_ITEM_DATA2),
('pPassword', PVAULT_ITEM_DATA),
('pPackageSid', PVAULT_ITEM_DATA),
('LastWritten', FILETIME),
('Flags', DWORD),
Expand All @@ -246,18 +212,21 @@ class VAULT_ITEM_WIN8(Structure):
PVAULT_ITEM_WIN8 = POINTER(VAULT_ITEM_WIN8)


# From https://github.com/gentilkiwi/mimikatz/blob/b008188f9fe5668b5dae80c210290c7efa872ffa/mimikatz/modules/kuhl_m_vault.h#L145
class VAULT_ITEM_WIN7(Structure):
_fields_ = [
('id', GUID),
('pName', PWSTR),
('pResource', PVAULT_ITEM_DATA),
('pUsername', PVAULT_ITEM_DATA),
('pPassword', PVAULT_ITEM_DATA2),
('pPassword', PVAULT_ITEM_DATA),
('LastWritten', FILETIME),
('Flags', DWORD),
('cbProperties', DWORD),
('Properties', PVAULT_ITEM_DATA),
]


PVAULT_ITEM_WIN7 = POINTER(VAULT_ITEM_WIN7)

class OSVERSIONINFOEXW(Structure):
Expand Down Expand Up @@ -426,10 +395,6 @@ def __repr__(self):
CredFree.restype = PVOID
CredFree.argtypes = [PVOID]

memcpy = cdll.msvcrt.memcpy
memcpy.restype = PVOID
memcpy.argtypes = [PVOID]

LocalFree = kernel32.LocalFree
LocalFree.restype = HANDLE
LocalFree.argtypes = [HANDLE]
Expand Down Expand Up @@ -600,11 +565,10 @@ def RtlAdjustPrivilege(privilege_id):


def getData(blobOut):
cbData = int(blobOut.cbData)
cbData = blobOut.cbData
pbData = blobOut.pbData
buffer = c_buffer(cbData)

memcpy(buffer, pbData, cbData)
buffer = create_string_buffer(cbData)
memmove(buffer, pbData, sizeof(buffer))
LocalFree(pbData);
return buffer.raw

Expand Down Expand Up @@ -645,11 +609,11 @@ def Win32CryptUnprotectData(cipherText, entropy=False, is_current_user=True, use
blobEntropy = DATA_BLOB(len(entropy), bufferEntropy)

if CryptUnprotectData(byref(blobIn), None, byref(blobEntropy), None, None, 0, byref(blobOut)):
decrypted = getData(blobOut).decode("utf-8")
decrypted = getData(blobOut)

else:
if CryptUnprotectData(byref(blobIn), None, None, None, None, 0, byref(blobOut)):
decrypted = getData(blobOut).decode("utf-8")
decrypted = getData(blobOut)

if not decrypted:
can_decrypt = True
Expand Down
5 changes: 3 additions & 2 deletions Windows/lazagne/softwares/browsers/chromium_based.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ def _export_credentials(self, db_path, is_yandex=False):
# Failed...
else:
# Decrypt the Password
password = Win32CryptUnprotectData(password, is_current_user=constant.is_current_user,
user_dpapi=constant.user_dpapi)
password_bytes = Win32CryptUnprotectData(password, is_current_user=constant.is_current_user,
user_dpapi=constant.user_dpapi)
password = password_bytes.decode("utf-8")

if not url and not login and not password:
continue
Expand Down
3 changes: 2 additions & 1 deletion Windows/lazagne/softwares/browsers/ie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def history_from_regedit(self):
def decipher_password(self, cipher_text, u):
pwd_found = []
# deciper the password
pwd = win.Win32CryptUnprotectData(cipher_text, u, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
pwd_bytes = win.Win32CryptUnprotectData(cipher_text, u, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
pwd = pwd_bytes.decode("utf-8")
a = ''
if pwd:
for i in range(len(pwd)):
Expand Down
3 changes: 2 additions & 1 deletion Windows/lazagne/softwares/chats/skype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def get_regkey(self):

# num = winreg.QueryInfoKey(hkey)[1]
k = winreg.EnumValue(hkey, 0)[1]
return win.Win32CryptUnprotectData(k, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
result_bytes = win.Win32CryptUnprotectData(k, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
return result_bytes.decode("utf-8")
except Exception as e:
self.debug(str(e))
return False
Expand Down
9 changes: 7 additions & 2 deletions Windows/lazagne/softwares/mails/outlook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@ def retrieve_info(self, hkey, name_key):
k = winreg.EnumValue(hkey, x)
if 'password' in k[0].lower():
try:
password = win.Win32CryptUnprotectData(k[1][1:], is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
values[k[0]] = password
password_bytes = win.Win32CryptUnprotectData(k[1][1:], is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
# password_bytes is <password in utf-16> + b'\x00\x00'
terminator = b'\x00\x00'
if password_bytes.endswith(terminator):
password_bytes = password_bytes[: -len(terminator)]

values[k[0]] = password_bytes.decode("utf-16")
except Exception as e:
self.debug(str(e))
values[k[0]] = 'N/A'
Expand Down
4 changes: 2 additions & 2 deletions Windows/lazagne/softwares/svn/tortoise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ def run(self):
# encrypted the password
if result:
try:
password = Win32CryptUnprotectData(base64.b64decode(result), is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
password_bytes = Win32CryptUnprotectData(base64.b64decode(result), is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
pwd_found.append({
'URL': url,
'Login': username,
'Password': str(password)
'Password': password_bytes.decode("utf-8")
})
except Exception:
pass
Expand Down
4 changes: 2 additions & 2 deletions Windows/lazagne/softwares/sysadmin/cyberduck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ def run(self):
or elem.attrib['name'].startswith('sftp') or elem.attrib['name'].startswith('http') \
or elem.attrib['name'].startswith('https'):
encrypted_password = base64.b64decode(elem.attrib['value'])
password = Win32CryptUnprotectData(encrypted_password, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
password_bytes = Win32CryptUnprotectData(encrypted_password, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
pwd_found.append({
'URL': elem.attrib['name'],
'Password': password,
'Password': password_bytes.decode("utf-8"),
})
except Exception as e:
self.debug(str(e))
Expand Down
9 changes: 5 additions & 4 deletions Windows/lazagne/softwares/sysadmin/openvpn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ def check_openvpn_installed(self):
return False

def decrypt_password(self, encrypted_password, entropy):
return Win32CryptUnprotectData(encrypted_password,
entropy=entropy,
is_current_user=constant.is_current_user,
user_dpapi=constant.user_dpapi)
result_bytes = Win32CryptUnprotectData(encrypted_password,
entropy=entropy,
is_current_user=constant.is_current_user,
user_dpapi=constant.user_dpapi)
return result_bytes.decode("utf-8")

def get_credentials(self, key):
pwd_found = []
Expand Down
3 changes: 2 additions & 1 deletion Windows/lazagne/softwares/sysadmin/rdpmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ def __init__(self):
def decrypt_password(self, encrypted_password):
try:
decoded = base64.b64decode(encrypted_password)
password_decrypted = Win32CryptUnprotectData(decoded, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
password_decrypted_bytes = Win32CryptUnprotectData(decoded, is_current_user=constant.is_current_user, user_dpapi=constant.user_dpapi)
password_decrypted = password_decrypted_bytes.decode("utf-8")
password_decrypted = password_decrypted.replace('\x00', '')
except Exception:
password_decrypted = encrypted_password.replace('\x00', '')
Expand Down