Skip to content

Commit

Permalink
Merge pull request AlessandroZ#254 from ingested/master
Browse files Browse the repository at this point in the history
Fix encoding errors, MD5 variable error, code refactor
  • Loading branch information
AlessandroZ authored Jul 31, 2018
2 parents 1a0372c + d11a043 commit d5ea8c7
Show file tree
Hide file tree
Showing 7 changed files with 933 additions and 914 deletions.
202 changes: 95 additions & 107 deletions Windows/lazagne/config/manage_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,158 +3,146 @@
from lazagne.softwares.browsers.ie import IE
from lazagne.softwares.browsers.mozilla import firefox_browsers
from lazagne.softwares.browsers.ucbrowser import UCBrowser

# Chats
from lazagne.softwares.chats.pidgin import Pidgin
from lazagne.softwares.chats.skype import Skype
from lazagne.softwares.chats.psi import PSI

from lazagne.softwares.chats.skype import Skype
# Databases
from lazagne.softwares.databases.dbvis import Dbvisualizer
from lazagne.softwares.databases.squirrel import Squirrel
from lazagne.softwares.databases.sqldeveloper import SQLDeveloper
from lazagne.softwares.databases.robomongo import Robomongo
from lazagne.softwares.databases.postgresql import PostgreSQL

from lazagne.softwares.databases.robomongo import Robomongo
from lazagne.softwares.databases.sqldeveloper import SQLDeveloper
from lazagne.softwares.databases.squirrel import Squirrel
from lazagne.softwares.games.galconfusion import GalconFusion
# Games
from lazagne.softwares.games.kalypsomedia import KalypsoMedia
from lazagne.softwares.games.galconfusion import GalconFusion
from lazagne.softwares.games.roguestale import RoguesTale
from lazagne.softwares.games.turba import Turba

# Git
from lazagne.softwares.git.gitforwindows import GitForWindows

# Mails
from lazagne.softwares.mails.outlook import Outlook
from lazagne.softwares.mails.thunderbird import Thunderbird

# Maven
from lazagne.softwares.maven.mavenrepositories import MavenRepositories

# Memory
from lazagne.softwares.memory.keepass import Keepass
from lazagne.softwares.memory.memorydump import MemoryDump

# Php
from lazagne.softwares.php.composer import Composer

# Svn
from lazagne.softwares.svn.tortoise import Tortoise

# Sysadmin
from lazagne.softwares.sysadmin.apachedirectorystudio import ApacheDirectoryStudio
from lazagne.softwares.sysadmin.coreftp import CoreFTP
from lazagne.softwares.sysadmin.cyberduck import Cyberduck
from lazagne.softwares.sysadmin.filezilla import Filezilla
from lazagne.softwares.sysadmin.ftpnavigator import FtpNavigator
from lazagne.softwares.sysadmin.puttycm import Puttycm
from lazagne.softwares.sysadmin.opensshforwindows import OpenSSHForWindows
from lazagne.softwares.sysadmin.puttycm import Puttycm
from lazagne.softwares.sysadmin.rdpmanager import RDPManager
from lazagne.softwares.sysadmin.unattended import Unattended
from lazagne.softwares.sysadmin.winscp import WinSCP

# Wifi
from lazagne.softwares.wifi.wifi import Wifi

# Windows
from lazagne.softwares.windows.autologon import Autologon
from lazagne.softwares.windows.cachedump import Cachedump
from lazagne.softwares.windows.credman import Credman
from lazagne.softwares.windows.creds_files import CredFiles
from lazagne.softwares.windows.hashdump import Hashdump
from lazagne.softwares.windows.lsa_secrets import LSASecrets
from lazagne.softwares.windows.vault import Vault
from lazagne.softwares.windows.windows import WindowsPassword
from lazagne.softwares.windows.creds_files import CredFiles


def get_categories():
category = {
'browsers' : {'help': 'Web browsers supported'},
'chats' : {'help': 'Chat clients supported'},
'databases' : {'help': 'SQL/NoSQL clients supported'},
'games' : {'help': 'Games etc.'},
'git' : {'help': 'GIT clients supported'},
'mails' : {'help': 'Email clients supported'},
'maven' : {'help': 'Maven java build tool'},
'memory' : {'help': 'Retrieve passwords from memory'},
'php' : {'help': 'PHP build tool'},
'svn' : {'help': 'SVN clients supported'},
'sysadmin' : {'help': 'SCP/SSH/FTP/FTPS clients supported'},
'windows' : {'help': 'Windows credentials (credential manager, etc.)'},
'wifi' : {'help': 'Wifi'},
}
return category

category = {
'browsers': {'help': 'Web browsers supported'},
'chats': {'help': 'Chat clients supported'},
'databases': {'help': 'SQL/NoSQL clients supported'},
'games': {'help': 'Games etc.'},
'git': {'help': 'GIT clients supported'},
'mails': {'help': 'Email clients supported'},
'maven': {'help': 'Maven java build tool'},
'memory': {'help': 'Retrieve passwords from memory'},
'php': {'help': 'PHP build tool'},
'svn': {'help': 'SVN clients supported'},
'sysadmin': {'help': 'SCP/SSH/FTP/FTPS clients supported'},
'windows': {'help': 'Windows credentials (credential manager, etc.)'},
'wifi': {'help': 'Wifi'},
}
return category


def get_modules():
moduleNames = [

# Browser
IE(),
UCBrowser(),

# Chats
Pidgin(),
Skype(),
PSI(),

# Databases
Dbvisualizer(),
Squirrel(),
SQLDeveloper(),
Robomongo(),
PostgreSQL(),

# games
KalypsoMedia(),
GalconFusion(),
RoguesTale(),
Turba(),

# Git
GitForWindows(),

# Mails
Outlook(),
Thunderbird(),

# Maven
MavenRepositories(),

# Memory
MemoryDump(), # retrieve browsers and keepass passwords
Keepass(), # should be launched after memory dump

# Php
Composer(),

# SVN
Tortoise(),

# Sysadmin
ApacheDirectoryStudio(),
CoreFTP(),
Cyberduck(),
Filezilla(),
FtpNavigator(),
Puttycm(),
OpenSSHForWindows(),
RDPManager(),
Unattended(),
WinSCP(),

# Wifi
Wifi(),

# Windows
Autologon(),
Cachedump(),
Credman(),
Hashdump(),
LSASecrets(),
Vault(),
WindowsPassword(),
CredFiles(),
]
return moduleNames + chromium_browsers + firefox_browsers
module_names = [

# Browser
IE(),
UCBrowser(),

# Chats
Pidgin(),
Skype(),
PSI(),

# Databases
Dbvisualizer(),
Squirrel(),
SQLDeveloper(),
Robomongo(),
PostgreSQL(),

# games
KalypsoMedia(),
GalconFusion(),
RoguesTale(),
Turba(),

# Git
GitForWindows(),

# Mails
Outlook(),
Thunderbird(),

# Maven
MavenRepositories(),

# Memory
MemoryDump(), # retrieve browsers and keepass passwords
Keepass(), # should be launched after memory dump

# Php
Composer(),

# SVN
Tortoise(),

# Sysadmin
ApacheDirectoryStudio(),
CoreFTP(),
Cyberduck(),
Filezilla(),
FtpNavigator(),
Puttycm(),
OpenSSHForWindows(),
RDPManager(),
Unattended(),
WinSCP(),

# Wifi
Wifi(),

# Windows
Autologon(),
Cachedump(),
Credman(),
Hashdump(),
LSASecrets(),
Vault(),
WindowsPassword(),
CredFiles(),
]
return module_names + chromium_browsers + firefox_browsers
4 changes: 2 additions & 2 deletions Windows/lazagne/config/winstructure.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,13 @@ def Win32CryptUnprotectData(cipherText, entropy=None):
blobEntropy = DATA_BLOB(len(entropy), bufferEntropy)

if CryptUnprotectData(byref(blobIn), None, byref(blobEntropy), None, None, 0, byref(blobOut)):
return getData(blobOut)
return getData(blobOut).decode("utf-8")
else:
return False

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

Expand Down
Loading

0 comments on commit d5ea8c7

Please sign in to comment.