From c6c19a1bcfd1cc488186ca388c3e7080c18d286e Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 19 Dec 2022 09:24:48 +1100 Subject: [PATCH] Convert indentation to use U+0020 SPACE characters. PEP 8 specifies: * Use 4 spaces per indentation level. * Spaces (U+0008) are the preferred indentation method. --- auth-mastodon.py | 174 +++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/auth-mastodon.py b/auth-mastodon.py index 3cd73ee..e801f34 100644 --- a/auth-mastodon.py +++ b/auth-mastodon.py @@ -20,34 +20,34 @@ db_query_getpass="select users.encrypted_password as password from accounts inne sys.stderr = open('/var/log/ejabberd/extauth_err.log', 'a') logging.basicConfig(level=logging.INFO, - format='%(asctime)s %(levelname)s %(message)s', - filename='/var/log/ejabberd/extauth.log', - filemode='a') + format='%(asctime)s %(levelname)s %(message)s', + filename='/var/log/ejabberd/extauth.log', + filemode='a') try: - # Connect to the DB, set autocommit and readonly otherwise postgresql seems to have a - # tendency to keep things "idle in transaction" and table locks eventually grind - # Mastodon to a halt. We don't make any changes anyway. - database=psycopg2.connect(host = db_host, user = db_user, password = db_pass, database = db_name, port = db_port) - database.set_session(readonly=True, autocommit=True) - logging.debug(database.get_dsn_parameters()) + # Connect to the DB, set autocommit and readonly otherwise postgresql seems to have a + # tendency to keep things "idle in transaction" and table locks eventually grind + # Mastodon to a halt. We don't make any changes anyway. + database=psycopg2.connect(host = db_host, user = db_user, password = db_pass, database = db_name, port = db_port) + database.set_session(readonly=True, autocommit=True) + logging.debug(database.get_dsn_parameters()) except: - logging.error("Unable to initialize database, check settings!") - time.sleep(10) - sys.exit(1) + logging.error("Unable to initialize database, check settings!") + time.sleep(10) + sys.exit(1) @atexit.register def close_db(): - cursor.close() - database.close() + cursor.close() + database.close() logging.info('auth-mastodon script started, waiting for ejabberd requests') class EjabberdInputError(Exception): - def __init__(self, value): - self.value = value - def __str__(self): - return repr(self.value) + def __init__(self, value): + self.value = value + def __str__(self): + return repr(self.value) ######################################################################## @@ -55,70 +55,70 @@ class EjabberdInputError(Exception): ######################################################################## def ejabberd_in(): - logging.debug("trying to read 2 bytes from ejabberd:") + logging.debug("trying to read 2 bytes from ejabberd:") - input_length = sys.stdin.buffer.read(2) + input_length = sys.stdin.buffer.read(2) - if len(input_length) is not 2: - logging.debug("ejabberd sent us wrong things!") - raise EjabberdInputError('Wrong input from ejabberd!') + if len(input_length) is not 2: + logging.debug("ejabberd sent us wrong things!") + raise EjabberdInputError('Wrong input from ejabberd!') - logging.debug('got 2 bytes via stdin: %s'%input_length) + logging.debug('got 2 bytes via stdin: %s'%input_length) - (size,) = struct.unpack('>h', input_length) - logging.debug('size of data: %i'%size) + (size,) = struct.unpack('>h', input_length) + logging.debug('size of data: %i'%size) - income=sys.stdin.read(size) - logging.debug("incoming data: %s"%income) + income=sys.stdin.read(size) + logging.debug("incoming data: %s"%income) - return income + return income def ejabberd_out(bool): - logging.debug("Ejabberd gets: %s" % bool) + logging.debug("Ejabberd gets: %s" % bool) - token = genanswer(bool) + token = genanswer(bool) - logging.debug("sent bytes: %#x %#x %#x %#x" % (token[0], token[1], token[2], token[3])) + logging.debug("sent bytes: %#x %#x %#x %#x" % (token[0], token[1], token[2], token[3])) - sys.stdout.buffer.write(token) - sys.stdout.buffer.flush() + sys.stdout.buffer.write(token) + sys.stdout.buffer.flush() def genanswer(bool): - answer = 0 - if bool: - answer = 1 - token = struct.pack('>hh', 2, answer) - return token + answer = 0 + if bool: + answer = 1 + token = struct.pack('>hh', 2, answer) + return token def get_password(user, host): - # Right now we ignore the host component, as Mastodon doesn't store it for local accounts. - # It may be required one day, so the code to handle passing it to the query is left in for now. - cursor = database.cursor() - cursor.execute(db_query_getpass, {"user": user.lower(), "host": host}) - data = cursor.fetchone() - cursor.close() - return data[0] if data != None else None + # Right now we ignore the host component, as Mastodon doesn't store it for local accounts. + # It may be required one day, so the code to handle passing it to the query is left in for now. + cursor = database.cursor() + cursor.execute(db_query_getpass, {"user": user.lower(), "host": host}) + data = cursor.fetchone() + cursor.close() + return data[0] if data != None else None def isuser(user, host): - return get_password(user, host) != None + return get_password(user, host) != None def auth(user, host, password): - db_password = get_password(user, host) - if db_password == None: - logging.debug("Wrong username: %s@%s" % (user, host)) - return False - else: - if bcrypt.checkpw(password.encode('utf8'), db_password.encode('utf8')): - logging.debug("Validated %s against hash %s" % (user, db_password)) - return True - else: - logging.debug("Wrong password for user: %s@%s" % (user, host)) - return False + db_password = get_password(user, host) + if db_password == None: + logging.debug("Wrong username: %s@%s" % (user, host)) + return False + else: + if bcrypt.checkpw(password.encode('utf8'), db_password.encode('utf8')): + logging.debug("Validated %s against hash %s" % (user, db_password)) + return True + else: + logging.debug("Wrong password for user: %s@%s" % (user, host)) + return False ######################################################################## @@ -128,38 +128,38 @@ def auth(user, host, password): exitcode=0 while True: - logging.debug("start of infinite loop") + logging.debug("start of infinite loop") - try: - ejab_request = ejabberd_in().split(':', 3) - except EOFError: - break - except Exception as e: - logging.exception("Exception occured while reading stdin") - raise + try: + ejab_request = ejabberd_in().split(':', 3) + except EOFError: + break + except Exception as e: + logging.exception("Exception occured while reading stdin") + raise - op_result = False - try: - # Only 'auth' and 'isuser' implemented, placeholders left to maybe - # expose other functions later but for now let's not even think about - # modifying the Mastodon DB - if ejab_request[0] == "auth": - op_result = auth(ejab_request[1], ejab_request[2], ejab_request[3]) - elif ejab_request[0] == "isuser": - op_result = isuser(ejab_request[1], ejab_request[2]) - elif ejab_request[0] == "setpass": - op_result = False - elif ejab_request[0] == "tryregister": - op_result = False - elif ejab_request[0] == "removeuser": - op_result = False - elif ejab_request[0] == "removeuser3": - op_result = False - except Exception: - logging.exception("Exception occured") + op_result = False + try: + # Only 'auth' and 'isuser' implemented, placeholders left to maybe + # expose other functions later but for now let's not even think about + # modifying the Mastodon DB + if ejab_request[0] == "auth": + op_result = auth(ejab_request[1], ejab_request[2], ejab_request[3]) + elif ejab_request[0] == "isuser": + op_result = isuser(ejab_request[1], ejab_request[2]) + elif ejab_request[0] == "setpass": + op_result = False + elif ejab_request[0] == "tryregister": + op_result = False + elif ejab_request[0] == "removeuser": + op_result = False + elif ejab_request[0] == "removeuser3": + op_result = False + except Exception: + logging.exception("Exception occured") - ejabberd_out(op_result) - logging.info("successful" if op_result else "unsuccessful") + ejabberd_out(op_result) + logging.info("successful" if op_result else "unsuccessful") logging.debug("end of infinite loop") logging.info('extauth script terminating')