Skip to content

Commit ae0ec30

Browse files
gabrielg5gabrielg5
authored
Techdebt examples bootstrapping v2 (#1928)
* Standardized examples logger init method * Fixing missing import * Standardized examples init_ldap_session function #1 * Calling new shared function _ldap3_kerberos_login from example addcomputer * Removed considering -debug in each example. Now it's handled in utils. * Standardized EMPTY_LM_HASH in impacket.examples.utils * Unify parse_identity function (phase 1) * Standardized parse_identity * Renamed "_ldap3_kerberos_login" to "ldap3_kerberos_login" (as it is called from outside) * Standardize "logger" init in regsecrets.py * Standardized LDAP login into a single function in utils.py:ldap_login
1 parent 0711a41 commit ae0ec30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+476
-1772
lines changed

‎examples/DumpNTLMInfo.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -631,11 +631,11 @@ def __convert_size(self, size_bytes):
631631
if __name__ == '__main__':
632632

633633
print(version.BANNER)
634-
logger.init()
635634

636635
parser = argparse.ArgumentParser(add_help = True, description = "Do ntlm authentication and parse information.")
637636
parser.add_argument('target', action='store', help='<targetName or address>')
638637
parser.add_argument('-debug', action='store_true', help='Turn DEBUG output ON')
638+
parser.add_argument('-ts', action='store_true', help='Adds timestamp to every logging output')
639639
parser.add_argument('-target-ip', action='store', metavar="ip address",
640640
help='IP Address of the target machine. If omitted it will use whatever was specified as target. '
641641
'This is useful when target is the NetBIOS name and you cannot resolve it')
@@ -649,6 +649,7 @@ def __convert_size(self, size_bytes):
649649
sys.exit(1)
650650

651651
options = parser.parse_args()
652+
logger.init(options.ts, options.debug)
652653

653654
if options.port == 135:
654655
if not options.protocol:
@@ -660,12 +661,6 @@ def __convert_size(self, size_bytes):
660661
options.protocol = 'SMB'
661662
logging.info("Defaulting to SMB protocol.")
662663

663-
if options.debug is True:
664-
logging.getLogger().setLevel(logging.DEBUG)
665-
logging.debug(version.getInstallationPath())
666-
else:
667-
logging.getLogger().setLevel(logging.INFO)
668-
669664
try:
670665
if options.target_ip is not None:
671666
dumper = DumpNtlm(options.target_ip, options.target, int(options.port), options.protocol)

‎examples/Get-GPPPassword.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -257,19 +257,6 @@ def parse_target(args):
257257

258258
return domain, username, password, address, lmhash, nthash
259259

260-
261-
def init_logger(args):
262-
# Init the example's logger theme and debug level
263-
logger.init(args.ts)
264-
if args.debug is True:
265-
logging.getLogger().setLevel(logging.DEBUG)
266-
# Print the Library's installation path
267-
logging.debug(version.getInstallationPath())
268-
else:
269-
logging.getLogger().setLevel(logging.INFO)
270-
logging.getLogger("impacket.smbserver").setLevel(logging.ERROR)
271-
272-
273260
def init_smb_session(args, domain, username, password, address, lmhash, nthash):
274261
smbClient = SMBConnection(address, args.target_ip, sess_port=int(args.port))
275262
dialect = smbClient.getDialect()
@@ -295,7 +282,7 @@ def init_smb_session(args, domain, username, password, address, lmhash, nthash):
295282
if __name__ == '__main__':
296283
print(version.BANNER)
297284
args = parse_args()
298-
init_logger(args)
285+
logger.init(args.ts, args.debug)
299286

300287
if args.target.upper() == "LOCAL":
301288
if args.xmlfile is not None:

‎examples/GetADComputers.py

+6-82
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
from impacket import version
3939
from impacket.dcerpc.v5.samr import UF_ACCOUNTDISABLE
4040
from impacket.examples import logger
41-
from impacket.examples.utils import parse_credentials
41+
from impacket.examples.utils import parse_identity, ldap_login
4242
from impacket.ldap import ldap, ldapasn1
43-
from impacket.smbconnection import SMBConnection, SessionError
4443

4544

4645
class GetADComputers:
@@ -83,31 +82,6 @@ def __init__(self, username, password, domain, cmdLineOptions):
8382
self.__colLen = [15, 35, 15, 20]
8483
self.__outputFormat = ' '.join(['{%d:%ds} ' % (num, width) for num, width in enumerate(self.__colLen)])
8584

86-
87-
88-
def getMachineName(self, target):
89-
try:
90-
s = SMBConnection(target, target)
91-
s.login('', '')
92-
except OSError as e:
93-
if str(e).find('timed out') > 0:
94-
raise Exception('The connection is timed out. Probably 445/TCP port is closed. Try to specify '
95-
'corresponding NetBIOS name or FQDN as the value of the -dc-host option')
96-
else:
97-
raise
98-
except SessionError as e:
99-
if str(e).find('STATUS_NOT_SUPPORTED') > 0:
100-
raise Exception('The SMB request is not supported. Probably NTLM is disabled. Try to specify '
101-
'corresponding NetBIOS name or FQDN as the value of the -dc-host option')
102-
else:
103-
raise
104-
except Exception:
105-
if s.getServerName() == '':
106-
raise Exception('Error while anonymous logging into %s' % target)
107-
else:
108-
s.logoff()
109-
return s.getServerName()
110-
11185
@staticmethod
11286
def getUnixTime(t):
11387
t -= 116444736000000000
@@ -181,46 +155,10 @@ def processRecord(self, item):
181155
pass
182156

183157
def run(self):
184-
if self.__kdcHost is not None:
185-
self.__target = self.__kdcHost
186-
else:
187-
if self.__kdcIP is not None:
188-
self.__target = self.__kdcIP
189-
else:
190-
self.__target = self.__domain
191-
192-
if self.__doKerberos:
193-
logging.info('Getting machine hostname')
194-
self.__target = self.getMachineName(self.__target)
195-
196-
197158
# Connect to LDAP
198-
try:
199-
ldapConnection = ldap.LDAPConnection('ldap://%s' % self.__target, self.baseDN, self.__kdcIP)
200-
if self.__doKerberos is not True:
201-
ldapConnection.login(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash)
202-
else:
203-
ldapConnection.kerberosLogin(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
204-
self.__aesKey, kdcHost=self.__kdcIP)
205-
except ldap.LDAPSessionError as e:
206-
if str(e).find('strongerAuthRequired') >= 0:
207-
# We need to try SSL
208-
ldapConnection = ldap.LDAPConnection('ldaps://%s' % self.__target, self.baseDN, self.__kdcIP)
209-
if self.__doKerberos is not True:
210-
ldapConnection.login(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash)
211-
else:
212-
ldapConnection.kerberosLogin(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
213-
self.__aesKey, kdcHost=self.__kdcIP)
214-
else:
215-
if str(e).find('NTLMAuthNegotiate') >= 0:
216-
logging.critical("NTLM negotiation failed. Probably NTLM is disabled. Try to use Kerberos "
217-
"authentication instead.")
218-
else:
219-
if self.__kdcIP is not None and self.__kdcHost is not None:
220-
logging.critical("If the credentials are valid, check the hostname and IP address of KDC. They "
221-
"must match exactly each other.")
222-
raise
223-
159+
ldapConnection = ldap_login(self.__target, self.baseDN, self.__kdcIP, self.__kdcHost, self.__doKerberos, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash, self.__aesKey)
160+
# updating "self.__target" as it may have changed in the ldap_login processing
161+
self.__target = ldapConnection._dstHost
224162
logging.info('Querying %s for information about domain.' % self.__target)
225163
# Print header
226164
print((self.__outputFormat.format(*self.__header)))
@@ -281,28 +219,14 @@ def run(self):
281219
options = parser.parse_args()
282220

283221
# Init the example's logger theme
284-
logger.init(options.ts)
285-
286-
if options.debug is True:
287-
logging.getLogger().setLevel(logging.DEBUG)
288-
# Print the Library's installation path
289-
logging.debug(version.getInstallationPath())
290-
else:
291-
logging.getLogger().setLevel(logging.INFO)
222+
logger.init(options.ts, options.debug)
292223

293-
domain, username, password = parse_credentials(options.target)
224+
domain, username, password, _, _, options.k = parse_identity(options.target, options.hashes, options.no_pass, options.aesKey, options.k)
294225

295226
if domain == '':
296227
logging.critical('Domain should be specified!')
297228
sys.exit(1)
298229

299-
if password == '' and username != '' and options.hashes is None and options.no_pass is False and options.aesKey is None:
300-
from getpass import getpass
301-
password = getpass("Password:")
302-
303-
if options.aesKey is not None:
304-
options.k = True
305-
306230
try:
307231
executer = GetADComputers(username, password, domain, options)
308232
executer.run()

‎examples/GetADUsers.py

+6-80
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535
from impacket import version
3636
from impacket.dcerpc.v5.samr import UF_ACCOUNTDISABLE
3737
from impacket.examples import logger
38-
from impacket.examples.utils import parse_credentials
38+
from impacket.examples.utils import parse_identity, ldap_login
3939
from impacket.ldap import ldap, ldapasn1
40-
from impacket.smbconnection import SMBConnection, SessionError
41-
4240

4341
class GetADUsers:
4442
def __init__(self, username, password, domain, cmdLineOptions):
@@ -73,29 +71,6 @@ def __init__(self, username, password, domain, cmdLineOptions):
7371
self.__colLen = [20, 30, 19, 19]
7472
self.__outputFormat = ' '.join(['{%d:%ds} ' % (num, width) for num, width in enumerate(self.__colLen)])
7573

76-
def getMachineName(self, target):
77-
try:
78-
s = SMBConnection(target, target)
79-
s.login('', '')
80-
except OSError as e:
81-
if str(e).find('timed out') > 0:
82-
raise Exception('The connection is timed out. Probably 445/TCP port is closed. Try to specify '
83-
'corresponding NetBIOS name or FQDN as the value of the -dc-host option')
84-
else:
85-
raise
86-
except SessionError as e:
87-
if str(e).find('STATUS_NOT_SUPPORTED') > 0:
88-
raise Exception('The SMB request is not supported. Probably NTLM is disabled. Try to specify '
89-
'corresponding NetBIOS name or FQDN as the value of the -dc-host option')
90-
else:
91-
raise
92-
except Exception:
93-
if s.getServerName() == '':
94-
raise Exception('Error while anonymous logging into %s' % target)
95-
else:
96-
s.logoff()
97-
return s.getServerName()
98-
9974
@staticmethod
10075
def getUnixTime(t):
10176
t -= 116444736000000000
@@ -135,45 +110,10 @@ def processRecord(self, item):
135110
pass
136111

137112
def run(self):
138-
if self.__kdcHost is not None:
139-
self.__target = self.__kdcHost
140-
else:
141-
if self.__kdcIP is not None:
142-
self.__target = self.__kdcIP
143-
else:
144-
self.__target = self.__domain
145-
146-
if self.__doKerberos:
147-
logging.info('Getting machine hostname')
148-
self.__target = self.getMachineName(self.__target)
149-
150113
# Connect to LDAP
151-
try:
152-
ldapConnection = ldap.LDAPConnection('ldap://%s' % self.__target, self.baseDN, self.__kdcIP)
153-
if self.__doKerberos is not True:
154-
ldapConnection.login(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash)
155-
else:
156-
ldapConnection.kerberosLogin(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
157-
self.__aesKey, kdcHost=self.__kdcIP)
158-
except ldap.LDAPSessionError as e:
159-
if str(e).find('strongerAuthRequired') >= 0:
160-
# We need to try SSL
161-
ldapConnection = ldap.LDAPConnection('ldaps://%s' % self.__target, self.baseDN, self.__kdcIP)
162-
if self.__doKerberos is not True:
163-
ldapConnection.login(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash)
164-
else:
165-
ldapConnection.kerberosLogin(self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash,
166-
self.__aesKey, kdcHost=self.__kdcIP)
167-
else:
168-
if str(e).find('NTLMAuthNegotiate') >= 0:
169-
logging.critical("NTLM negotiation failed. Probably NTLM is disabled. Try to use Kerberos "
170-
"authentication instead.")
171-
else:
172-
if self.__kdcIP is not None and self.__kdcHost is not None:
173-
logging.critical("If the credentials are valid, check the hostname and IP address of KDC. They "
174-
"must match exactly each other.")
175-
raise
176-
114+
ldapConnection = ldap_login(self.__target, self.baseDN, self.__kdcIP, self.__kdcHost, self.__doKerberos, self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash, self.__aesKey)
115+
# updating "self.__target" as it may have changed in the ldap_login processing
116+
self.__target = ldapConnection._dstHost
177117
logging.info('Querying %s for information about domain.' % self.__target)
178118
# Print header
179119
print((self.__outputFormat.format(*self.__header)))
@@ -240,28 +180,14 @@ def run(self):
240180
options = parser.parse_args()
241181

242182
# Init the example's logger theme
243-
logger.init(options.ts)
183+
logger.init(options.ts, options.debug)
244184

245-
if options.debug is True:
246-
logging.getLogger().setLevel(logging.DEBUG)
247-
# Print the Library's installation path
248-
logging.debug(version.getInstallationPath())
249-
else:
250-
logging.getLogger().setLevel(logging.INFO)
251-
252-
domain, username, password = parse_credentials(options.target)
185+
domain, username, password, _, _, options.k = parse_identity(options.target, options.hashes, options.no_pass, options.aesKey, options.k)
253186

254187
if domain == '':
255188
logging.critical('Domain should be specified!')
256189
sys.exit(1)
257190

258-
if password == '' and username != '' and options.hashes is None and options.no_pass is False and options.aesKey is None:
259-
from getpass import getpass
260-
password = getpass("Password:")
261-
262-
if options.aesKey is not None:
263-
options.k = True
264-
265191
try:
266192
executer = GetADUsers(username, password, domain, options)
267193
executer.run()

0 commit comments

Comments
 (0)