From a88f298e98af40260cfdc0e10566e744b1087f71 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 19 Dec 2022 09:26:13 +1100 Subject: [PATCH] Wrap long block comment lines at 72 columns. --- auth-mastodon.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/auth-mastodon.py b/auth-mastodon.py index 3084213..798ba80 100644 --- a/auth-mastodon.py +++ b/auth-mastodon.py @@ -10,17 +10,21 @@ import bcrypt import psycopg2 -# Database connection details. The credentials here need access to the Mastodon database, which "ejabberd" is unlikely -# to have on your system by default. You shoud grant SELECT privileges to ejabberd on the "accounts" and "users" tables, -# to play it safe, or include the Mastodon DB user credentials here (don't). +# Database connection details. The credentials here need access to the +# Mastodon database, which "ejabberd" is unlikely to have on your system +# by default. You shoud grant SELECT privileges to ejabberd on the +# "accounts" and "users" tables, to play it safe, or include the +# Mastodon DB user credentials here (don't). db_host = "localhost" db_port = 5432 db_user = "ejabberd" db_pass = "" db_name = "mastodon" -# This is the query that pulls the password hash for the given user. Mastodon doesn't store the domain for local accounts in -# the database, so we ignore the host component and try to match username where the domain is NULL. +# This is the query that pulls the password hash for the given user. +# Mastodon doesn't store the domain for local accounts in the database, +# so we ignore the host component and try to match username where the +# domain is NULL. db_query_getpass = """ SELECT users.encrypted_password AS password FROM accounts @@ -44,9 +48,10 @@ logging.basicConfig( ) 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. + # 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, @@ -126,8 +131,9 @@ def genanswer(bool): 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. + # 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() @@ -172,9 +178,9 @@ while True: 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 + # 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":