STRLCPY/DonPAPI

debug problems of passwords containg : and case sensitive comparaison bug
Pierre-Alexandre Vandewoestyne committed 2 years ago

49b523cd

1 parent 01ad18dc

■ ■ ■ ■ ■ ■

DonPAPI.py

		skipped 114 lines
115	115		options.password = options.password + '@' + options.address.rpartition('@')[0]
116	116		options.address = options.address.rpartition('@')[2]
117	117
	118	+	options.username=options.username.lower() #for easier compare
	119	+
118	120		if options.target_ip is None:
119	121		options.target_ip = options.address
120	122		if options.domain is None:
		skipped 21 lines
142	144		file_data = f.read().replace(b'\x0d', b'').split(b'\n')
143	145		for cred in file_data:
144	146		if b':' in cred:
145		-	tmp_username, tmp_password = cred.split(b':')
	147	+	tmp_split = cred.split(b':')
	148	+	tmp_username = tmp_split[0].lower() #Make all usernames lower for easier compare
	149	+	tmp_password = b''.join(tmp_split[1:])
146	150		#Add "history password to account pass to test
147	151		if b'_history' in tmp_username:
148	152		tmp_username=tmp_username[:tmp_username.index(b'_history')]
		skipped 128 lines

■ ■ ■ ■ ■ ■

myseatbelt.py

		skipped 198 lines
199	199		else:
200	200		if self.options.laps is True and username != '' and password != '': # not doing LAPS for null session
201	201		if(self.get_laps()):
202		-	for username in ['Administrator','Administrateur','Administrador']:
	202	+	for username in ['administrator','administrateur','administrador']:
203	203		try:
204	204		self.logging.debug(f"[{self.options.target_ip}] [-] initialising smb Local Authentification to {self.options.domain} / {username} : {self.options.password}, @ {self.host} , Hash : {self.options.lmhash} : {self.options.nthash}, AESKey {self.options.aesKey}")
205	205		self.smb.login(username, self.options.password, self.options.domain, self.options.lmhash, self.options.nthash, ntlmFallback=True)
		skipped 1499 lines
1705	1705		if len(self.options.credz) > 0 and user.masterkeys_file[guid]['status'] != 'decrypted': #localfile not in user.masterkeys:
1706	1706		self.logging.debug(f"[{self.options.target_ip}] [...] Testing decoding {bcolors.OKBLUE}{user.username}{bcolors.ENDC} Masterkey {guid} with credz")
1707	1707		for username in self.options.credz:
1708		-	if username in user.username :#pour fonctionner aussi avec le .domain ou les sessions multiple citrix en user.domain.001 ?
1709		-	self.logging.debug(f"[{self.options.target_ip}] [...] Testing {len(self.options.credz[user.username])} credz for user {user.username}")
	1708	+	if username.lower() in user.username.lower() :#pour fonctionner aussi avec le .domain ou les sessions multiple citrix en user.domain.001 ?
	1709	+	#self.logging.debug(f"[{self.options.target_ip}] [...] Testing {len(self.options.credz[username])} credz for user {user.username}")
1710	1710		#for test_cred in self.options.credz[user.username]:
1711	1711		try:
1712	1712		self.logging.debug(f"[{self.options.target_ip}]Trying to decrypt {bcolors.OKBLUE}{user.username}{bcolors.ENDC} Masterkey {guid} with user SID {user.sid} and {len(self.options.credz[username])}credential(s) from credz file")
		skipped 271 lines

debug problems of passwords containg : and case sensitive comparaison bug