Sync up to latest version of pgweb auth plugin

diff --git a/pgmailmgr/auth.py b/pgmailmgr/auth.py
index d7bd25cb61cc604f6898ac23be4150222975769f..0a075715838f347669fba0c74e3e73d043ac0ade 100644 (file)
--- a/pgmailmgr/auth.py
+++ b/pgmailmgr/auth.py
@@ -8,6 +8,8 @@
 # * Make sure the view "login" from this module is used for login
 # * Map an url somwehere (typically /auth_receive/) to the auth_receive
 #   view.
+# * To get notified when a user is created from upstream, connect to the signal
+#   auth_user_created_from_upstream.
 # * To receive live updates (not just during login), map an url somewhere
 #   (typically /auth_api/) to the auth_api view.
 # * To receive live updates, also connect to the signal auth_user_data_received.
@@ -44,6 +46,9 @@ from Cryptodome import Random
 import time
 
 
+# This signal fires when a user is created based on data from upstream.
+auth_user_created_from_upstream = Signal(providing_args=['user', ])
+
 # This signal fires whenever new user data has been received. Note that this
 # happens *after* first_name, last_name and email has been updated on the user
 # record, so those are not included in the userdata struct.
@@ -104,10 +109,15 @@ def auth_receive(request):
         return HttpResponse("Missing data in url!", status=400)
 
     # Set up an AES object and decrypt the data we received
-    decryptor = AES.new(base64.b64decode(settings.PGAUTH_KEY),
-                        AES.MODE_CBC,
-                        base64.b64decode(str(request.GET['i']), "-_"))
-    s = decryptor.decrypt(base64.b64decode(str(request.GET['d']), "-_")).rstrip(b' ').decode('utf8')
+    try:
+        decryptor = AES.new(base64.b64decode(settings.PGAUTH_KEY),
+                            AES.MODE_CBC,
+                            base64.b64decode(str(request.GET['i']), "-_"))
+        s = decryptor.decrypt(base64.b64decode(str(request.GET['d']), "-_")).rstrip(b' ').decode('utf8')
+    except UnicodeDecodeError:
+        return HttpResponse("Badly encoded data found", 400)
+    except Exception:
+        return HttpResponse("Could not decrypt data", status=400)
 
     # Now un-urlencode it
     try:
@@ -174,6 +184,8 @@ We apologize for the inconvenience.
                     )
         user.save()
 
+        auth_user_created_from_upstream.send(sender=auth_receive, user=user)
+
     # Ok, we have a proper user record. Now tell django that
     # we're authenticated so it persists it in the session. Before
     # we do that, we have to annotate it with the backend information.
@@ -281,7 +293,7 @@ def auth_api(request):
 # Unlike the authentication, searching does not involve the browser - we just make
 # a direct http call.
 def user_search(searchterm=None, userid=None):
-    # If upsteam isn't responding quickly, it's not going to respond at all, and
+    # If upstream isn't responding quickly, it's not going to respond at all, and
     # 10 seconds is already quite long.
     socket.setdefaulttimeout(10)
     if userid:
@@ -308,6 +320,30 @@ def user_search(searchterm=None, userid=None):
     return j
 
 
+# Subscribe to any changes about this user on the community auth upstream
+def subscribe_to_user_changes(userid):
+    socket.setdefaulttimeout(10)
+
+    body = json.dumps({
+        'u': userid,
+    })
+
+    h = hmac.digest(
+        base64.b64decode(settings.PGAUTH_KEY),
+        msg=bytes(body, 'utf-8'),
+        digest='sha512',
+    )
+
+    # Ignore the result code, just post it
+    requests.post(
+        '{0}subscribe/'.format(settings.PGAUTH_REDIRECT),
+        data=body,
+        headers={
+            'X-pgauth-sig': base64.b64encode(h),
+        },
+    )
+
+
 # Import a user into the local authentication system. Will initially
 # make a search for it, and if anything other than one entry is returned
 # the import will fail.
@@ -335,4 +371,6 @@ def user_import(uid):
     )
     u.save()
 
+    auth_user_created_from_upstream.send(sender=user_import, user=u)
+
     return u

diff --git a/tools/githook/pre-commit b/tools/githook/pre-commit
index 8d0a87d1585e071b559b714c9ef9668c4a38bd65..c1b36a0ed311002d33aa196bc91cc56d95ab43f2 100755 (executable)
--- a/tools/githook/pre-commit
+++ b/tools/githook/pre-commit
@@ -14,7 +14,7 @@ if [ "$FILES" != "" ]; then
     # each file.
     E=0
     for F in ${FILES}; do
-       P=$(git show ":$F" | python -c "import sys; compile(sys.stdin.read(), '/dev/null', 'exec')")
+       P=$(git show ":$F" | python3 -c "import sys; compile(sys.stdin.read(), '/dev/null', 'exec')")
        if [ "$?" != "0" ]; then
            echo "Errors in $F"
            echo $P
@@ -22,7 +22,7 @@ if [ "$FILES" != "" ]; then
            continue
        fi
 
-       R=$(git show ":$F" | pep8 -)
+       R=$(git show ":$F" | pycodestyle -)
        if [ "$?" != "0" ]; then
            echo "Errors in $F"
            echo "$R"