ci: build cython module for itests

Make mypy happier

.readthedocs.yaml

@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+   install:
+   - requirements: docs/requirements.txt

.woodpecker/lint.yml

@@ -0,0 +1,6 @@
+steps:
+  mypy:
+    image: python:3
+    commands:
+      - pip3 install mypy types-setuptools
+      - mypy slixmpp

.woodpecker/test-integration.yml

@@ -0,0 +1,10 @@
+steps:
+  test_integration:
+    image: "python:3.11"
+    secrets: [ci_account1, ci_account1_password, ci_account2, ci_account2_password, ci_muc_server]
+    commands:
+      - apt-get update
+      - apt-get install -y python3-pip cython3 gpg idn libidn-dev
+      - pip3 install emoji aiohttp aiodns
+      - python3 setup.py build_ext --inplace
+      - ./run_integration_tests.py

.woodpecker/test.yml

@@ -0,0 +1,17 @@
+steps:
+  unit_tests:
+    image: "python:${TAG}"
+    commands:
+    - apt-get update
+    - apt-get install -y python3 python3-pip cython3 gpg
+    - pip3 install emoji aiohttp cryptography
+    - ./run_tests.py
+
+matrix:
+  TAG:
+    - "3.7"
+    - "3.9"
+    - "3.8"
+    - "3.10"
+    - "3.11"
+    - "3.12"

CONTRIBUTING.rst

@@ -5,7 +5,7 @@ To contribute, the preferred way is to commit your changes on some
 publicly-available git repository (on a fork `on github
 <https://github.com/poezio/slixmpp>`_ or on your own repository) and to
 notify the developers with either:
- - a ticket `on the bug tracker <https://lab.louiz.org/poezio/slixmpp/issues/new>`_
+ - a ticket `on the bug tracker <https://codeberg.org/poezio/slixmpp/issues/new>`_
  - a pull request on github
  - a simple message on `the XMPP MUC <xmpp:slixmpp@muc.poez.io>`_
 

doap.xml

@@ -8,13 +8,13 @@
     <shortdesc xml:lang="en">Elegant Python library for XMPP</shortdesc>
     <shortdesc xml:lang="fr">Bibliothèque pour XMPP élégante, en Python</shortdesc>
 
-    <homepage rdf:resource="https://lab.louiz.org/poezio/slixmpp/"/>
+    <homepage rdf:resource="https://codeberg.org/poezio/slixmpp/"/>
-    <download-page rdf:resource="https://lab.louiz.org/poezio/slixmpp/tags"/>
+    <download-page rdf:resource="https://codeberg.org/poezio/slixmpp/tags"/>
-    <bug-database rdf:resource="https://lab.louiz.org/poezio/slixmpp/issues"/>
+    <bug-database rdf:resource="https://codeberg.org/poezio/slixmpp/issues"/>
     <developer-forum rdf:resource="xmpp:slixmpp@muc.poez.io?join"/>
     <support-forum rdf:resource="xmpp:slixmpp@muc.poez.io?join"/>
 
-    <license rdf:resource="https://lab.louiz.org/poezio/slixmpp/blob/master/LICENSE"/>
+    <license rdf:resource="https://codeberg.org/poezio/slixmpp/raw/brach/master/LICENSE"/>
 
     <language>en</language>
 
@@ -59,8 +59,8 @@
 
     <repository>
         <GitRepository>
-            <browse rdf:resource="https://lab.louiz.org/poezio/slixmpp"/>
+            <browse rdf:resource="https://codeberg.org/poezio/slixmpp"/>
-            <location rdf:resource="https://lab.louiz.org/poezio/slixmpp.git"/>
+            <location rdf:resource="https://codeberg.org/poezio/slixmpp.git"/>
         </GitRepository>
     </repository>
 
@@ -1012,56 +1012,63 @@
         <Version>
             <revision>1.6.0</revision>
             <created>2020-12-12</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.6.0/slixmpp-slix-1.6.0.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.6.0.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.7.0</revision>
             <created>2021-01-29</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.7.0/slixmpp-slix-1.7.0.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.7.0.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.7.1</revision>
             <created>2021-04-30</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.7.1/slixmpp-slix-1.7.1.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.7.1.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.8.0</revision>
             <created>2022-02-27</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.8.0/slixmpp-slix-1.8.0.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.0.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.8.1</revision>
             <created>2022-03-20</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.8.1/slixmpp-slix-1.8.1.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.1.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.8.2</revision>
             <created>2022-04-06</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.8.2/slixmpp-slix-1.8.2.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.2.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.8.3</revision>
             <created>2022-11-12</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.8.3/slixmpp-slix-1.8.3.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.3.tar.gz"/>
         </Version>
     </release>
     <release>
         <Version>
             <revision>1.8.4</revision>
             <created>2023-05-28</created>
-            <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.8.4/slixmpp-slix-1.8.4.tar.gz"/>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.4.tar.gz"/>
+        </Version>
+    </release>
+    <release>
+        <Version>
+            <revision>1.8.5</revision>
+            <created>2024-02-02</created>
+            <file-release rdf:resource="https://codeberg.org/poezio/slixmpp/archive/slix-1.8.5.tar.gz"/>
         </Version>
     </release>
 </Project>

docs/getting_started/component.rst

@@ -11,7 +11,7 @@ Create and Run a Server Component
     <xmpp:slixmpp@muc.poez.io?join>`_.
 
 If you have not yet installed Slixmpp, do so now by either checking out a version
-with `Git <https://lab.louiz.org/poezio/slixmpp>`_.
+with `Git <https://codeberg.org/poezio/slixmpp>`_.
 
 Many XMPP applications eventually graduate to requiring to run as a server
 component in order to meet scalability requirements. To demonstrate how to

docs/getting_started/echobot.rst

@@ -11,7 +11,7 @@ Slixmpp Quickstart - Echo Bot
     <xmpp:slixmpp@muc.poez.io?join>`_.
 
 If you have not yet installed Slixmpp, do so now by either checking out a version
-with `Git <https://lab.louiz.org/poezio/slixmpp>`_.
+with `Git <https://codeberg.org/poezio/slixmpp>`_.
 
 As a basic starting project, we will create an echo bot which will reply to any
 messages sent to it. We will also go through adding some basic command line configuration
@@ -325,7 +325,7 @@ The Final Product
 -----------------
 
 Here then is what the final result should look like after working through the guide above. The code
-can also be found in the Slixmpp `examples directory <https://lab.louiz.org/poezio/slixmpp/tree/master/examples>`_.
+can also be found in the Slixmpp `examples directory <https://codeberg.org/poezio/slixmpp/src/branch/master/examples>`_.
 
 .. compound::
 

docs/getting_started/muc.rst

@@ -11,7 +11,7 @@ Multi-User Chat (MUC) Bot
     <xmpp:slixmpp@muc.poez.io?join>`_.
 
 If you have not yet installed Slixmpp, do so now by either checking out a version
-from `Git <https://lab.louiz.org/poezio/slixmpp>`_.
+from `Git <https://codeberg.org/poezio/slixmpp>`_.
 
 Now that you've got the basic gist of using Slixmpp by following the
 echobot example (:ref:`echobot`), we can use one of the bundled plugins

docs/index.rst

@@ -4,9 +4,9 @@ Slixmpp
 .. sidebar:: Get the Code
 
     The latest source code for Slixmpp may be found on the `Git repo
-    <https://lab.louiz.org/poezio/slixmpp>`_. ::
+    <https://codeberg.org/poezio/slixmpp>`_. ::
 
-        git clone https://lab.louiz.org/poezio/slixmpp
+        git clone https://codeberg.org/poezio/slixmpp
 
     An XMPP chat room is available for discussing and getting help with slixmpp.
 
@@ -14,7 +14,7 @@ Slixmpp
         `slixmpp@muc.poez.io <xmpp:slixmpp@muc.poez.io?join>`_
 
     **Reporting bugs**
-        You can report bugs at http://lab.louiz.org/poezio/slixmpp/issues.
+        You can report bugs at http://codeberg.org/poezio/slixmpp/issues.
 
 Slixmpp is an :ref:`MIT licensed <license>` XMPP library for Python 3.7+,
 

docs/projects.rst

@@ -0,0 +1,95 @@
+Projects Using Slixmpp
+======================
+
+Applications
+------------
+
+sendxmpp-py
+~~~~~~~~~~~
+sendxmpp is a command line program and is the XMPP equivalent of sendmail. It is a Python version of the original sendxmpp which is written in Perl.
+
+- `Source <https://github.com/moparisthebest/sendxmpp-py>`_
+
+Bots
+----
+
+BotLogMauve
+~~~~~~~~~~~
+XMPP bot which logs groupchat messages. Logs are in text format, with one file per day and per groupchat.
+
+- `Source <https://git.khaganat.net/khaganat/BotLogMauve>`_
+
+LinkBot
+~~~~~~~
+This bot reveals the title of any shared link in a groupchat for quick content insight.
+
+- `Source <https://git.xmpp-it.net/mario/XMPPBot>`_
+
+llama-bot
+~~~~~~~~~
+Llama-bot enables engaging communication with the LLM (large language model) of llama.cpp, providing seamless and dynamic conversation with it.
+
+- `Groupchat <xmpp:slixmpp@muc.poez.io?join>`_
+- `Source <https://github.com/decent-im/llama-bot>`_
+- `Demo <xmpp:llama@decent.im?message>`_
+
+Morbot
+~~~~~~
+Morbot is a simple Slixmpp bot that will take new articles from listed RSS feeds and send them to assigned XMPP MUCs.
+
+- `Groupchat <xmpp:slixmpp@muc.poez.io?join>`_
+- `Source <https://codeberg.org/TheCoffeMaker/Morbot>`_
+
+Slixfeed
+~~~~~~~~
+Slixfeed aims to be an easy to use and fully-featured news aggregator bot for XMPP. It provides a convenient access to Blogs, Fediverse and News websites along with filtering functionality.
+
+- `Groupchat <xmpp:slixfeed@chat.woodpeckersnest.space?join>`_
+- `Source <https://gitgud.io/sjehuda/slixfeed>`_
+
+sms4you
+~~~~~~~
+sms4you forwards messages from and to SMS and connects either with sms4you-xmpp or sms4you-email to choose the other mean of communication. Nice for receiving or sending SMS, independently from carrying a SIM card.
+
+- `Groupchat <xmpp:slixmpp@muc.poez.io?join>`_
+- `Homepage <https://sms4you-team.pages.debian.net/sms4you/>`_
+- `Source <https://salsa.debian.org/sms4you-team/sms4you>`_
+
+Stable Diffusion
+~~~~~~~~~~~~~~~~
+XMPP bot that generates digital images from textual descriptions.
+
+- `Groupchat <xmpp:slidge@conference.nicoco.fr?join>`_
+- `Source <https://www.nicoco.fr/blog/2022/08/31/xmpp-bot-stable-diffusion/>`_
+
+WhisperBot
+~~~~~~~~~~
+XMPP bot that transliterates audio messages using OpenAI's Whisper libraries.
+
+- `Groupchat <xmpp:slixmpp@muc.poez.io?join>`_
+- `Source <https://codeberg.org/TheCoffeMaker/WhisperBot>`_
+
+XMPP MUC Message Gateway
+~~~~~~~~~~~~~~~~~~~~~~~~
+A multipurpose JSON forwarder microservice from HTTP POST to XMPP MUC room over TLSv1.2 with SliXMPP.
+
+- `Source <https://github.com/immanuelfodor/xmpp-muc-message-gateway>`_
+
+Services
+--------
+
+AtomToPubsub
+~~~~~~~~~~~~
+AtomToPubsub is a simple Python script that parses Atom + RSS feeds and pushes the entries to a designated XMPP Pubsub Node.
+
+- `Groupchat <xmpp:movim@conference.movim.eu?join>`_
+- `Source <https://github.com/imattau/atomtopubsub>`_
+
+Slidge
+~~~~~~
+
+Slidge is a general purpose XMPP gateway framework in Python.
+
+- `Groupchat <xmpp:slidge@conference.nicoco.fr?join>`_
+- `Homepage <https://slidge.im/core/>`_
+- `Source <https://sr.ht/~nicoco/slidge>`_

itests/test_muc.py

@@ -10,7 +10,7 @@ UNIQUE = uuid4().hex
 class TestMUC(SlixIntegration):
 
     async def asyncSetUp(self):
-        self.mucserver = self.envjid('CI_MUC_SERVER')
+        self.mucserver = self.envjid('CI_MUC_SERVER', default='chat.jabberfr.org')
         self.muc = JID('%s@%s' % (UNIQUE, self.mucserver))
         self.add_client(
             self.envjid('CI_ACCOUNT1'),

setup.py

@@ -80,7 +80,7 @@ setup(
     long_description=LONG_DESCRIPTION,
     author='Florent Le Coz',
     author_email='louiz@louiz.org',
-    url='https://lab.louiz.org/poezio/slixmpp',
+    url='https://codeberg.org/poezio/slixmpp',
     license='MIT',
     platforms=['any'],
     package_data={'slixmpp': ['py.typed']},

slixmpp/basexmpp.py

@@ -285,7 +285,7 @@ class BaseXMPP(XMLStream):
             if plugin in plugins.PLUGINS:
                 self.register_plugin(plugin)
             else:
-                raise NameError("Plugin %s not in plugins.__all__." % plugin)
+                raise NameError("Plugin %s not in plugins.PLUGINS." % plugin)
 
     def __getitem__(self, key):
         """Return a plugin given its name, if it has been registered."""

slixmpp/clientxmpp.py

@@ -138,8 +138,8 @@ class ClientXMPP(BaseXMPP):
         self.credentials['password'] = value
 
     def connect(self, address: Optional[Tuple[str, int]] = None,  # type: ignore
-                use_ssl: bool = False, force_starttls: bool = True,
+                use_ssl: Optional[bool] = None, force_starttls: Optional[bool] = None,
-                disable_starttls: bool = False) -> None:
+                disable_starttls: Optional[bool] = None) -> None:
         """Connect to the XMPP server.
 
         When no address is given, a SRV lookup for the server will
@@ -166,8 +166,8 @@ class ClientXMPP(BaseXMPP):
             host, port = (self.boundjid.host, 5222)
             self.dns_service = 'xmpp-client'
 
-        return XMLStream.connect(self, host, port, use_ssl=use_ssl,
+        XMLStream.connect(self, host, port, use_ssl=use_ssl,
-                                 force_starttls=force_starttls, disable_starttls=disable_starttls)
+                          force_starttls=force_starttls, disable_starttls=disable_starttls)
 
     def register_feature(self, name: str, handler: Callable, restart: bool = False, order: int = 5000) -> None:
         """Register a stream feature handler.

slixmpp/componentxmpp.py

@@ -9,6 +9,8 @@
 import logging
 import hashlib
 
+from typing import Optional
+
 from slixmpp import Message, Iq, Presence
 from slixmpp.basexmpp import BaseXMPP
 from slixmpp.stanza import Handshake
@@ -93,7 +95,9 @@ class ComponentXMPP(BaseXMPP):
         for st in Message, Iq, Presence:
             register_stanza_plugin(st, Error)
 
-    def connect(self, host=None, port=None, use_ssl=False):
+    def connect(self, host: Optional[str] = None, port: int = 0, use_ssl: Optional[bool] = None,
+                force_starttls: Optional[bool] = None,
+                disable_starttls: Optional[bool] = None) -> None:
         """Connect to the server.
 
 
@@ -103,17 +107,18 @@ class ComponentXMPP(BaseXMPP):
                      Defauts to :attr:`server_port`.
         :param use_ssl: Flag indicating if SSL should be used by connecting
                         directly to a port using SSL.
+        :param force_starttls: UNUSED
+        :param disable_starttls: UNUSED
         """
-        if host is None:
+        if host is not None:
-            host = self.server_host
+            self.server_host = host
-        if port is None:
+        if port:
-            port = self.server_port
+            self.server_port = port
 
         self.server_name = self.boundjid.host
 
         log.debug("Connecting to %s:%s", host, port)
-        return XMLStream.connect(self, host=host, port=port,
+        XMLStream.connect(self, host=self.server_host, port=self.server_port, use_ssl=use_ssl)
-                                       use_ssl=use_ssl)
 
     def incoming_filter(self, xml):
         """

slixmpp/features/feature_mechanisms/mechanisms.py

@@ -37,7 +37,8 @@ class FeatureMechanisms(BasePlugin):
         'unencrypted_digest': False,
         'unencrypted_cram': False,
         'unencrypted_scram': True,
-        'order': 100
+        'order': 100,
+        'tls_version': None,
     }
 
     def plugin_init(self):
@@ -96,7 +97,20 @@ class FeatureMechanisms(BasePlugin):
                 result[value] = creds.get('email', jid)
             elif value == 'channel_binding':
                 if isinstance(self.xmpp.socket, (ssl.SSLSocket, ssl.SSLObject)):
-                    result[value] = self.xmpp.socket.get_channel_binding()
+                    version = self.xmpp.socket.version()
+                    # As of now, python does not implement anything else
+                    # than tls-unique, which is forbidden on TLSv1.3
+                    # see https://github.com/python/cpython/issues/95341
+                    if version != 'TLSv1.3':
+                        result[value] = self.xmpp.socket.get_channel_binding(
+                            cb_type="tls-unique"
+                        )
+                    elif 'tls-exporter' in ssl.CHANNEL_BINDING_TYPES:
+                        result[value] = self.xmpp.socket.get_channel_binding(
+                            cb_type="tls-exporter"
+                        )
+                    else:
+                        result[value] = None
                 else:
                     result[value] = None
             elif value == 'host':
@@ -121,6 +135,11 @@ class FeatureMechanisms(BasePlugin):
                     result[value] = True
                 else:
                     result[value] = False
+            elif value == 'tls_version':
+                if isinstance(self.xmpp.socket, (ssl.SSLSocket, ssl.SSLObject)):
+                    result[value] = self.xmpp.socket.version()
+            elif value == 'binding_proposed':
+                result[value] = any(x for x in self.mech_list if x.endswith('-PLUS'))
             else:
                 result[value] = self.config.get(value, False)
         return result

slixmpp/plugins/__init__.py

@@ -76,6 +76,7 @@ PLUGINS = [
     'xep_0256',  # Last Activity in Presence
     'xep_0257',  # Client Certificate Management for SASL EXTERNAL
     'xep_0258',  # Security Labels in XMPP
+    'xep_0264',  # Jingle Content Thumbnails
 #   'xep_0270',  # XMPP Compliance Suites 2010. Don’t automatically load
     'xep_0279',  # Server IP Check
     'xep_0280',  # Message Carbons
@@ -85,6 +86,7 @@ PLUGINS = [
 #   'xep_0302',  # XMPP Compliance Suites 2012. Don’t automatically load
     'xep_0308',  # Last Message Correction
     'xep_0313',  # Message Archive Management
+    'xep_0317',  # Hats
     'xep_0319',  # Last User Interaction in Presence
 #   'xep_0323',  # IoT Systems Sensor Data. Don’t automatically load
 #   'xep_0325',  # IoT Systems Control. Don’t automatically load
@@ -101,6 +103,7 @@ PLUGINS = [
     'xep_0377',  # Spam reporting
     'xep_0380',  # Explicit Message Encryption
     'xep_0382',  # Spoiler Messages
+    'xep_0385',  # Stateless Inline Media Sharing (SIMS)
     'xep_0394',  # Message Markup
     'xep_0402',  # PEP Native Bookmarks
     'xep_0403',  # MIX-Presence
@@ -115,7 +118,9 @@ PLUGINS = [
     'xep_0439',  # Quick Response
     'xep_0441',  # Message Archive Management Preferences
     'xep_0444',  # Message Reactions
+    'xep_0447',  # Stateless file sharing
     'xep_0461',  # Message Replies
+    'xep_0469',  # Bookmarks Pinning
     # Meant to be imported by plugins
 ]
 

slixmpp/plugins/xep_0115/caps.py

@@ -7,7 +7,8 @@ import logging
 import hashlib
 import base64
 
-from asyncio import Future
+from asyncio import Future, Lock
+from collections import defaultdict
 from typing import Optional
 
 from slixmpp import __version__
@@ -94,6 +95,9 @@ class XEP_0115(BasePlugin):
         disco.assign_verstring = self.assign_verstring
         disco.get_verstring = self.get_verstring
 
+        # prevent concurrent fetches for the same hash
+        self._locks = defaultdict(Lock)
+
     def plugin_end(self):
         self.xmpp['xep_0030'].del_feature(feature=stanza.Capabilities.namespace)
         self.xmpp.del_filter('out', self._filter_add_caps)
@@ -137,7 +141,7 @@ class XEP_0115(BasePlugin):
 
         self.xmpp.event('entity_caps', p)
 
-    async def _process_caps(self, pres):
+    async def _process_caps(self, pres: Presence):
         if not pres['caps']['hash']:
             log.debug("Received unsupported legacy caps: %s, %s, %s",
                     pres['caps']['node'],
@@ -147,7 +151,11 @@ class XEP_0115(BasePlugin):
             return
 
         ver = pres['caps']['ver']
+        async with self._locks[ver]:
+            await self._process_caps_wrapped(pres, ver)
+        self._locks.pop(ver, None)
 
+    async def _process_caps_wrapped(self, pres: Presence, ver: str):
         existing_verstring = await self.get_verstring(pres['from'].full)
         if str(existing_verstring) == str(ver):
             return

slixmpp/plugins/xep_0221/media.py

@@ -15,6 +15,32 @@ log = logging.getLogger(__name__)
 
 
 class XEP_0221(BasePlugin):
+    """
+    XEP-0221: Data Forms Media Element
+
+    In certain implementations of Data Forms (XEP-0004), it can be
+    helpful to include media data such as small images. One example is
+    CAPTCHA Forms (XEP-0158). This plugin implements a method for
+    including media data in a data form.
+
+    Typical use pattern:
+
+    .. code-block:: python
+
+        self.register_plugin('xep_0221')
+        self['xep_0050'].add_command(node="showimage",
+                                        name="Show my image",
+                                        handler=self.form_handler)
+
+        def form_handler(self,iq,session):
+            image_url="https://xmpp.org/images/logos/xmpp-logo.svg"
+            form=self['xep_0004'].make_form('result','My Image')
+            form.addField(var='myimage', ftype='text-single', label='My Image', value=image_url)
+            form.field['myimage']['media'].add_uri(value=image_url, itype="image/svg")
+            session['payload']=form
+            return session
+    """
+
 
     name = 'xep_0221'
     description = 'XEP-0221: Data Forms Media Element'

slixmpp/plugins/xep_0264/__init__.py

@@ -0,0 +1,5 @@
+from slixmpp.plugins.base import register_plugin
+
+from .thumbnail import XEP_0264
+
+register_plugin(XEP_0264)

slixmpp/plugins/xep_0264/stanza.py

@@ -0,0 +1,36 @@
+from typing import Optional
+
+from slixmpp import register_stanza_plugin
+from slixmpp.plugins.xep_0234.stanza import File
+from slixmpp.xmlstream import ElementBase
+
+NS = "urn:xmpp:thumbs:1"
+
+
+class Thumbnail(ElementBase):
+    name = plugin_attrib = "thumbnail"
+    namespace = NS
+    interfaces = {"uri", "media-type", "width", "height"}
+
+    def get_width(self) -> int:
+        return _int_or_none(self._get_attr("width"))
+
+    def get_height(self) -> int:
+        return _int_or_none(self._get_attr("height"))
+
+    def set_width(self, v: int) -> None:
+        self._set_attr("width", str(v))
+
+    def set_height(self, v: int) -> None:
+        self._set_attr("height", str(v))
+
+
+def _int_or_none(v) -> Optional[int]:
+    try:
+        return int(v)
+    except ValueError:
+        return None
+
+
+def register_plugin():
+    register_stanza_plugin(File, Thumbnail)

slixmpp/plugins/xep_0264/thumbnail.py

@@ -0,0 +1,24 @@
+import logging
+
+from slixmpp.plugins import BasePlugin
+
+from . import stanza
+
+log = logging.getLogger(__name__)
+
+
+class XEP_0264(BasePlugin):
+
+    """
+    XEP-0264: Jingle Content Thumbnails
+
+    Can also be used with 0385 (Stateless inline media sharing)
+    """
+
+    name = "xep_0264"
+    description = "XEP-0264: Jingle Content Thumbnails"
+    dependencies = {"xep_0234"}
+    stanza = stanza
+
+    def plugin_init(self):
+        stanza.register_plugin()

slixmpp/plugins/xep_0313/stanza.py

@@ -52,9 +52,10 @@ class MAM(ElementBase):
     #:   fetch, not relevant for the stanza itself.
     interfaces = {
         'queryid', 'start', 'end', 'with', 'results',
-        'before_id', 'after_id', 'ids',
+        'before_id', 'after_id', 'ids', 'flip_page',
     }
-    sub_interfaces = {'start', 'end', 'with', 'before_id', 'after_id', 'ids'}
+    sub_interfaces = {'start', 'end', 'with', 'before_id', 'after_id', 'ids',
+                      'flip_page'}
 
     def setup(self, xml=None):
         ElementBase.setup(self, xml)
@@ -81,7 +82,7 @@ class MAM(ElementBase):
     def get_start(self) -> Optional[datetime]:
         fields = self.get_fields()
         field = fields.get('start')
-        if field:
+        if field and field["value"]:
             return xep_0082.parse(field['value'])
         return None
 
@@ -94,7 +95,7 @@ class MAM(ElementBase):
     def get_end(self) -> Optional[datetime]:
         fields = self.get_fields()
         field = fields.get('end')
-        if field:
+        if field and field["value"]:
             return xep_0082.parse(field['value'])
         return None
 
@@ -168,6 +169,8 @@ class MAM(ElementBase):
     def del_results(self):
         self._results = []
 
+    def get_flip_page(self):
+        return self.xml.find(f'{{{self.namespace}}}flip-page') is not None
 
 class Fin(ElementBase):
     """A MAM fin element (end of query).
@@ -187,7 +190,7 @@ class Fin(ElementBase):
     name = 'fin'
     namespace = 'urn:xmpp:mam:2'
     plugin_attrib = 'mam_fin'
-    interfaces = {'results'}
+    interfaces = {'results', 'stable', 'complete'}
 
     def setup(self, xml=None):
         ElementBase.setup(self, xml)

slixmpp/plugins/xep_0317/__init__.py

@@ -0,0 +1,11 @@
+# Slixmpp: The Slick XMPP Library
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
+from slixmpp.plugins import register_plugin
+from slixmpp.plugins.xep_0317 import stanza
+from slixmpp.plugins.xep_0317.hats import XEP_0317
+from slixmpp.plugins.xep_0317.stanza import Hat, Hats
+
+register_plugin(XEP_0317)
+
+__all__ = ['stanza', 'XEP_317']

slixmpp/plugins/xep_0317/hats.py

@@ -0,0 +1,16 @@
+from slixmpp.plugins import BasePlugin
+from . import stanza
+
+
+class XEP_0317(BasePlugin):
+    """
+    XEP-0317: Hats
+    """
+    name = 'xep_0317'
+    description = 'XEP-0317: Hats'
+    dependencies = {'xep_0030', 'xep_0045', 'xep_0050'}
+    stanza = stanza
+    namespace = stanza.NS
+
+    def plugin_init(self):
+        stanza.register_plugin()

slixmpp/plugins/xep_0317/stanza.py

@@ -0,0 +1,58 @@
+from slixmpp import Presence
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+from typing import List, Tuple
+
+NS = 'urn:xmpp:hats:0'
+
+
+class Hats(ElementBase):
+    """
+    Hats element, container for multiple hats:
+
+    .. code-block::xml
+
+
+      <hats xmlns='urn:xmpp:hats:0'>
+        <hat title='Host' uri='http://schemas.example.com/hats#host' xml:lang='en-us'>
+            <badge xmlns="urn:example:badges" fgcolor="#000000" bgcolor="#58C5BA"/>
+        </hat>
+        <hat title='Presenter' uri='http://schemas.example.com/hats#presenter' xml:lang='en-us'>
+            <badge xmlns="urn:example:badges" fgcolor="#000000" bgcolor="#EC0524"/>
+        </hat>
+      </hats>
+
+    """
+
+    name = 'hats'
+    namespace = NS
+    plugin_attrib = 'hats'
+
+    def add_hats(self, data: List[Tuple[str, str]]) -> None:
+        for uri, title in data:
+            hat = Hat()
+            hat["uri"] = uri
+            hat["title"] = title
+            self.append(hat)
+
+
+class Hat(ElementBase):
+    """
+    Hat element, has a title and url, may contain arbitrary sub-elements.
+
+    .. code-block::xml
+
+        <hat title='Host' uri='http://schemas.example.com/hats#host' xml:lang='en-us'>
+            <badge xmlns="urn:example:badges" fgcolor="#000000" bgcolor="#58C5BA"/>
+        </hat>
+
+    """
+    name = 'hat'
+    plugin_attrib = 'hat'
+    namespace = NS
+    interfaces = {'title', 'uri'}
+    plugin_multi_attrib = "hats"
+
+
+def register_plugin() -> None:
+    register_stanza_plugin(Hats, Hat, iterable=True)
+    register_stanza_plugin(Presence, Hats)

slixmpp/plugins/xep_0356/__init__.py

@@ -1,7 +1,7 @@
 from slixmpp.plugins.base import register_plugin
 
-from slixmpp.plugins.xep_0356 import stanza
+from . import stanza
-from slixmpp.plugins.xep_0356.stanza import Perm, Privilege
+from .privilege import XEP_0356
-from slixmpp.plugins.xep_0356.privilege import XEP_0356
+from .stanza import Perm, Privilege
 
 register_plugin(XEP_0356)

slixmpp/plugins/xep_0356/permissions.py

@@ -0,0 +1,36 @@
+import dataclasses
+from collections import defaultdict
+from enum import Enum
+
+
+class RosterAccess(str, Enum):
+    NONE = "none"
+    GET = "get"
+    SET = "set"
+    BOTH = "both"
+
+
+class MessagePermission(str, Enum):
+    NONE = "none"
+    OUTGOING = "outgoing"
+
+
+class IqPermission(str, Enum):
+    NONE = "none"
+    GET = "get"
+    SET = "set"
+    BOTH = "both"
+
+
+class PresencePermission(str, Enum):
+    NONE = "none"
+    MANAGED_ENTITY = "managed_entity"
+    ROSTER = "roster"
+
+
+@dataclasses.dataclass
+class Permissions:
+    roster = RosterAccess.NONE
+    message = MessagePermission.NONE
+    iq = defaultdict(lambda: IqPermission.NONE)
+    presence = PresencePermission.NONE

slixmpp/plugins/xep_0356/privilege.py

@@ -1,14 +1,16 @@
 import logging
 import typing
+import uuid
+from collections import defaultdict
 
-from slixmpp import Message, JID, Iq
+from slixmpp import JID, Iq, Message
 from slixmpp.plugins.base import BasePlugin
-from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import StanzaBase
 from slixmpp.xmlstream.handler import Callback
-from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.matcher import StanzaPath
-
-from slixmpp.plugins.xep_0356 import stanza, Privilege, Perm
 
+from . import stanza
+from .permissions import IqPermission, MessagePermission, Permissions, RosterAccess
 
 log = logging.getLogger(__name__)
 
@@ -29,7 +31,7 @@ class XEP_0356(BasePlugin):
     dependencies = {"xep_0297"}
     stanza = stanza
 
-    granted_privileges = {"roster": "none", "message": "none", "presence": "none"}
+    granted_privileges = defaultdict(Permissions)
 
     def plugin_init(self):
         if not self.xmpp.is_component:
@@ -49,32 +51,42 @@ class XEP_0356(BasePlugin):
     def plugin_end(self):
         self.xmpp.remove_handler("Privileges")
 
-    def _handle_privilege(self, msg: Message):
+    def _handle_privilege(self, msg: StanzaBase):
         """
         Called when the XMPP server advertise the component's privileges.
 
         Stores the privileges in this instance's granted_privileges attribute (a dict)
         and raises the privileges_advertised event
         """
+        permissions = self.granted_privileges[msg.get_from()]
         for perm in msg["privilege"]["perms"]:
-            self.granted_privileges[perm["access"]] = perm["type"]
+            access = perm["access"]
+            if access == "iq":
+                for ns in perm["namespaces"]:
+                    permissions.iq[ns["ns"]] = ns["type"]
+            elif access in _VALID_ACCESSES:
+                setattr(permissions, access, perm["type"])
+            else:
+                log.warning("Received an invalid privileged access: %s", access)
         log.debug(f"Privileges: {self.granted_privileges}")
         self.xmpp.event("privileges_advertised")
 
     def send_privileged_message(self, msg: Message):
-        if self.granted_privileges["message"] == "outgoing":
+        if (
-            self._make_privileged_message(msg).send()
+            self.granted_privileges[msg.get_from().domain].message
-        else:
+            != MessagePermission.OUTGOING
-            log.error(
+        ):
+            raise PermissionError(
                 "The server hasn't authorized us to send messages on behalf of other users"
             )
+        else:
+            self._make_privileged_message(msg).send()
 
     def _make_privileged_message(self, msg: Message):
-        stanza = self.xmpp.make_message(
+        server = msg.get_from().domain
-            mto=self.xmpp.server_host, mfrom=self.xmpp.boundjid.bare
+        wrapped = self.xmpp.make_message(mto=server, mfrom=self.xmpp.boundjid.bare)
-        )
+        wrapped["privilege"]["forwarded"].append(msg)
-        stanza["privilege"]["forwarded"].append(msg)
+        return wrapped
-        return stanza
 
     def _make_get_roster(self, jid: typing.Union[JID, str], **iq_kwargs):
         return self.xmpp.make_iq_get(
@@ -106,9 +118,15 @@ class XEP_0356(BasePlugin):
 
         :param jid: user we want to fetch the roster from
         """
-        if self.granted_privileges["roster"] not in ("get", "both"):
+        if isinstance(jid, str):
-            log.error("The server did not grant us privileges to get rosters")
+            jid = JID(jid)
-            raise ValueError
+        if self.granted_privileges[jid.domain].roster not in (
+            RosterAccess.GET,
+            RosterAccess.BOTH,
+        ):
+            raise PermissionError(
+                "The server did not grant us privileges to get rosters"
+            )
         else:
             return await self._make_get_roster(jid).send(**send_kwargs)
 
@@ -137,8 +155,56 @@ class XEP_0356(BasePlugin):
             },
         }
         """
-        if self.granted_privileges["roster"] not in ("set", "both"):
+        if isinstance(jid, str):
-            log.error("The server did not grant us privileges to set rosters")
+            jid = JID(jid)
-            raise ValueError
+        if self.granted_privileges[jid.domain].roster not in (
+            RosterAccess.GET,
+            RosterAccess.BOTH,
+        ):
+            raise PermissionError(
+                "The server did not grant us privileges to set rosters"
+            )
         else:
             return await self._make_set_roster(jid, roster_items).send(**send_kwargs)
+
+    async def send_privileged_iq(
+        self, encapsulated_iq: Iq, iq_id: typing.Optional[str] = None
+    ):
+        """
+        Send an IQ on behalf of a user
+
+        Caution: the IQ *must* have the jabber:client namespace
+        """
+        iq_id = iq_id or str(uuid.uuid4())
+        encapsulated_iq["id"] = iq_id
+        server = encapsulated_iq.get_to().domain
+        perms = self.granted_privileges.get(server)
+        if not perms:
+            raise PermissionError(f"{server} has not granted us any privilege")
+        itype = encapsulated_iq["type"]
+        for ns in encapsulated_iq.plugins.values():
+            type_ = perms.iq[ns.namespace]
+            if type_ == IqPermission.NONE:
+                raise PermissionError(
+                    f"{server} has not granted any IQ privilege for namespace {ns.namespace}"
+                )
+            elif type_ == IqPermission.BOTH:
+                pass
+            elif type_ != itype:
+                raise PermissionError(
+                    f"{server} has not granted IQ {itype} privilege for namespace {ns.namespace}"
+                )
+        iq = self.xmpp.make_iq(
+            itype=itype,
+            ifrom=self.xmpp.boundjid.bare,
+            ito=encapsulated_iq.get_from(),
+            id=iq_id,
+        )
+        iq["privileged_iq"].append(encapsulated_iq)
+
+        resp = await iq.send()
+        return resp["privilege"]["forwarded"]["iq"]
+
+
+# does not include iq access that is handled differently
+_VALID_ACCESSES = {"message", "roster", "presence"}

slixmpp/plugins/xep_0356/stanza.py

@@ -1,13 +1,12 @@
-from slixmpp.stanza import Message
-from slixmpp.xmlstream import (
-    ElementBase,
-    register_stanza_plugin,
-)
 from slixmpp.plugins.xep_0297 import Forwarded
+from slixmpp.stanza import Iq, Message
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+
+NS = "urn:xmpp:privilege:2"
 
 
 class Privilege(ElementBase):
-    namespace = "urn:xmpp:privilege:2"
+    namespace = NS
     name = "privilege"
     plugin_attrib = "privilege"
 
@@ -25,26 +24,40 @@ class Privilege(ElementBase):
     def presence(self):
         return self.permission("presence")
 
-    def iq(self):
+    def add_perm(self, access, type_):
-        return self.permission("iq")
-
-    def add_perm(self, access, type):
         # This should only be needed for servers, so maybe out of scope for slixmpp
         perm = Perm()
-        perm["type"] = type
+        perm["type"] = type_
         perm["access"] = access
         self.append(perm)
 
 
 class Perm(ElementBase):
-    namespace = "urn:xmpp:privilege:2"
+    namespace = NS
     name = "perm"
     plugin_attrib = "perm"
     plugin_multi_attrib = "perms"
     interfaces = {"type", "access"}
 
 
+class NameSpace(ElementBase):
+    namespace = NS
+    name = "namespace"
+    plugin_attrib = "namespace"
+    plugin_multi_attrib = "namespaces"
+    interfaces = {"ns", "type"}
+
+
+class PrivilegedIq(ElementBase):
+    namespace = NS
+    name = "privileged_iq"
+    plugin_attrib = "privileged_iq"
+
+
 def register():
     register_stanza_plugin(Message, Privilege)
+    register_stanza_plugin(Iq, Privilege)
     register_stanza_plugin(Privilege, Forwarded)
     register_stanza_plugin(Privilege, Perm, iterable=True)
+    register_stanza_plugin(Perm, NameSpace, iterable=True)
+    register_stanza_plugin(Iq, PrivilegedIq)

slixmpp/plugins/xep_0428/stanza.py

@@ -1,8 +1,13 @@
-
 # Slixmpp: The Slick XMPP Library
 # Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
 # This file is part of Slixmpp.
 # See the file LICENSE for copying permissio
+from abc import ABC
+try:
+    from typing import Literal
+except ImportError:
+    from typing_extensions import Literal
+
 from slixmpp.stanza import Message
 from slixmpp.xmlstream import (
     ElementBase,
@@ -10,14 +15,83 @@ from slixmpp.xmlstream import (
 )
 
 
-NS = 'urn:xmpp:fallback:0'
+NS = "urn:xmpp:fallback:0"
 
 
 class Fallback(ElementBase):
     namespace = NS
-    name = 'fallback'
+    name = "fallback"
-    plugin_attrib = 'fallback'
+    plugin_attrib = "fallback"
+    plugin_multi_attrib = "fallbacks"
+    interfaces = {"for"}
+
+    def _find_fallback(self, fallback_for: str) -> "Fallback":
+        if self["for"] == fallback_for:
+            return self
+        for fallback in self.parent()["fallbacks"]:
+            if fallback["for"] == fallback_for:
+                return fallback
+        raise AttributeError("No fallback for this namespace", fallback_for)
+
+    def get_stripped_body(
+        self, fallback_for: str, element: Literal["body", "subject"] = "body"
+    ) -> str:
+        """
+        Get the body of a message, with the fallback part stripped
+
+        :param fallback_for: namespace of the fallback to strip
+        :param element: set this to "subject" get the stripped subject instead
+            of body
+
+        :return: body (or subject) content minus the fallback part
+        """
+        fallback = self._find_fallback(fallback_for)
+        start = fallback[element]["start"]
+        end = fallback[element]["end"]
+        body = self.parent()[element]
+        if start == end == 0:
+            return ""
+        if start <= end < len(body):
+            return body[:start] + body[end:]
+        else:
+            return body
+
+
+class FallbackMixin(ABC):
+    namespace = NS
+    name = NotImplemented
+    plugin_attrib = NotImplemented
+    interfaces = {"start", "end"}
+
+    def set_start(self, v: int):
+        self._set_attr("start", str(v))
+
+    def get_start(self):
+        return _int_or_zero(self._get_attr("start"))
+
+    def set_end(self, v: int):
+        self._set_attr("end", str(v))
+
+    def get_end(self):
+        return _int_or_zero(self._get_attr("end"))
+
+
+class FallbackBody(FallbackMixin, ElementBase):
+    name = plugin_attrib = "body"
+
+
+class FallbackSubject(FallbackMixin, ElementBase):
+    name = plugin_attrib = "subject"
+
+
+def _int_or_zero(v: str):
+    try:
+        return int(v)
+    except ValueError:
+        return 0
 
 
 def register_plugins():
-    register_stanza_plugin(Message, Fallback)
+    register_stanza_plugin(Message, Fallback, iterable=True)
+    register_stanza_plugin(Fallback, FallbackBody)
+    register_stanza_plugin(Fallback, FallbackSubject)

slixmpp/plugins/xep_0461/reply.py

@@ -13,7 +13,7 @@ class XEP_0461(BasePlugin):
     name = "xep_0461"
     description = "XEP-0461: Message Replies"
 
-    dependencies = {"xep_0030"}
+    dependencies = {"xep_0030", "xep_0428"}
     stanza = stanza
     namespace = stanza.NS
 

slixmpp/plugins/xep_0461/stanza.py

@@ -1,5 +1,8 @@
+from typing import Optional
+
 from slixmpp.stanza import Message
 from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.plugins.xep_0428.stanza import Fallback
 
 NS = "urn:xmpp:reply:0"
 
@@ -10,71 +13,44 @@ class Reply(ElementBase):
     plugin_attrib = "reply"
     interfaces = {"id", "to"}
 
+    def add_quoted_fallback(self, fallback: str, nickname: Optional[str] = None):
+        """
+        Add plain text fallback for clients not implementing XEP-0461.
 
-class FeatureFallBack(ElementBase):
+        ``msg["reply"].add_quoted_fallback("Some text", "Bob")`` will
-    # should also be a multi attrib
+        prepend "> Bob:\n> Some text\n" to the body of the message, and set the
-    namespace = "urn:xmpp:fallback:0"
+        fallback_body attributes accordingly, so that clients implementing
-    name = "fallback"
+        XEP-0461 can hide the fallback text.
-    plugin_attrib = "feature_fallback"
-    interfaces = {"for"}
 
-    def get_fallback_body(self):
+        :param fallback: Body of the quoted message.
-        # only works for a single fallback_body attrib
+        :param nickname: Optional, nickname of the quoted participant.
-        start = self["fallback_body"]["start"]
+        """
-        end = self["fallback_body"]["end"]
+        msg = self.parent()
-        body = self.parent()["body"]
+        quoted = "\n".join("> " + x.strip() for x in fallback.split("\n")) + "\n"
+        if nickname:
+            quoted = "> " + nickname + ":\n" + quoted
+        msg["body"] = quoted + msg["body"]
+        fallback = Fallback()
+        fallback["for"] = NS
+        fallback["body"]["start"] = 0
+        fallback["body"]["end"] = len(quoted)
+        msg.append(fallback)
+
+    def get_fallback_body(self) -> str:
+        msg = self.parent()
+        for fallback in msg["fallbacks"]:
+            if fallback["for"] == NS:
+                break
+        else:
+            return ""
+        start = fallback["body"]["start"]
+        end = fallback["body"]["end"]
+        body = msg["body"]
         if start <= end:
             return body[start:end]
         else:
             return ""
 
-    def get_stripped_body(self):
-        # only works for a single fallback_body attrib
-        start = self["fallback_body"]["start"]
-        end = self["fallback_body"]["end"]
-        body = self.parent()["body"]
-        if start <= end < len(body):
-            return body[:start] + body[end:]
-        else:
-            return body
-
-    def add_quoted_fallback(self, fallback: str):
-        msg = self.parent()
-        quoted = "\n".join("> " + x.strip() for x in fallback.split("\n")) + "\n"
-        msg["body"] = quoted + msg["body"]
-        msg["feature_fallback"]["for"] = NS
-        msg["feature_fallback"]["fallback_body"]["start"] = 0
-        msg["feature_fallback"]["fallback_body"]["end"] = len(quoted)
-
-
-class FallBackBody(ElementBase):
-    # According to https://xmpp.org/extensions/inbox/compatibility-fallback.html
-    # this should be a multi_attrib *but* since it's a protoXEP, we'll see...
-    namespace = FeatureFallBack.namespace
-    name = "body"
-    plugin_attrib = "fallback_body"
-    interfaces = {"start", "end"}
-
-    def set_start(self, v: int):
-        self._set_attr("start", str(v))
-
-    def get_start(self):
-        try:
-            return int(self._get_attr("start"))
-        except ValueError:
-            return 0
-
-    def set_end(self, v: int):
-        self._set_attr("end", str(v))
-
-    def get_end(self):
-        try:
-            return int(self._get_attr("end"))
-        except ValueError:
-            return 0
-
 
 def register_plugins():
     register_stanza_plugin(Message, Reply)
-    register_stanza_plugin(Message, FeatureFallBack)
-    register_stanza_plugin(FeatureFallBack, FallBackBody)

slixmpp/plugins/xep_0469/__init__.py

@@ -0,0 +1,8 @@
+from slixmpp.plugins.base import register_plugin
+
+from . import stanza
+from .pinning import XEP_0469
+
+register_plugin(XEP_0469)
+
+__all__ = ['stanza', 'XEP_0469']

slixmpp/plugins/xep_0469/pinning.py

@@ -0,0 +1,17 @@
+from slixmpp.plugins import BasePlugin
+from . import stanza
+
+
+class XEP_0469(BasePlugin):
+
+    """
+    XEP-0469: Bookmark Pinning
+    """
+
+    name = "xep_0469"
+    description = "XEP-0469: Bookmark Pinning"
+    dependencies = {"xep_0402"}
+    stanza = stanza
+
+    def plugin_init(self):
+        stanza.register_plugin()

slixmpp/plugins/xep_0469/stanza.py

@@ -0,0 +1,31 @@
+from slixmpp import register_stanza_plugin
+from slixmpp.plugins.xep_0402.stanza import Extensions
+from slixmpp.xmlstream import ElementBase
+
+NS = "urn:xmpp:bookmarks-pinning:0"
+
+
+class Pinned(ElementBase):
+    """
+    Pinned bookmark element
+
+
+    To enable it on a Conference element, use enable() like this:
+
+    .. code-block::python
+
+        # C being a Conference element
+        C['extensions'].enable('pinned')
+
+    Which will add the <pinned> element to the <extensions> element.
+    """
+    namespace = NS
+    name = "pinned"
+    plugin_attrib = "pinned"
+    interfaces = {"pinned"}
+    bool_interfaces = {"pinned"}
+    is_extension = True
+
+
+def register_plugin():
+    register_stanza_plugin(Extensions, Pinned)

slixmpp/pluginsdict.py

@@ -69,12 +69,14 @@ from slixmpp.plugins.xep_0249 import XEP_0249
 from slixmpp.plugins.xep_0256 import XEP_0256
 from slixmpp.plugins.xep_0257 import XEP_0257
 from slixmpp.plugins.xep_0258 import XEP_0258
+from slixmpp.plugins.xep_0264 import XEP_0264
 from slixmpp.plugins.xep_0279 import XEP_0279
 from slixmpp.plugins.xep_0280 import XEP_0280
 from slixmpp.plugins.xep_0297 import XEP_0297
 from slixmpp.plugins.xep_0300 import XEP_0300
 from slixmpp.plugins.xep_0308 import XEP_0308
 from slixmpp.plugins.xep_0313 import XEP_0313
+from slixmpp.plugins.xep_0317 import XEP_0317
 from slixmpp.plugins.xep_0319 import XEP_0319
 from slixmpp.plugins.xep_0332 import XEP_0332
 from slixmpp.plugins.xep_0333 import XEP_0333
@@ -100,6 +102,7 @@ from slixmpp.plugins.xep_0428 import XEP_0428
 from slixmpp.plugins.xep_0437 import XEP_0437
 from slixmpp.plugins.xep_0439 import XEP_0439
 from slixmpp.plugins.xep_0444 import XEP_0444
+from slixmpp.plugins.xep_0461 import XEP_0461
 
 
 class PluginsDict(TypedDict):
@@ -162,12 +165,14 @@ class PluginsDict(TypedDict):
     xep_0256: XEP_0256
     xep_0257: XEP_0257
     xep_0258: XEP_0258
+    xep_0264: XEP_0264
     xep_0279: XEP_0279
     xep_0280: XEP_0280
     xep_0297: XEP_0297
     xep_0300: XEP_0300
     xep_0308: XEP_0308
     xep_0313: XEP_0313
+    xep_0317: XEP_0317
     xep_0319: XEP_0319
     xep_0332: XEP_0332
     xep_0333: XEP_0333
@@ -193,3 +198,4 @@ class PluginsDict(TypedDict):
     xep_0437: XEP_0437
     xep_0439: XEP_0439
     xep_0444: XEP_0444
+    xep_0461: XEP_0461

slixmpp/test/integration.py

@@ -29,9 +29,9 @@ class SlixIntegration(IsolatedAsyncioTestCase):
         self.clients = []
         self.addAsyncCleanup(self._destroy)
 
-    def envjid(self, name):
+    def envjid(self, name: str, *, default: Optional[str] = None) -> JID:
         """Get a JID from an env var"""
-        value = os.getenv(name)
+        value = os.getenv(name, default=default)
         return JID(value)
 
     def envstr(self, name):

slixmpp/test/slixtest.py

@@ -3,6 +3,7 @@
 # Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
 # This file is part of Slixmpp.
 # See the file LICENSE for copying permission.
+import atexit
 import unittest
 from queue import Queue
 from xml.parsers.expat import ExpatError
@@ -750,3 +751,12 @@ class SlixTest(unittest.TestCase):
             Error.namespace = 'jabber:client'
             for st in Message, Iq, Presence:
                 register_stanza_plugin(st, Error)
+
+
+@atexit.register
+def cleanup():
+    try:
+        loop = asyncio.get_event_loop()
+        loop.close()
+    except:
+        pass

slixmpp/util/sasl/mechanisms.py

@@ -181,7 +181,7 @@ class SCRAM(Mech):
     channel_binding = True
     required_credentials = {'username', 'password'}
     optional_credentials = {'authzid', 'channel_binding'}
-    security = {'encrypted', 'unencrypted_scram'}
+    security = {'tls_version', 'encrypted', 'unencrypted_scram', 'binding_proposed'}
 
     def setup(self, name):
         self.use_channel_binding = False
@@ -244,11 +244,15 @@ class SCRAM(Mech):
         self.cnonce = bytes(('%s' % random.random())[2:])
 
         gs2_cbind_flag = b'n'
-        if self.credentials['channel_binding']:
+        if self.security_settings['binding_proposed']:
-            if self.use_channel_binding:
+            if self.credentials['channel_binding'] and \
-                gs2_cbind_flag = b'p=tls-unique'
+                    self.use_channel_binding:
-            else:
+                if self.security_settings['tls_version'] != 'TLSv1.3':
-                gs2_cbind_flag = b'y'
+                    gs2_cbind_flag = b'p=tls-unique'
+                else:
+                    gs2_cbind_flag = b'p=tls-exporter'
+        else:
+            gs2_cbind_flag = b'y'
 
         authzid = b''
         if self.credentials['authzid']:
@@ -280,7 +284,7 @@ class SCRAM(Mech):
             raise SASLCancelled('Invalid nonce')
 
         cbind_data = b''
-        if self.use_channel_binding:
+        if self.use_channel_binding and self.credentials['channel_binding']:
             cbind_data = self.credentials['channel_binding']
         cbind_input = self.gs2_header + cbind_data
         channel_binding = b'c=' + b64encode(cbind_input).replace(b'\n', b'')

slixmpp/version.py

@@ -5,5 +5,5 @@
 # We don't want to have to import the entire library
 # just to get the version info for setup.py
 
-__version__ = '1.8.4'
+__version__ = '1.8.5'
-__version_info__ = (1, 8, 4)
+__version_info__ = (1, 8, 5)

slixmpp/xmlstream/__init__.py

@@ -10,5 +10,5 @@ from slixmpp.xmlstream.tostring import tostring, highlight
 from slixmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT
 
 __all__ = ['JID', 'StanzaBase', 'ElementBase',
-           'ET', 'StateMachine', 'tostring', 'highlight', 'XMLStream',
+           'ET', 'tostring', 'highlight', 'XMLStream',
-           'RESPONSE_TIMEOUT']
+           'RESPONSE_TIMEOUT', 'register_stanza_plugin']

slixmpp/xmlstream/stanzabase.py

@@ -1243,7 +1243,7 @@ class ElementBase(object):
                 self.init_plugin(item.__class__.plugin_multi_attrib)
         else:
             self.iterables.append(item)
-
+        item.parent = weakref.ref(self)
         return self
 
     def appendxml(self, xml: ET.Element) -> ElementBase:

slixmpp/xmlstream/xmlstream.py

@@ -290,8 +290,8 @@ class XMLStream(asyncio.BaseProtocol):
         self.xml_depth = 0
         self.xml_root = None
 
-        self.force_starttls = None
+        self.force_starttls = True
-        self.disable_starttls = None
+        self.disable_starttls = False
 
         self.waiting_queue = asyncio.Queue()
 
@@ -405,8 +405,9 @@ class XMLStream(asyncio.BaseProtocol):
             self.disconnected.set_result(True)
         self.disconnected = asyncio.Future()
 
-    def connect(self, host: str = '', port: int = 0, use_ssl: Optional[bool] = False,
+    def connect(self, host: str = '', port: int = 0, use_ssl: Optional[bool] = None,
-                force_starttls: Optional[bool] = True, disable_starttls: Optional[bool] = False) -> None:
+                force_starttls: Optional[bool] = None,
+                disable_starttls: Optional[bool] = None) -> None:
         """Create a new socket and connect to the server.
 
         :param host: The name of the desired server for the connection.
@@ -523,7 +524,7 @@ class XMLStream(asyncio.BaseProtocol):
             else:
                 self.loop.run_until_complete(self.disconnected)
         else:
-            tasks: List[Awaitable] = [asyncio.sleep(timeout)]
+            tasks: List[Union[asyncio.Task, asyncio.Future]] = [asyncio.Task(asyncio.sleep(timeout))]
             if not forever:
                 tasks.append(self.disconnected)
             self.loop.run_until_complete(asyncio.wait(tasks))
@@ -849,6 +850,8 @@ class XMLStream(asyncio.BaseProtocol):
             log.debug("Connection error:", exc_info=True)
             self.disconnect()
             return False
+        if transp is None:
+            raise Exception("Transport should not be none")
         der_cert = transp.get_extra_info("ssl_object").getpeercert(True)
         pem_cert = ssl.DER_cert_to_PEM_cert(der_cert)
         self.event('ssl_cert', pem_cert)

tests/test_stanza_xep_0317.py

@@ -0,0 +1,67 @@
+import unittest
+from slixmpp import Presence
+from slixmpp.test import SlixTest
+import slixmpp.plugins.xep_0317 as xep_0317
+from slixmpp.plugins.xep_0317 import stanza
+
+
+class TestStanzaHats(SlixTest):
+
+    def setUp(self):
+        stanza.register_plugin()
+
+    def test_create_hats(self):
+        raw_xml = """
+          <hats xmlns="urn:xmpp:hats:0">
+            <hat uri="http://example.com/hats#Teacher" title="Teacher"/>
+          </hats>
+        """
+
+        hats = xep_0317.Hats()
+
+        hat = xep_0317.Hat()
+        hat['uri'] = 'http://example.com/hats#Teacher'
+        hat['title'] = 'Teacher'
+        hats.append(hat)
+
+        self.check(hats, raw_xml, use_values=False)
+
+    def test_set_single_hat(self):
+        presence = Presence()
+        presence["hats"]["hat"]["uri"] = "test-uri"
+        presence["hats"]["hat"]["title"] = "test-title"
+        self.check(
+            presence,  # language=XML
+            """
+            <presence>
+              <hats xmlns='urn:xmpp:hats:0'>
+                <hat uri='test-uri' title='test-title'/>
+              </hats>
+            </presence>
+            """,
+        )
+
+    def test_set_multi_hat(self):
+        presence = Presence()
+        presence["hats"].add_hats([("uri1", "title1"), ("uri2", "title2")])
+        self.check(
+            presence,  # language=XML
+            """
+            <presence>
+              <hats xmlns='urn:xmpp:hats:0'>
+                <hat uri='uri1' title='title1'/>
+                <hat uri='uri2' title='title2'/>
+              </hats>
+            </presence>
+            """,
+        )
+
+    def test_get_hats(self):
+        presence = Presence()
+        presence["hats"].add_hats([("uri1", "title1"), ("uri2", "title2")])
+        for i, hat in enumerate(presence["hats"]["hats"], start=1):
+            self.assertEqual(hat["uri"], f"uri{i}")
+            self.assertEqual(hat["title"], f"title{i}")
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestStanzaHats)

tests/test_stanza_xep_0356.py

@@ -1,9 +1,7 @@
 import unittest
-from slixmpp import Message
 from slixmpp.test import SlixTest
-from slixmpp.xmlstream import register_stanza_plugin
 
-from slixmpp.plugins.xep_0356 import stanza
+from slixmpp.plugins.xep_0356 import stanza, permissions
 
 
 class TestPermissions(SlixTest):
@@ -12,30 +10,57 @@ class TestPermissions(SlixTest):
 
     def testAdvertisePermission(self):
         xmlstring = """
-            <message from='capulet.net' to='pubub.capulet.lit'>
+            <message from='capulet.lit' to='pubsub.capulet.lit'>
                 <privilege xmlns='urn:xmpp:privilege:2'>
                     <perm access='roster' type='both'/>
                     <perm access='message' type='outgoing'/>
                     <perm access='presence' type='managed_entity'/>
+                    <perm access='iq' type='both'/>
                 </privilege>
             </message>
         """
         msg = self.Message()
-        msg["from"] = "capulet.net"
+        msg["from"] = "capulet.lit"
-        msg["to"] = "pubub.capulet.lit"
+        msg["to"] = "pubsub.capulet.lit"
-        # This raises AttributeError: 'NoneType' object has no attribute 'use_origin_id'
-        # msg["id"] = "id"
 
         for access, type_ in [
-            ("roster", "both"),
+            ("roster", permissions.RosterAccess.BOTH),
-            ("message", "outgoing"),
+            ("message", permissions.MessagePermission.OUTGOING),
-            ("presence", "managed_entity"),
+            ("presence", permissions.PresencePermission.MANAGED_ENTITY),
+            ("iq", permissions.IqPermission.BOTH),
         ]:
             msg["privilege"].add_perm(access, type_)
 
         self.check(msg, xmlstring)
-        # Should this one work? →        # AttributeError: 'Message' object has no attribute 'permission'
+
-        # self.assertEqual(msg.permission["roster"], "both")
+    def testIqPermission(self):
+        x = stanza.Privilege()
+        x["access"] = "iq"
+        ns = stanza.NameSpace()
+        ns["ns"] = "some_ns"
+        ns["type"] = "get"
+        x["perm"]["access"] = "iq"
+        x["perm"].append(ns)
+        ns = stanza.NameSpace()
+        ns["ns"] = "some_other_ns"
+        ns["type"] = "both"
+        x["perm"].append(ns)
+        self.check(
+            x,
+            """
+              <privilege xmlns='urn:xmpp:privilege:2'>
+                <perm access='iq'>
+                  <namespace ns='some_ns' type='get' />
+                  <namespace ns='some_other_ns' type='both' />
+                </perm>
+              </privilege>
+            """
+        )
+        nss = set()
+        for perm in x["perms"]:
+            for ns in perm["namespaces"]:
+                nss.add((ns["ns"], ns["type"]))
+        assert nss == {("some_ns", "get"), ("some_other_ns", "both")}
 
 
 suite = unittest.TestLoader().loadTestsFromTestCase(TestPermissions)

tests/test_stanza_xep_0428.py

@@ -0,0 +1,149 @@
+import unittest
+
+from slixmpp import Message
+from slixmpp.test import SlixTest
+from slixmpp.plugins.xep_0428 import stanza
+
+from slixmpp.plugins import xep_0461
+from slixmpp.plugins import xep_0444
+
+
+class TestFallback(SlixTest):
+    def setUp(self):
+        stanza.register_plugins()
+
+    def testSingleFallbackBody(self):
+        message = Message()
+        message["fallback"]["for"] = "ns"
+        message["fallback"]["body"]["start"] = 0
+        message["fallback"]["body"]["end"] = 8
+
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns'>
+                <body start="0" end="8" />
+              </fallback>
+            </message>
+            """,
+        )
+
+    def testSingleFallbackSubject(self):
+        message = Message()
+        message["fallback"]["for"] = "ns"
+        message["fallback"]["subject"]["start"] = 0
+        message["fallback"]["subject"]["end"] = 8
+
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns'>
+                <subject start="0" end="8" />
+              </fallback>
+            </message>
+            """,
+        )
+
+    def testSingleFallbackWholeBody(self):
+        message = Message()
+        message["fallback"]["for"] = "ns"
+        message["fallback"].enable("body")
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns'>
+                <body />
+              </fallback>
+            </message>
+            """,
+        )
+
+    def testMultiFallback(self):
+        message = Message()
+
+        f1 = stanza.Fallback()
+        f1["for"] = "ns1"
+
+        f2 = stanza.Fallback()
+        f2["for"] = "ns2"
+
+        message.append(f1)
+        message.append(f2)
+
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns1' />
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns2' />
+            </message>
+            """,
+        )
+
+        for i, fallback in enumerate(message["fallbacks"], start=1):
+            self.assertEqual(fallback["for"], f"ns{i}")
+
+    def testStripFallbackPartOfBody(self):
+        message = Message()
+        message["body"] = "> quoted\nsome-body"
+        message["fallback"]["for"] = xep_0461.stanza.NS
+        message["fallback"]["body"]["start"] = 0
+        message["fallback"]["body"]["end"] = 9
+
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <body>&gt; quoted\nsome-body</body>
+              <fallback xmlns='urn:xmpp:fallback:0' for='urn:xmpp:reply:0'>
+                <body start="0" end="9" />
+              </fallback>
+            </message>
+            """,
+        )
+
+        self.assertEqual(
+            message["fallback"].get_stripped_body(xep_0461.stanza.NS), "some-body"
+        )
+
+    def testStripWholeBody(self):
+        message = Message()
+        message["body"] = "> quoted\nsome-body"
+        message["fallback"]["for"] = "ns"
+        message["fallback"].enable("body")
+
+        self.check(
+            message,  # language=XML
+            """
+            <message>
+              <body>&gt; quoted\nsome-body</body>
+              <fallback xmlns='urn:xmpp:fallback:0' for='ns'>
+                <body />
+              </fallback>
+            </message>
+            """,
+        )
+
+        self.assertEqual(message["fallback"].get_stripped_body("ns"), "")
+
+    def testStripMultiFallback(self):
+        message = Message()
+        message["body"] = "> huuuuu\n👍"
+
+        message["fallback"]["for"] = xep_0461.stanza.NS
+        message["fallback"]["body"]["start"] = 0
+        message["fallback"]["body"]["end"] = 9
+
+        reaction_fallback = stanza.Fallback()
+        reaction_fallback["for"] = xep_0444.stanza.NS
+        reaction_fallback.enable("body")
+        message.append(reaction_fallback)
+
+        self.assertEqual(message["fallback"].get_stripped_body(xep_0461.stanza.NS), "👍")
+        self.assertEqual(message["fallback"].get_stripped_body(xep_0444.stanza.NS), "")
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestFallback)

tests/test_stanza_xep_0461.py

@@ -1,11 +1,13 @@
 import unittest
 from slixmpp import Message
 from slixmpp.test import SlixTest
+from slixmpp.plugins.xep_0428 import stanza as fallback_stanza
 from slixmpp.plugins.xep_0461 import stanza
 
 
 class TestReply(SlixTest):
     def setUp(self):
+        fallback_stanza.register_plugins()
         stanza.register_plugins()
 
     def testReply(self):
@@ -26,9 +28,9 @@ class TestReply(SlixTest):
     def testFallback(self):
         message = Message()
         message["body"] = "12345\nrealbody"
-        message["feature_fallback"]["for"] = "NS"
+        message["fallback"]["for"] = "NS"
-        message["feature_fallback"]["fallback_body"]["start"] = 0
+        message["fallback"]["body"]["start"] = 0
-        message["feature_fallback"]["fallback_body"]["end"] = 6
+        message["fallback"]["body"]["end"] = 6
 
         self.check(
             message,
@@ -42,18 +44,18 @@ class TestReply(SlixTest):
             """,
         )
 
-        assert message["feature_fallback"].get_stripped_body() == "realbody"
+        assert message["fallback"].get_stripped_body("NS") == "realbody"
 
     def testAddFallBackHelper(self):
         msg = Message()
         msg["body"] = "Great"
-        msg["feature_fallback"].add_quoted_fallback("Anna wrote:\nHi, how are you?")
+        msg["reply"].add_quoted_fallback("Anna wrote:\nHi, how are you?")
-        # ugly dedent but the test does not pass without it
         self.check(
-            msg,
+            msg,  # language=XML
             """
         <message xmlns="jabber:client" type="normal">
             <body>> Anna wrote:\n> Hi, how are you?\nGreat</body>
+            <reply xmlns="urn:xmpp:reply:0" />
             <fallback xmlns="urn:xmpp:fallback:0" for="urn:xmpp:reply:0">
                 <body start='0' end='33' />
             </fallback>
@@ -67,8 +69,8 @@ class TestReply(SlixTest):
 
         msg = Message()
         msg["body"] = "Great"
-        msg["feature_fallback"].add_quoted_fallback(body)
+        msg["reply"].add_quoted_fallback(body)
-        body2 = msg["feature_fallback"].get_fallback_body()
+        body2 = msg["reply"].get_fallback_body()
         self.assertTrue(body2 == quoted, body2)
 
 

tests/test_stanza_xep_0469.py

@@ -0,0 +1,36 @@
+import unittest
+
+from slixmpp.test import SlixTest
+from slixmpp.plugins.xep_0469 import stanza
+from slixmpp.plugins.xep_0402 import stanza as b_stanza
+
+
+class TestBookmarksPinning(SlixTest):
+    def setUp(self):
+        b_stanza.register_plugin()
+        stanza.register_plugin()
+
+    def test_pinned(self):
+        bookmark = b_stanza.Conference()
+        bookmark["password"] = "pass"
+        bookmark["nick"] = "nick"
+        bookmark["autojoin"] = False
+        bookmark["extensions"].enable("pinned")
+        self.check(
+            bookmark,
+            """
+            <conference xmlns='urn:xmpp:bookmarks:1'
+                        autojoin='false'>
+              <nick>nick</nick>
+              <password>pass</password>
+              <extensions>
+                <pinned xmlns="urn:xmpp:bookmarks-pinning:0" />
+              </extensions>
+            </conference>
+            """,
+            use_values=False
+        )
+
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestBookmarksPinning)

tests/test_stream_xep_0115.py

@@ -0,0 +1,76 @@
+import logging
+import unittest
+from slixmpp.test import SlixTest
+
+
+class TestCaps(SlixTest):
+    def setUp(self):
+        self.stream_start(plugins=["xep_0115"])
+
+    def testConcurrentSameHash(self):
+        """
+        Check that we only resolve a given ver string to a disco info once,
+        even if we receive several presences with that same ver string
+        consecutively.
+        """
+        self.recv(  # language=XML
+            """
+            <presence from='romeo@montague.lit/orchard'>
+              <c xmlns='http://jabber.org/protocol/caps'
+                 hash='sha-1'
+                 node='a-node'
+                 ver='h0TdMvqNR8FHUfFG1HauOLYZDqE='/>
+            </presence>
+            """
+        )
+        self.recv(  # language=XML
+            """
+            <presence from='i-dont-know-much-shakespeare@montague.lit/orchard'>
+              <c xmlns='http://jabber.org/protocol/caps'
+                 hash='sha-1'
+                 node='a-node'
+                 ver='h0TdMvqNR8FHUfFG1HauOLYZDqE='/>
+            </presence>
+            """
+        )
+        self.send(  # language=XML
+            """
+            <iq xmlns="jabber:client"
+                id="1"
+                to="romeo@montague.lit/orchard"
+                type="get">
+              <query xmlns="http://jabber.org/protocol/disco#info"
+                     node="a-node#h0TdMvqNR8FHUfFG1HauOLYZDqE="/>
+            </iq>
+            """
+        )
+        self.send(None)
+        self.recv(  # language=XML
+            """
+            <iq from='romeo@montague.lit/orchard'
+                id='1'
+                type='result'>
+              <query xmlns='http://jabber.org/protocol/disco#info'
+                     node='a-nodes#h0TdMvqNR8FHUfFG1HauOLYZDqE='>
+                <identity category='client' name='a client' type='pc'/>
+                <feature var='http://jabber.org/protocol/caps'/>
+              </query>
+            </iq>
+            """
+        )
+        self.send(None)
+        self.assertTrue(
+            self.xmpp["xep_0030"].supports(
+                "romeo@montague.lit/orchard", "http://jabber.org/protocol/caps"
+            )
+        )
+        self.assertTrue(
+            self.xmpp["xep_0030"].supports(
+                "i-dont-know-much-shakespeare@montague.lit/orchard",
+                "http://jabber.org/protocol/caps",
+            )
+        )
+
+
+logging.basicConfig(level=logging.DEBUG)
+suite = unittest.TestLoader().loadTestsFromTestCase(TestCaps)

tests/test_stream_xep_0356.py

@@ -1,7 +1,7 @@
 import unittest
 
-from slixmpp import ComponentXMPP, Iq, Message
+from slixmpp import Message, JID, Iq
-from slixmpp.roster import RosterItem
+from slixmpp.plugins.xep_0356 import permissions
 from slixmpp.test import SlixTest
 
 
@@ -9,9 +9,9 @@ class TestPermissions(SlixTest):
     def setUp(self):
         self.stream_start(
             mode="component",
-            plugins=["xep_0356"],
+            plugins=["xep_0356", "xep_0045"],
             jid="pubsub.capulet.lit",
-            server="capulet.net",
+            server="capulet.lit",
         )
 
     def testPluginEnd(self):
@@ -23,26 +23,44 @@ class TestPermissions(SlixTest):
         self.assertFalse(exc)
 
     def testGrantedPrivileges(self):
-        # https://xmpp.org/extensions/xep-0356.html#example-4
         results = {"event": False}
+        x = self.xmpp["xep_0356"]
         self.xmpp.add_event_handler(
             "privileges_advertised", lambda msg: results.__setitem__("event", True)
         )
         self.recv(
             """
-            <message from='capulet.net' to='pubub.capulet.lit' id='54321'>
+            <message from='capulet.lit' to='pubsub.capulet.lit' id='54321'>
                 <privilege xmlns='urn:xmpp:privilege:2'>
                     <perm access='roster' type='both'/>
                     <perm access='message' type='outgoing'/>
+                    <perm access='iq'>
+                      <namespace ns='some_ns' type='get' />
+                      <namespace ns='some_other_ns' type='both' />
+                    </perm>
                 </privilege>
             </message>
             """
         )
-        self.assertEqual(self.xmpp["xep_0356"].granted_privileges["roster"], "both")
+        server = JID("capulet.lit")
         self.assertEqual(
-            self.xmpp["xep_0356"].granted_privileges["message"], "outgoing"
+            x.granted_privileges[server].roster, permissions.RosterAccess.BOTH
+        )
+        self.assertEqual(
+            x.granted_privileges[server].message, permissions.MessagePermission.OUTGOING
+        )
+        self.assertEqual(
+            x.granted_privileges[server].presence, permissions.PresencePermission.NONE
+        )
+        self.assertEqual(
+            x.granted_privileges[server].iq["nope"], permissions.IqPermission.NONE
+        )
+        self.assertEqual(
+            x.granted_privileges[server].iq["some_ns"], permissions.IqPermission.GET
+        )
+        self.assertEqual(
+            x.granted_privileges[server].iq["some_other_ns"], permissions.IqPermission.BOTH
         )
-        self.assertEqual(self.xmpp["xep_0356"].granted_privileges["presence"], "none")
         self.assertTrue(results["event"])
 
     def testGetRosterIq(self):
@@ -94,7 +112,7 @@ class TestPermissions(SlixTest):
 
     def testMakeOutgoingMessage(self):
         xmlstring = """
-        <message xmlns="jabber:component:accept" from='pubsub.capulet.lit' to='capulet.net'>
+        <message xmlns="jabber:component:accept" from='pubsub.capulet.lit' to='capulet.lit'>
             <privilege xmlns='urn:xmpp:privilege:2'>
                 <forwarded xmlns='urn:xmpp:forward:0'>
                     <message from="juliet@capulet.lit" to="romeo@montague.lit" xmlns="jabber:client">
@@ -108,9 +126,49 @@ class TestPermissions(SlixTest):
         msg["from"] = "juliet@capulet.lit"
         msg["to"] = "romeo@montague.lit"
         msg["body"] = "I do not hate you"
-        
+
         priv_msg = self.xmpp["xep_0356"]._make_privileged_message(msg)
         self.check(priv_msg, xmlstring, use_values=False)
 
+    def testDetectServer(self):
+        msg = Message()
+        msg["from"] = "juliet@something"
+        msg["to"] = "romeo@montague.lit"
+        msg["body"] = "I do not hate you"
+
+        priv_msg = self.xmpp["xep_0356"]._make_privileged_message(msg)
+        assert priv_msg.get_to() == "something"
+        assert priv_msg.get_from() == "pubsub.capulet.lit"
+
+    def testIqOnBehalf(self):
+        iq = Iq()
+        iq["mucadmin_query"]["item"]["affiliation"] = "member"
+        iq.set_from("juliet@xxx")
+        iq.set_to("somemuc@conf")
+        iq.set_type("get")
+        self.xmpp["xep_0356"].granted_privileges["conf"].iq["http://jabber.org/protocol/muc#admin"] = permissions.IqPermission.BOTH
+        r = self.xmpp.loop.create_task(self.xmpp["xep_0356"].send_privileged_iq(iq, iq_id="0"))
+        self.send(
+            """
+            <iq from="pubsub.capulet.lit"
+                to="juliet@xxx"
+                xmlns="jabber:component:accept"
+                type="get" id="0">
+                <privileged_iq xmlns='urn:xmpp:privilege:2'>
+                    <iq xmlns='jabber:client'
+                        type='get'
+                        to='somemuc@conf'
+                        from='juliet@xxx'
+                         id="0">
+                          <query xmlns='http://jabber.org/protocol/muc#admin'>
+                            <item affiliation='member'/>
+                          </query>
+                    </iq>
+                </privileged_iq>
+            </iq>
+            """,
+            use_values=False
+        )
+
 
 suite = unittest.TestLoader().loadTestsFromTestCase(TestPermissions)

tests/test_stream_xep_0461.py

@@ -9,8 +9,8 @@ class TestReply(SlixTest):
 
     def testFallBackBody(self):
         async def on_reply(msg):
-            start = msg["feature_fallback"]["fallback_body"]["start"]
+            start = msg["fallback"]["body"]["start"]
-            end = msg["feature_fallback"]["fallback_body"]["end"]
+            end = msg["fallback"]["body"]["end"]
             self.xmpp["xep_0461"].send_reply(
                 reply_to=msg.get_from(),
                 reply_id=msg.get_id(),