slidge 0.2.9__tar.gz → 0.2.11__tar.gz

{slidge-0.2.9 → slidge-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.2.9
+Version: 0.2.11
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later
@@ -23,21 +23,16 @@ Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: pillow<12,>=11.0.0
 Requires-Dist: python-magic<0.5,>=0.4.27
 Requires-Dist: qrcode<9,>=8.0
-Requires-Dist: slixmpp<2,>=1.9.0
+Requires-Dist: slixmpp<2,>=1.10.0
 Requires-Dist: sqlalchemy<3,>=2
 Requires-Dist: thumbhash>=0.1.2
 Dynamic: license-file
 
 ![Slidge logo](https://codeberg.org/slidge/slidge/raw/branch/main/dev/assets/slidge-color-small.png)
 
-[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
-
-
 [![woodpecker CI status](https://ci.codeberg.org/api/badges/14027/status.svg)](https://ci.codeberg.org/repos/14027)
-[![coverage](https://slidge.im/coverage/main/coverage.svg)](https://slidge.im/coverage/main)
-
-[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
-[![debian unstable version](https://badges.debian.net/badges/debian/unstable/python3-slidge/version.svg)](https://packages.debian.org/unstable/python3-slidge)
+[![coverage](https://slidge.im/coverage/slidge/main/coverage.svg)](https://slidge.im/coverage/slidge/main)
+[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
 
 Slidge is an XMPP (puppeteer) gateway library in python.
 It makes
@@ -104,8 +99,12 @@ or the
 [slidge-debian](https://git.sr.ht/~nicoco/slidge-debian)
 bundle.
 
+[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/slidge.svg)](https://repology.org/project/slidge/versions)
+
 Slidge is available on
-[codeberg](https://codeberg.org/slidge/-/packages) (python packages and containers)
+[codeberg](https://codeberg.org/slidge/slidge/releases)
 and [pypi](https://pypi.org/project/slidge/).
 Refer to [the docs](https://slidge.im/docs/slidge/main/admin/install.html) for details.
 

{slidge-0.2.9 → slidge-0.2.11}/README.md

@@ -1,13 +1,8 @@
 ![Slidge logo](https://codeberg.org/slidge/slidge/raw/branch/main/dev/assets/slidge-color-small.png)
 
-[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
-
-
 [![woodpecker CI status](https://ci.codeberg.org/api/badges/14027/status.svg)](https://ci.codeberg.org/repos/14027)
-[![coverage](https://slidge.im/coverage/main/coverage.svg)](https://slidge.im/coverage/main)
-
-[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
-[![debian unstable version](https://badges.debian.net/badges/debian/unstable/python3-slidge/version.svg)](https://packages.debian.org/unstable/python3-slidge)
+[![coverage](https://slidge.im/coverage/slidge/main/coverage.svg)](https://slidge.im/coverage/slidge/main)
+[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
 
 Slidge is an XMPP (puppeteer) gateway library in python.
 It makes
@@ -74,8 +69,12 @@ or the
 [slidge-debian](https://git.sr.ht/~nicoco/slidge-debian)
 bundle.
 
+[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/slidge.svg)](https://repology.org/project/slidge/versions)
+
 Slidge is available on
-[codeberg](https://codeberg.org/slidge/-/packages) (python packages and containers)
+[codeberg](https://codeberg.org/slidge/slidge/releases)
 and [pypi](https://pypi.org/project/slidge/).
 Refer to [the docs](https://slidge.im/docs/slidge/main/admin/install.html) for details.
 

{slidge-0.2.9 → slidge-0.2.11}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "pillow>=11.0.0,<12",
     "python-magic>=0.4.27,<0.5",
     "qrcode>=8.0,<9",
-    "slixmpp>=1.9.0,<2",
+    "slixmpp>=1.10.0,<2",
     "sqlalchemy>=2,<3",
     "thumbhash>=0.1.2",
 ]

{slidge-0.2.9 → slidge-0.2.11}/slidge/__init__.py

@@ -28,8 +28,7 @@ def entrypoint(module_name: str) -> None:
 
     :param module_name: An importable :term:`Legacy Module`.
     """
-    sys.argv.extend(["--legacy", module_name])
-    main_func()
+    main_func(module_name)
 
 
 def formatwarning(message, category, filename, lineno, line=""):

{slidge-0.2.9 → slidge-0.2.11}/slidge/core/gateway.py

@@ -31,6 +31,7 @@ from slidge.core.pubsub import PubSubComponent
 from slidge.core.session import BaseSession
 from slidge.db import GatewayUser, SlidgeStore
 from slidge.db.avatar import avatar_cache
+from slidge.slixfix import PrivilegedIqError
 from slidge.slixfix.delivery_receipt import DeliveryReceipt
 from slidge.slixfix.roster import RosterBackend
 from slidge.util import ABCSubclassableOnceAtMost
@@ -474,11 +475,12 @@ class BaseGateway(
                 "create the MDS node of %s",
                 user_jid,
             )
-        except (IqError, IqTimeout) as e:
+        except PrivilegedIqError as exc:
+            nested = exc.nested_error()
             # conflict this means the node already exists, we can ignore that
-            if e.condition != "conflict":
+            if nested is not None and nested.condition != "conflict":
                 log.exception(
-                    "Could not create the MDS node of %s", user_jid, exc_info=e
+                    "Could not create the MDS node of %s", user_jid, exc_info=exc
                 )
         except Exception as e:
             log.exception(

{slidge-0.2.9 → slidge-0.2.11}/slidge/core/mixins/attachment.py

@@ -46,7 +46,7 @@ class AttachmentMixin(TextMessageMixin):
         file_path: Path,
         file_name: Optional[str] = None,
         content_type: Optional[str] = None,
-    ):
+    ) -> str | None:
         if file_name and file_path.name != file_name:
             d = Path(tempfile.mkdtemp())
             temp = d / file_name
@@ -215,7 +215,7 @@ class AttachmentMixin(TextMessageMixin):
         else:
             local_path = file_path
             new_url = await self.__upload(file_path, file_name, content_type)
-        if legacy_file_id:
+        if legacy_file_id and new_url is not None:
             self.__store.set_url(self.session.user_pk, str(legacy_file_id), new_url)
 
         return is_temp, local_path, new_url

{slidge-0.2.9 → slidge-0.2.11}/slidge/core/pubsub.py

@@ -11,7 +11,7 @@ from slixmpp import (
     StanzaPath,
     register_stanza_plugin,
 )
-from slixmpp.exceptions import XMPPError
+from slixmpp.exceptions import IqError, IqTimeout, XMPPError
 from slixmpp.plugins.base import BasePlugin, register_plugin
 from slixmpp.plugins.xep_0060.stanza import Event, EventItem, EventItems, Item
 from slixmpp.plugins.xep_0084 import Data as AvatarData
@@ -134,7 +134,11 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
             info = None
         if info is None:
             async with self.lock(from_):
-                iq = await self.xmpp.plugin["xep_0030"].get_info(from_)
+                try:
+                    iq = await self.xmpp.plugin["xep_0030"].get_info(from_)
+                except (IqError, IqTimeout):
+                    log.debug("Could get disco#info of %s, ignoring", from_)
+                    return []
             info = iq["disco_info"]
         return info["features"]
 

{slidge-0.2.9 → slidge-0.2.11}/slidge/db/store.py

@@ -1076,6 +1076,7 @@ class ParticipantStore(EngineMixin):
                 update(Participant)
                 .where(Participant.id == participant.pk)
                 .values(
+                    nickname=participant.nickname,
                     resource=participant.jid.resource,
                     nickname_no_illegal=participant._nickname_no_illegal,
                     affiliation=participant.affiliation,

{slidge-0.2.9 → slidge-0.2.11}/slidge/group/participant.py

@@ -229,6 +229,8 @@ class LegacyParticipant(
         p = self._make_presence(ptype="available", last_seen=last_seen, **kwargs)
         self._send(p)
 
+        self.__part_store.update(self)
+
     def _make_presence(
         self,
         *,

{slidge-0.2.9 → slidge-0.2.11}/slidge/group/room.py

@@ -648,7 +648,7 @@ class LegacyMUC(
             since = self.xmpp.plugin["xep_0082"].parse(history_params["since"])
         except ValueError:
             since = None
-        if seconds:
+        if seconds is not None:
             since = datetime.now() - timedelta(seconds=seconds)
         if equals_zero(maxchars) or equals_zero(maxstanzas):
             log.debug("Joining client does not want any old-school MUC history-on-join")

{slidge-0.2.9 → slidge-0.2.11}/slidge/main.py

@@ -60,7 +60,7 @@ class SigTermInterrupt(Exception):
     pass
 
 
-def get_configurator():
+def get_configurator(from_entrypoint: bool = False):
     p = configargparse.ArgumentParser(
         default_config_files=os.getenv(
             "SLIDGE_CONF_DIR", "/etc/slidge/conf.d/*.conf"
@@ -98,7 +98,9 @@ def get_configurator():
         action="version",
         version=f"%(prog)s {slidge.__version__}",
     )
-    configurator = MainConfig(config, p)
+    configurator = MainConfig(
+        config, p, skip_options=("legacy_module",) if from_entrypoint else ()
+    )
     return configurator
 
 
@@ -106,8 +108,8 @@ def get_parser():
     return get_configurator().parser
 
 
-def configure():
-    configurator = get_configurator()
+def configure(from_entrypoint: bool):
+    configurator = get_configurator(from_entrypoint)
     args, unknown_argv = configurator.set_conf()
 
     if not (h := config.HOME_DIR).exists():
@@ -124,12 +126,16 @@ def handle_sigterm(_signum, _frame):
     raise SigTermInterrupt
 
 
-def main():
+def main(module_name: str | None = None) -> None:
+    from_entrypoint = module_name is not None
     signal.signal(signal.SIGTERM, handle_sigterm)
 
-    unknown_argv = configure()
+    unknown_argv = configure(from_entrypoint)
     logging.info("Starting slidge version %s", slidge.__version__)
 
+    if module_name is not None:
+        config.LEGACY_MODULE = module_name
+
     legacy_module = importlib.import_module(config.LEGACY_MODULE)
     logging.debug("Legacy module: %s", dir(legacy_module))
     logging.info(

slidge-0.2.11/slidge/slixfix/__init__.py

@@ -0,0 +1,141 @@
+# This module contains patches for slixmpp; some have pending requests upstream
+# and should be removed on the next slixmpp release.
+
+# ruff: noqa: F401
+
+import uuid
+
+import slixmpp.plugins
+import slixmpp.stanza.roster
+from slixmpp import Message
+from slixmpp.exceptions import IqError
+from slixmpp.plugins.xep_0050 import XEP_0050, Command
+from slixmpp.plugins.xep_0356.permissions import IqPermission
+from slixmpp.plugins.xep_0356.privilege import XEP_0356
+from slixmpp.plugins.xep_0469.stanza import NS as PINNED_NS
+from slixmpp.plugins.xep_0469.stanza import Pinned
+from slixmpp.xmlstream import StanzaBase
+
+from . import (
+    link_preview,
+    xep_0077,
+    xep_0100,
+    xep_0153,
+    xep_0292,
+)
+
+
+def set_pinned(self, val: bool):
+    extensions = self.parent()
+    if val:
+        extensions.enable("pinned")
+    else:
+        extensions._del_sub(f"{{{PINNED_NS}}}pinned")
+
+
+Pinned.set_pinned = set_pinned
+
+
+def session_bind(self, jid):
+    self.xmpp["xep_0030"].add_feature(Command.namespace)
+    # awful hack to for the disco items: we need to comment this line
+    # related issue: https://todo.sr.ht/~nicoco/slidge/131
+    # self.xmpp['xep_0030'].set_items(node=Command.namespace, items=tuple())
+
+
+XEP_0050.session_bind = session_bind  # type:ignore
+
+
+def reply(self, body=None, clear=True):
+    """
+    Overrides slixmpp's Message.reply(), since it strips to sender's resource
+    for mtype=groupchat, and we do not want that, because when we raise an XMPPError,
+    we actually want to preserve the resource.
+    (this is called in RootStanza.exception() to handle XMPPErrors)
+    """
+    new_message = StanzaBase.reply(self, clear)
+    new_message["thread"] = self["thread"]
+    new_message["parent_thread"] = self["parent_thread"]
+
+    del new_message["id"]
+    if self.stream is not None and self.stream.use_message_ids:
+        new_message["id"] = self.stream.new_id()
+
+    if body is not None:
+        new_message["body"] = body
+    return new_message
+
+
+Message.reply = reply  # type: ignore
+
+# TODO: remove me when https://codeberg.org/poezio/slixmpp/pulls/3622 is merged
+
+
+class PrivilegedIqError(IqError):
+    """
+    Exception raised when sending a privileged IQ stanza fails.
+    """
+
+    def nested_error(self) -> IqError | None:
+        """
+        Return the IQError generated from the inner IQ stanza, if present.
+        """
+        if "privilege" in self.iq:
+            if "forwarded" in self.iq["privilege"]:
+                if "iq" in self.iq["privilege"]["forwarded"]:
+                    return IqError(self.iq["privilege"]["forwarded"]["iq"])
+        return None
+
+
+async def send_privileged_iq(self, encapsulated_iq, iq_id=None):
+    """
+    Send an IQ on behalf of a user
+
+    Caution: the IQ *must* have the jabber:client namespace
+
+    Raises :class:`PrivilegedIqError` on failure.
+    """
+    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)
+
+    try:
+        resp = await iq.send()
+    except IqError as exc:
+        raise PrivilegedIqError(exc.iq)
+
+    return resp["privilege"]["forwarded"]["iq"]
+
+
+XEP_0356.send_privileged_iq = send_privileged_iq
+
+
+slixmpp.plugins.PLUGINS.extend(
+    [
+        "link_preview",
+        "xep_0292_provider",
+    ]
+)

{slidge-0.2.9 → slidge-0.2.11}/slidge/util/conf.py

@@ -95,20 +95,27 @@ class ConfigModule:
     ENV_VAR_PREFIX = "SLIDGE_"
 
     def __init__(
-        self, config_obj, parser: Optional[configargparse.ArgumentParser] = None
+        self,
+        config_obj,
+        parser: Optional[configargparse.ArgumentParser] = None,
+        skip_options: tuple[str, ...] = (),
     ):
         self.config_obj = config_obj
         if parser is None:
             parser = configargparse.ArgumentParser()
         self.parser = parser
 
-        self.add_options_to_parser()
+        self.skip_options = skip_options
+        self.add_options_to_parser(skip_options)
 
     def _list_options(self):
         return {
             o
             for o in (set(dir(self.config_obj)) | set(get_type_hints(self.config_obj)))
-            if o.upper() == o and not o.startswith("_") and "__" not in o
+            if o.upper() == o
+            and not o.startswith("_")
+            and "__" not in o
+            and o.lower() not in self.skip_options
         }
 
     def set_conf(self, argv: Optional[list[str]] = None):
@@ -179,9 +186,12 @@ class ConfigModule:
             res.append(Option(self, opt))
         return res
 
-    def add_options_to_parser(self):
+    def add_options_to_parser(self, skip_options: tuple[str, ...]):
+        skip_options = tuple(o.lower() for o in skip_options)
         p = self.parser
         for o in sorted(self.options, key=lambda x: (not x.required, x.name)):
+            if o.name.lower() in skip_options:
+                continue
             p.add_argument(*o.names, **o.kwargs)
 
     def update_dynamic_defaults(self, args):

{slidge-0.2.9 → slidge-0.2.11}/slidge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.2.9
+Version: 0.2.11
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later
@@ -23,21 +23,16 @@ Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: pillow<12,>=11.0.0
 Requires-Dist: python-magic<0.5,>=0.4.27
 Requires-Dist: qrcode<9,>=8.0
-Requires-Dist: slixmpp<2,>=1.9.0
+Requires-Dist: slixmpp<2,>=1.10.0
 Requires-Dist: sqlalchemy<3,>=2
 Requires-Dist: thumbhash>=0.1.2
 Dynamic: license-file
 
 ![Slidge logo](https://codeberg.org/slidge/slidge/raw/branch/main/dev/assets/slidge-color-small.png)
 
-[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
-
-
 [![woodpecker CI status](https://ci.codeberg.org/api/badges/14027/status.svg)](https://ci.codeberg.org/repos/14027)
-[![coverage](https://slidge.im/coverage/main/coverage.svg)](https://slidge.im/coverage/main)
-
-[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
-[![debian unstable version](https://badges.debian.net/badges/debian/unstable/python3-slidge/version.svg)](https://packages.debian.org/unstable/python3-slidge)
+[![coverage](https://slidge.im/coverage/slidge/main/coverage.svg)](https://slidge.im/coverage/slidge/main)
+[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://conference.nicoco.fr:5281/muc_log/slidge/)
 
 Slidge is an XMPP (puppeteer) gateway library in python.
 It makes
@@ -104,8 +99,12 @@ or the
 [slidge-debian](https://git.sr.ht/~nicoco/slidge-debian)
 bundle.
 
+[![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/slidge.svg)](https://repology.org/project/slidge/versions)
+
 Slidge is available on
-[codeberg](https://codeberg.org/slidge/-/packages) (python packages and containers)
+[codeberg](https://codeberg.org/slidge/slidge/releases)
 and [pypi](https://pypi.org/project/slidge/).
 Refer to [the docs](https://slidge.im/docs/slidge/main/admin/install.html) for details.
 

{slidge-0.2.9 → slidge-0.2.11}/slidge.egg-info/SOURCES.txt

@@ -168,6 +168,7 @@ slidge/util/test.py
 slidge/util/types.py
 slidge/util/util.py
 superduper/__init__.py
+superduper/__main__.py
 superduper/contact.py
 superduper/gateway.py
 superduper/group.py

{slidge-0.2.9 → slidge-0.2.11}/slidge.egg-info/requires.txt

@@ -5,6 +5,6 @@ defusedxml>=0.7.1
 pillow<12,>=11.0.0
 python-magic<0.5,>=0.4.27
 qrcode<9,>=8.0
-slixmpp<2,>=1.9.0
+slixmpp<2,>=1.10.0
 sqlalchemy<3,>=2
 thumbhash>=0.1.2

slidge-0.2.11/superduper/__main__.py

@@ -0,0 +1,3 @@
+from slidge import entrypoint
+
+entrypoint("superduper")

{slidge-0.2.9 → slidge-0.2.11}/tests/test_muc.py

@@ -3246,6 +3246,9 @@ class TestMuc(Base):
         muc = self.run_coro(muc.session.bookmarks.by_legacy_id(muc.legacy_id))
         participants_after = self.run_coro(self.__participants_as_list(muc))
         assert len(participants_after) == len(participants_before)
+        nicks = [p.nickname for p in participants_after]
+        assert old_nick not in nicks
+        assert "new-nick" in nicks
         assert self.next_sent() is None
 
     def test_rename_participant_from_participant(self):