slidge 0.3.0b1__tar.gz → 0.3.0b2__tar.gz

{slidge-0.3.0b1 → slidge-0.3.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b1
+Version: 0.3.0b2
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0b1 → slidge-0.3.0b2}/pyproject.toml

@@ -99,7 +99,6 @@ exclude_lines = [
 ]
 
 [tool.pytest.ini_options]
-log_level = "DEBUG"
 asyncio_mode = "strict"
 filterwarnings = [
     "ignore:The object should be created within an async function:DeprecationWarning:aiohttp",

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/contact/roster.py

@@ -95,6 +95,8 @@ class LegacyRoster(
         contact_jid = JID(contact_jid.bare)
         async with self.lock(("username", username)):
             legacy_id = await self.jid_username_to_legacy_id(username)
+            if legacy_id == self.user_legacy_id:
+                raise ContactIsUser
             if self.get_lock(("legacy_id", legacy_id)):
                 self.log.debug("Already updating %s via by_legacy_id()", contact_jid)
                 return await self.by_legacy_id(legacy_id)

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/core/dispatcher/message/message.py

@@ -415,7 +415,9 @@ class MessageContentMixin(DispatcherMixin):
         with self.xmpp.store.session() as orm:
             sticker = self.xmpp.store.bob.get_sticker(orm, cid)
         if sticker is None:
-            await self.xmpp.plugin["xep_0231"].get_bob(from_, cid)
+            await self.xmpp.plugin["xep_0231"].get_bob(
+                from_, cid, ifrom=self.xmpp.boundjid
+            )
             with self.xmpp.store.session() as orm:
                 sticker = self.xmpp.store.bob.get_sticker(orm, cid)
         assert sticker is not None

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/core/dispatcher/presence.py

@@ -3,6 +3,7 @@ import logging
 from slixmpp import JID, Presence
 from slixmpp.exceptions import XMPPError
 
+from ...contact.roster import ContactIsUser
 from ...util.util import merge_resources
 from ..session import BaseSession
 from .util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -142,6 +143,10 @@ class PresenceHandlerMixin(DispatcherMixin):
                 contact = await session.contacts.by_jid(pto)
             except XMPPError:
                 contact = None
+            except ContactIsUser:
+                raise XMPPError(
+                    "bad-request", "Actions with yourself are not supported."
+                )
             if contact is not None:
                 await self.xmpp.pubsub.on_presence_available(p, contact)
                 return

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/core/mixins/avatar.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional
 
 from PIL import UnidentifiedImageError
 from slixmpp import JID
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ...db.avatar import CachedAvatar, avatar_cache
@@ -124,25 +123,14 @@ class AvatarMixin(UpdateInfoMixin):
                 avatar.path.unlink()
 
         stored_avatar = None if cached_avatar is None else cached_avatar.stored
-        self.stored.avatar = stored_avatar
-
-        try:
-            self.commit(merge=True)
-        except IntegrityError as e:
-            with self.xmpp.store.session(expire_on_commit=False) as orm:
-                if orm.object_session(self.stored):
-                    self.log.debug(
-                        "Hit integrity error, attempting to fix by refreshing participants"
-                    )
-                    orm.refresh(self.stored, ["participants"])
-                else:
-                    self.log.debug(
-                        "Hit integrity error, attempting to fix by merging contact.stored"
-                    )
+        if not self._updating_info:
+            with self.xmpp.store.session() as orm:
+                with orm.no_autoflush:
                     self.stored = orm.merge(self.stored)
-                    self.stored.avatar = stored_avatar
-                orm.add(self.stored)
-                orm.commit()
+                    orm.refresh(self.stored)
+
+        self.stored.avatar = stored_avatar
+        self.commit(merge=True)
 
         self._post_avatar_update(cached_avatar)
 

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/core/session.py

@@ -133,8 +133,8 @@ class BaseSession(
         self.log.debug("Removing fut %s", fut)
         self.__tasks.remove(fut)
 
-    def create_task(self, coro) -> asyncio.Task:
-        task = self.xmpp.loop.create_task(coro)
+    def create_task(self, coro, name: str | None = None) -> asyncio.Task:
+        task = self.xmpp.loop.create_task(coro, name=name)
         self.__tasks.add(task)
         self.log.debug("Creating task %s", task)
         task.add_done_callback(lambda _: self.__remove_task(task))

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/group/room.py

@@ -3,6 +3,8 @@ import logging
 import re
 import string
 import warnings
+from asyncio import Lock
+from contextlib import asynccontextmanager
 from copy import copy
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, AsyncIterator, Generic, Optional, Type, Union
@@ -18,7 +20,6 @@ from slixmpp.plugins.xep_0469.stanza import NS as PINNING_NS
 from slixmpp.plugins.xep_0492.stanza import NS as NOTIFY_NS
 from slixmpp.plugins.xep_0492.stanza import WhenLiteral
 from slixmpp.xmlstream import ET
-from sqlalchemy.exc import InvalidRequestError
 from sqlalchemy.orm import Session as OrmSession
 
 from ..contact.contact import LegacyContact
@@ -28,7 +29,6 @@ from ..core.mixins.disco import ChatterDiscoMixin
 from ..core.mixins.recipient import ReactionRecipientMixin, ThreadRecipientMixin
 from ..db.models import Participant, Room
 from ..util.jid_escaping import unescape_node
-from ..util.lock import NamedLockMixin
 from ..util.types import (
     HoleBound,
     LegacyGroupIdType,
@@ -56,7 +56,6 @@ class LegacyMUC(
         LegacyGroupIdType, LegacyMessageType, LegacyParticipantType, LegacyUserIdType
     ],
     AvatarMixin,
-    NamedLockMixin,
     ChatterDiscoMixin,
     ReactionRecipientMixin,
     ThreadRecipientMixin,
@@ -242,10 +241,22 @@ class LegacyMUC(
         )
         self.commit()
 
+    @asynccontextmanager
+    async def lock(self, id_: str) -> AsyncIterator[None]:
+        async with self.session.lock((self.legacy_id, id_)):
+            yield
+
+    def get_lock(self, id_: str) -> Lock | None:
+        return self.session.get_lock((self.legacy_id, id_))
+
     async def __fill_participants(self) -> None:
-        if self.participants_filled:
-            return
         async with self.lock("fill participants"):
+            with self.xmpp.store.session(expire_on_commit=False) as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["participants_filled"])
+            if self.participants_filled:
+                return
             parts: list[Participant] = []
             resources = set[str]()
             # During fill_participants(), self.get_participant*() methods may
@@ -261,17 +272,13 @@ class LegacyMUC(
                 resources.add(participant.stored.resource)
         with self.xmpp.store.session(expire_on_commit=False) as orm:
             orm.add(self.stored)
-            # because self.participants() is async, self.stored  may be out of sync at
-            # this point.
+            # because self.fill_participants() is async, self.stored may be stale at
+            # this point, and the only thing we want to update is the participant list
+            # and the participant_filled attribute.
             with orm.no_autoflush:
                 orm.refresh(self.stored)
-            for part in parts:
-                try:
-                    self.stored.participants.append(part)
-                except InvalidRequestError:
-                    # the participant was already stored in the DB. `part` may even
-                    # be out-of-sync, so it's fine to just ditch it.
-                    pass
+                for part in parts:
+                    orm.merge(part)
             self.stored.participants_filled = True
             orm.commit()
 
@@ -290,10 +297,14 @@ class LegacyMUC(
                 yield self.participant_from_store(db_participant)
 
     async def __fill_history(self) -> None:
-        if self.stored.history_filled:
-            self.log.debug("History has already been fetched.")
-            return
         async with self.lock("fill history"):
+            with self.xmpp.store.session(expire_on_commit=False) as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["history_filled"])
+            if self.stored.history_filled:
+                self.log.debug("History has already been fetched.")
+                return
             log.debug("Fetching history for %s", self)
             try:
                 before, after = self.archive.get_hole_bounds()
@@ -767,16 +778,15 @@ class LegacyMUC(
         """
         await self.session.contacts.ready
 
-        if not self.get_lock("fill participants"):
-            with self.xmpp.store.session() as orm:
-                self.stored = orm.merge(self.stored)
-                stored = (
-                    orm.query(Participant)
-                    .filter_by(contact=c.stored, room=self.stored)
-                    .one_or_none()
-                )
-                if stored is not None:
-                    return self.participant_from_store(stored=stored, contact=c)
+        with self.xmpp.store.session() as orm:
+            self.stored = orm.merge(self.stored)
+            stored = (
+                orm.query(Participant)
+                .filter_by(contact=c.stored, room=self.stored)
+                .one_or_none()
+            )
+            if stored is not None:
+                return self.participant_from_store(stored=stored, contact=c)
 
         nickname = c.name or unescape_node(c.jid.node)
 

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/main.py

@@ -166,10 +166,12 @@ def main(module_name: str | None = None) -> None:
             f"_{config.LEGACY_MODULE.split('.')[-1].upper()}_"
         )
         logging.debug("Env var prefix: %s", ConfigModule.ENV_VAR_PREFIX)
-        ConfigModule(plugin_config_obj).set_conf(unknown_argv)
-    else:
-        if unknown_argv:
-            raise RuntimeError("Some arguments have not been recognized", unknown_argv)
+        _, unknown_argv = ConfigModule(plugin_config_obj).set_conf(unknown_argv)
+
+    if unknown_argv:
+        logging.error(
+            f"These config options have not been recognized and ignored: {unknown_argv}"
+        )
 
     migrate()
 

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge/util/conf.py

@@ -159,7 +159,10 @@ class ConfigModule:
                     upper = _argv_to_option_name(a)
                     opt = options_long.get(upper)
                     if opt and opt.type is bool:
-                        if _argv_to_option_name(aa) not in options_long:
+                        if (
+                            not aa.startswith("-")
+                            and _argv_to_option_name(aa) not in options_long
+                        ):
                             log.debug("Removing %s from argv", aa)
                             skip_next = True
 

{slidge-0.3.0b1 → slidge-0.3.0b2}/slidge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b1
+Version: 0.3.0b2
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0b1 → slidge-0.3.0b2}/tests/test_config.py

@@ -272,3 +272,15 @@ def test_rest(tmp_path):
 
     assert Config1.PROUT == "caca"
     assert Config2.PROUT2 == "something"
+
+
+def test_unrecognized_after_boolean():
+    class Config:
+        PROUT = True
+        PROUT__DOC = "?"
+
+
+    configurator = ConfigModule(Config)
+    ns, rest = configurator.set_conf(["--prout", "--joujoujou"])
+    assert Config.PROUT
+    assert rest == ["--joujoujou"]

{slidge-0.3.0b1 → slidge-0.3.0b2}/tests/test_session.py

@@ -328,10 +328,11 @@ class TestSession(AvatarFixtureMixin, SlidgeTest):
             """
         self.recv(sticker_stanza)
         self.send(  # language=XML
-            """
+            f"""
             <iq id="2"
                 type="get"
-                to="romeo@montague.lit/movim">
+                to="romeo@montague.lit/movim"
+                from="{self.xmpp.boundjid.bare}">
               <data xmlns="urn:xmpp:bob"
                     cid="sha1+4b97ce7f0f06a0e05999f3c719cd5b4f3da992a7@bob.xmpp.org" />
             </iq>

{slidge-0.3.0b1 → slidge-0.3.0b2}/tests/test_session_2.py

@@ -43,7 +43,10 @@ class Contact(LegacyContact):
 
 class MUC(LegacyMUC):
     async def update_info(self):
-        if self.legacy_id in ("room-noinfo", "room-duplicate-participant"):
+        if self.legacy_id in ("room-noinfo", "room-duplicate-participant", "room-avatar-slow", "room-contact-conflict"):
+            return
+        if self.legacy_id == "room-avatar-in-slow-task":
+            self.session.create_task(self._slow_set_avatar(), "slow-avatar")
             return
         self.name = "Cool name"
         self.description = "Cool description"
@@ -68,6 +71,12 @@ class MUC(LegacyMUC):
         if "duplicate-participant" in self.legacy_id:
             yield await self.get_participant_by_legacy_id("duplicate")
             yield await self.get_participant_by_legacy_id("duplicate")
+        if "contact-conflict" in self.legacy_id:
+            yield await self.get_participant_by_legacy_id("contact-conflict")
+
+    async def _slow_set_avatar(self):
+        await asyncio.sleep(1)
+        await self.set_avatar("AVATAR_URL")
 
 class Bookmarks(LegacyBookmarks):
     async def fill(self):
@@ -376,3 +385,120 @@ class TestSession2(AvatarFixtureMixin, SlidgeTest):
         )
         assert self.next_sent().get_from().resource == "duplicate"
         assert self.next_sent().get_from().resource == muc.user_nick
+
+    def test_presence_to_user_account(self):
+        self.romeo_session.contacts.user_legacy_id = "user-id"
+        self.recv(  # language=XML
+            """
+            <presence from="romeo@montague.lit/movim"
+                      to="user-id@aim.shakespeare.lit" />
+            """
+        )
+        self.send(  # language=XML
+            """
+            <presence from="user-id@aim.shakespeare.lit"
+                      to="romeo@montague.lit/movim"
+                      type="error">
+              <error type="modify">
+                <bad-request xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
+                <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Actions with yourself are not supported.</text>
+              </error>
+            </presence>
+            """
+        )
+
+    def test_slow_avatar_in_task(self):
+        muc: LegacyMUC = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-in-slow-task")
+        )
+        assert not muc.participants_filled
+        assert self.next_sent() is None
+        muc: LegacyMUC = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-in-slow-task")
+        )
+        assert not muc.participants_filled
+        assert self.next_sent() is None
+        self.recv(  # language=XML
+            f"""
+            <presence from="romeo@montague.lit/movim"
+                      to="{muc.jid}/nick">
+              <x xmlns='http://jabber.org/protocol/muc' />
+            </presence>
+            """
+        )
+        self.next_sent()
+        muc = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-in-slow-task")
+        )
+        assert muc.participants_filled
+        for task in self.romeo_session._BaseSession__tasks:
+            task: asyncio.Task
+            if task.get_name() == "slow-avatar":
+                self.run_coro(asyncio.wait_for(task, 2))
+                break
+        else:
+            assert False
+        muc = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-in-slow-task")
+        )
+        assert muc.participants_filled
+
+    def test_slow_avatar(self):
+        muc: LegacyMUC = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-slow")
+        )
+        assert not muc.participants_filled
+        assert self.next_sent() is None
+        muc: LegacyMUC = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-slow")
+        )
+        muc.avatar = "SLOW"
+        assert not muc.participants_filled
+        assert self.next_sent() is None
+        self.recv(  # language=XML
+            f"""
+            <presence from="romeo@montague.lit/movim"
+                      to="{muc.jid}/nick">
+              <x xmlns='http://jabber.org/protocol/muc' />
+            </presence>
+            """
+        )
+        self.next_sent()
+        muc2 = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-slow")
+        )
+        assert muc2.participants_filled
+
+        self.run_coro(asyncio.wait_for(muc._set_avatar_task, 2))
+        muc = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-avatar-slow")
+        )
+        assert muc.participants_filled
+
+    def test_live_message_then_fill_participants(self):
+        muc: LegacyMUC = self.run_coro(
+            self.romeo_session.bookmarks.by_legacy_id("room-contact-conflict")
+        )
+        part = self.run_coro(muc.get_participant_by_legacy_id("contact-conflict"))
+        part.send_text("some text")
+        self.recv(  # language=XML
+            f"""
+            <presence from="romeo@montague.lit/movim"
+                      to="{muc.jid}/nick">
+              <x xmlns='http://jabber.org/protocol/muc' />
+            </presence>
+            """
+        )
+        self.send(  # language=XML
+            """
+            <presence from="room-contact-conflict@aim.shakespeare.lit/contact-conflict"
+                      to="romeo@montague.lit/movim">
+              <x xmlns="http://jabber.org/protocol/muc#user">
+                <item affiliation="member"
+                      role="participant" />
+              </x>
+              <occupant-id xmlns="urn:xmpp:occupant-id:0"
+                           id="contact-conflict@aim.shakespeare.lit/slidge" />
+            </presence>
+            """
+        )