diff sat_pubsub/pubsub_admin.py @ 478:b544109ab4c4

Privileged Entity update + Pubsub Account Management partial implementation + Public Pubsub Subscription /!\ pgsql schema needs to be updated /!\ /!\ server conf needs to be updated for privileged entity: only the new `urn:xmpp:privilege:2` namespace is handled now /!\ Privileged entity has been updated to hanlde the new namespace and IQ permission. Roster pushes are not managed yet. XEP-0376 (Pubsub Account Management) is partially implemented. The XEP is not fully specified at the moment, and my messages on standard@ haven't seen any reply. Thus for now only "Subscribing", "Unsubscribing" and "Listing Subscriptions" is implemented, "Auto Subscriptions" and "Filtering" is not. Public Pubsub Subscription (https://xmpp.org/extensions/inbox/pubsub-public-subscriptions.html) is implemented; the XEP has been accepted by council but is not yet published. It will be updated to use subscription options instead of the <public> element actually specified, I'm waiting for publication to update the XEP. unsubscribe has been updated to return the `<subscription>` element as expected by XEP-0060 (sat_tmp needs to be updated). database schema has been updated to add columns necessary to keep track of subscriptions to external nodes and to mark subscriptions as public.
author Goffi <goffi@goffi.org>
date Wed, 11 May 2022 13:39:08 +0200
parents 412d26a9b2c2
children
line wrap: on
line diff
--- a/sat_pubsub/pubsub_admin.py	Mon Jan 03 16:48:22 2022 +0100
+++ b/sat_pubsub/pubsub_admin.py	Wed May 11 13:39:08 2022 +0200
@@ -92,13 +92,13 @@
         for item in publish_elt.elements(pubsub.NS_PUBSUB, 'item'):
             try:
                 requestor = jid.JID(item.attributes.pop('publisher'))
+            except KeyError:
+                requestor = from_jid
             except Exception as e:
                 log.msg("WARNING: invalid jid in publisher ({requestor}): {msg}"
                     .format(requestor=requestor, msg=e))
                 self.sendError(iq_elt)
                 return
-            except KeyError:
-                requestor = from_jid
 
             # we don't use a DeferredList because we want to be sure that
             # each request is done in order