Change decoding option name

main
Alex 2023-09-21 12:36:04 +02:00
parent 7de9fccedb
commit 09c869de92
2 changed files with 3 additions and 3 deletions

View File

@ -140,7 +140,7 @@ def gen_cli_args():
default=[], default=[],
help="password(s) or file(s) containing passwords", help="password(s) or file(s) containing passwords",
) )
std_parser.add_argument("--ignore-decoding-errors", action="store_true", help="Ignore non UTF-8 characters when decoding the password file") std_parser.add_argument("--ignore-pw-decoding", action="store_true", help="Ignore non UTF-8 characters when decoding the password file")
std_parser.add_argument("-k", "--kerberos", action="store_true", help="Use Kerberos authentication") std_parser.add_argument("-k", "--kerberos", action="store_true", help="Use Kerberos authentication")
std_parser.add_argument("--no-bruteforce", action="store_true", help="No spray when using file for username and password (user1 => password1, user2 => password2") std_parser.add_argument("--no-bruteforce", action="store_true", help="No spray when using file for username and password (user1 => password1, user2 => password2")
std_parser.add_argument("--continue-on-success", action="store_true", help="continues authentication attempts even after successes") std_parser.add_argument("--continue-on-success", action="store_true", help="continues authentication attempts even after successes")

View File

@ -310,13 +310,13 @@ class connection(object):
for password in self.args.password: for password in self.args.password:
if isfile(password): if isfile(password):
try: try:
with open(password, 'r', errors = ('ignore' if self.args.ignore_decoding_errors else 'strict')) as password_file: with open(password, 'r', errors = ('ignore' if self.args.ignore_pw_decoding else 'strict')) as password_file:
for line in password_file: for line in password_file:
secret.append(line.strip()) secret.append(line.strip())
cred_type.append('plaintext') cred_type.append('plaintext')
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
self.logger.error(f"{type(e).__name__}: Could not decode password file. Make sure the file only contains UTF-8 characters.") self.logger.error(f"{type(e).__name__}: Could not decode password file. Make sure the file only contains UTF-8 characters.")
self.logger.error("You can ignore non UTF-8 characters with the option '--ignore-decoding-errors'") self.logger.error("You can ignore non UTF-8 characters with the option '--ignore-pw-decoding'")
exit(1) exit(1)
else: else: