slidge 0.2.5__tar.gz → 0.2.7__tar.gz

{slidge-0.2.5 → slidge-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.5
+Version: 0.2.7
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,16 +676,15 @@ Classifier: Topic :: Internet :: XMPP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiohttp[speedups]>=3.11.11
-Requires-Dist: alembic>=1.14.0
-Requires-Dist: configargparse>=1.7
+Requires-Dist: aiohttp[speedups]<4,>=3.11.11
+Requires-Dist: alembic<2,>=1.14.0
+Requires-Dist: configargparse<2,>=1.7
 Requires-Dist: defusedxml>=0.7.1
-Requires-Dist: pickle-secure>=0.99.9
-Requires-Dist: pillow>=11.0.0
-Requires-Dist: python-magic>=0.4.27
-Requires-Dist: qrcode>=8.0
-Requires-Dist: slixmpp>=1.8.6
-Requires-Dist: sqlalchemy>=2.0.36
+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.8.6
+Requires-Dist: sqlalchemy<3,>=2
 Requires-Dist: thumbhash>=0.1.2
 
 ![Slidge logo](https://codeberg.org/slidge/slidge/raw/branch/main/dev/assets/slidge-color-small.png)

{slidge-0.2.5 → slidge-0.2.7}/commitlint.config.js

@@ -22,6 +22,7 @@ const Configuration = {
           'test',
           'compat',  // workaround to play nice with non-compliant clients or servers; ideally reverted once fixed upstream
           'cfix', // fixes an unreleased commit, should not appear in changelog
+          'imprv',  // improvement of an existing feature
         ]
       ],
   },

{slidge-0.2.5 → slidge-0.2.7}/pyproject.toml

@@ -3,16 +3,15 @@ name = "slidge"
 description = "XMPP bridging framework"
 requires-python = ">= 3.11"
 dependencies = [
-    "aiohttp[speedups]>=3.11.11",
-    "alembic>=1.14.0",
-    "configargparse>=1.7",
+    "aiohttp[speedups]>=3.11.11,<4",
+    "alembic>=1.14.0,<2",
+    "configargparse>=1.7,<2",
     "defusedxml>=0.7.1",
-    "pickle-secure>=0.99.9",
-    "pillow>=11.0.0",
-    "python-magic>=0.4.27",
-    "qrcode>=8.0",
-    "slixmpp>=1.8.6",
-    "sqlalchemy>=2.0.36",
+    "pillow>=11.0.0,<12",
+    "python-magic>=0.4.27,<0.5",
+    "qrcode>=8.0,<9",
+    "slixmpp>=1.8.6,<2",
+    "sqlalchemy>=2,<3",
     "thumbhash>=0.1.2",
 ]
 authors = [
@@ -24,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["xmpp", "gateway", "bridge", "instant messaging"]
-version = "v0.2.5"
+version = "v0.2.7"
 readme = "README.md"
 
 [build-system]
@@ -149,20 +148,21 @@ conventional_commits = true
 filter_unconventional = false
 commit_parsers = [
   { message = "^feat", group = "<!-- 0 -->🚀 Features" },
-  { message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
-  { message = "^compat", group = "<!-- 2 -->💑 Compatibility" },
-  { message = "^refactor", group = "<!-- 3 -->🚜 Refactor" },
-  { message = "^doc", group = "<!-- 4 -->📚 Documentation" },
-  { message = "^perf", group = "<!-- 5 -->⚡ Performance" },
-  { message = "^style", group = "<!-- 6 -->🎨 Styling" },
-  { message = "^test", group = "<!-- 7 -->🧪 Testing" },
+  { message = "^imprv", group = "<!-- 1 -->✨ Improvements" },
+  { message = "^fix", group = "<!-- 2 -->🐛 Bug Fixes" },
+  { message = "^compat", group = "<!-- 3 -->💑 Compatibility" },
+  { message = "^refactor", group = "<!-- 4 -->🚜 Refactor" },
+  { message = "^doc", group = "<!-- 5 -->📚 Documentation" },
+  { message = "^perf", group = "<!-- 6 -->⚡ Performance" },
+  { message = "^style", group = "<!-- 7 -->🎨 Styling" },
+  { message = "^test", group = "<!-- 8 -->🧪 Testing" },
   { message = "^chore\\(release\\): prepare for", skip = true },
   { message = "^chore\\(deps.*\\)", skip = true },
   { message = "^chore\\(pr\\)", skip = true },
   { message = "^chore\\(pull\\)", skip = true },
   { message = "^cfix", skip = true },
-  { message = "^chore|^ci", group = "<!-- 8 -->⚙️ Miscellaneous Tasks" },
-  { body = ".*security", group = "<!-- 9 -->🛡️ Security" },
-  { message = "^revert", group = "<!-- 10 -->◀️ Revert" },
-  { message = ".*", group = "<!-- 11 -->💼 Other" },
+  { message = "^chore|^ci", group = "<!-- 9 -->⚙️ Miscellaneous Tasks" },
+  { body = ".*security", group = "<!-- 10 -->🛡️ Security" },
+  { message = "^revert", group = "<!-- 11 -->◀️ Revert" },
+  { message = ".*", group = "<!-- 12 -->💼 Other" },
 ]

{slidge-0.2.5 → slidge-0.2.7}/slidge/__version__.py

@@ -2,4 +2,4 @@ from slidge.util.util import get_version  # noqa: F401
 
 # this is modified before publish, but if someone cloned from the repo,
 # it can help
-__version__ = "v0.2.5"
+__version__ = "v0.2.7"

{slidge-0.2.5 → slidge-0.2.7}/slidge/command/adhoc.py

@@ -235,18 +235,29 @@ class AdhocProvider:
         """
         Get items for a disco query
 
-        :param jid: who is requesting the disco
+        :param jid: the entity that should return its items
         :param node: which command node is requested
         :param iq:  the disco query IQ
         :return: commands accessible to the given JID will be listed
         """
+        ifrom = iq.get_from()
+        ifrom_str = str(ifrom)
+        if (
+            not self.xmpp.jid_validator.match(ifrom_str)
+            and ifrom_str not in config.ADMINS
+        ):
+            raise XMPPError(
+                "forbidden",
+                "You are not authorized to execute adhoc commands on this gateway. "
+                "If this is unexpected, ask your administrator to verify that "
+                "'user-jid-validator' is correctly set in slidge's configuration.",
+            )
+
         all_items = self.xmpp.plugin["xep_0030"].static.get_items(jid, node, None, None)
         log.debug("Static items: %r", all_items)
         if not all_items:
             return DiscoItems()
 
-        ifrom = iq.get_from()
-
         filtered_items = DiscoItems()
         filtered_items["node"] = self.xmpp.plugin["xep_0050"].stanza.Command.namespace
         for item in all_items:

{slidge-0.2.5 → slidge-0.2.7}/slidge/command/user.py

@@ -172,6 +172,9 @@ class Login(Command):
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_):
         assert session is not None
+        if session.is_logging_in:
+            raise XMPPError("bad-request", "You are already logging in.")
+        session.is_logging_in = True
         try:
             msg = await session.login()
         except Exception as e:
@@ -179,6 +182,8 @@ class Login(Command):
             raise XMPPError(
                 "internal-server-error", etype="wait", text=f"Could not login: {e}"
             )
+        finally:
+            session.is_logging_in = False
         session.logged = True
         session.send_gateway_status(msg or "Re-connected", show="chat")
         session.send_gateway_message(msg or "Re-connected")

{slidge-0.2.5 → slidge-0.2.7}/slidge/contact/contact.py

@@ -448,7 +448,7 @@ class LegacyContact(
             log.debug("Roster push request by plugin ignored (--no-roster-push)")
             return
         try:
-            await self._set_roster(
+            await self.xmpp["xep_0356"].set_roster(
                 jid=self.user_jid, roster_items=self.get_roster_item()
             )
         except PermissionError:
@@ -490,12 +490,6 @@ class LegacyContact(
                 nick,
             )
 
-    async def _set_roster(self, **kw):
-        try:
-            await self.xmpp["xep_0356"].set_roster(**kw)
-        except PermissionError:
-            await self.xmpp["xep_0356_old"].set_roster(**kw)
-
     def send_friend_request(self, text: Optional[str] = None):
         presence = self._make_presence(ptype="subscribe", pstatus=text, bare=True)
         self._send(presence, nick=True)

{slidge-0.2.5 → slidge-0.2.7}/slidge/core/config.py

@@ -68,7 +68,6 @@ USER_JID_VALIDATOR__DYNAMIC_DEFAULT = True
 ADMINS: tuple[JIDType, ...] = ()
 ADMINS__DOC = "JIDs of the gateway admins"
 
-
 UPLOAD_SERVICE: Optional[str] = None
 UPLOAD_SERVICE__DOC = (
     "JID of an HTTP upload service the gateway can use. "
@@ -76,9 +75,6 @@ UPLOAD_SERVICE__DOC = (
     "discovery."
 )
 
-SECRET_KEY: Optional[str] = None
-SECRET_KEY__DOC = "Encryption for disk storage. Deprecated."
-
 NO_ROSTER_PUSH = False
 NO_ROSTER_PUSH__DOC = "Do not fill users' rosters with legacy contacts automatically"
 

{slidge-0.2.5 → slidge-0.2.7}/slidge/core/gateway.py

@@ -515,6 +515,7 @@ class BaseGateway(
     @timeit
     async def login_wrap(self, session: "BaseSession"):
         session.send_gateway_status("Logging in…", show="dnd")
+        session.is_logging_in = True
         try:
             status = await session.login()
         except Exception as e:
@@ -808,7 +809,9 @@ class BaseGateway(
 
     async def unregister_user(self, user: GatewayUser):
         self.send_presence(
-            pshow="busy", pstatus="You are not registered to this gateway anymore."
+            pshow="dnd",
+            pstatus="You unregistered from this gateway.",
+            pto=user.jid,
         )
         await self.xmpp.plugin["xep_0077"].api["user_remove"](None, None, user.jid)
         await self.xmpp.session_cls.kill_by_jid(user.jid)
@@ -913,7 +916,6 @@ SLIXMPP_PLUGINS = [
     "xep_0333",  # Chat markers
     "xep_0334",  # Message Processing Hints
     "xep_0356",  # Privileged Entity
-    "xep_0356_old",  # Privileged Entity (old namespace)
     "xep_0363",  # HTTP file upload
     "xep_0385",  # Stateless in-line media sharing
     "xep_0402",  # PEP Native Bookmarks

{slidge-0.2.5 → slidge-0.2.7}/slidge/core/mixins/message.py

@@ -177,15 +177,12 @@ class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
         try:
             self.xmpp["xep_0356"].send_privileged_message(msg)
         except PermissionError:
-            try:
-                self.xmpp["xep_0356_old"].send_privileged_message(msg)
-            except PermissionError:
-                warnings.warn(
-                    "Slidge does not have privileges to send message on behalf of"
-                    " user.Refer to"
-                    " https://slidge.im/docs/slidge/main/admin/privilege.html"
-                    " for more info."
-                )
+            warnings.warn(
+                "Slidge does not have privileges to send message on behalf of"
+                " user.Refer to"
+                " https://slidge.im/docs/slidge/main/admin/privilege.html"
+                " for more info."
+            )
 
 
 class InviteMixin(MessageMaker):

{slidge-0.2.5 → slidge-0.2.7}/slidge/core/session.py

@@ -33,7 +33,7 @@ from ..util.types import (
     ResourceDict,
     Sticker,
 )
-from ..util.util import deprecated
+from ..util.util import deprecated, noop_coro
 
 if TYPE_CHECKING:
     from ..group.participant import LegacyParticipant
@@ -98,6 +98,7 @@ class BaseSession(
         self.ignore_messages = set[str]()
 
         self.contacts: LegacyRoster = LegacyRoster.get_self_or_unique_subclass()(self)
+        self.is_logging_in = False
         self._logged = False
         self.__reset_ready()
 
@@ -527,11 +528,13 @@ class BaseSession(
 
     @logged.setter
     def logged(self, v: bool):
+        self.is_logging_in = False
         self._logged = v
         if self.ready.done():
             if v:
                 return
             self.__reset_ready()
+            self.shutdown(logout=False)
         else:
             if v:
                 self.ready.set_result(True)
@@ -539,12 +542,15 @@ class BaseSession(
     def __repr__(self):
         return f"<Session of {self.user_jid}>"
 
-    def shutdown(self) -> asyncio.Task:
+    def shutdown(self, logout=True) -> asyncio.Task:
         for c in self.contacts:
             c.offline()
         for m in self.bookmarks:
             m.shutdown()
-        return self.xmpp.loop.create_task(self.logout())
+        if logout:
+            return self.xmpp.loop.create_task(self.logout())
+        else:
+            return self.xmpp.loop.create_task(noop_coro())
 
     @staticmethod
     def legacy_to_xmpp_msg_id(legacy_msg_id: LegacyMessageType) -> str:
@@ -657,6 +663,8 @@ class BaseSession(
             return
         for c in session.contacts:
             c.unsubscribe()
+        for m in session.bookmarks:
+            m.shutdown()
         user = cls.xmpp.store.users.get(jid)
         if user is None:
             log.warning("User not found during unregistration")

slidge-0.2.7/slidge/db/alembic/versions/04cf35e3cf85_add_participant_nickname_no_illegal.py

@@ -0,0 +1,33 @@
+"""Add Participant.nickname_no_illegal
+
+Revision ID: 04cf35e3cf85
+Revises: 15b0bd83407a
+Create Date: 2025-02-22 06:57:45.491326
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "04cf35e3cf85"
+down_revision: Union[str, None] = "15b0bd83407a"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("participant", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("nickname_no_illegal", sa.String(), nullable=True)
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("participant", schema=None) as batch_op:
+        batch_op.drop_column("nickname_no_illegal")

{slidge-0.2.5 → slidge-0.2.7}/slidge/db/alembic/versions/aa9d82a7f6ef_db_creation.py

@@ -8,8 +8,6 @@ Create Date: 2024-04-17 20:57:01.357041
 
 """
 
-import logging
-from datetime import datetime
 from typing import Sequence, Union
 
 import sqlalchemy as sa
@@ -44,58 +42,9 @@ def upgrade() -> None:
         sa.UniqueConstraint("jid"),
     )
     # ### end Alembic commands ###
-    try:
-        migrate_from_shelf(accounts)
-    except Exception:
-        downgrade()
-        raise
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table("user_account")
     # ### end Alembic commands ###
-
-
-def migrate_from_shelf(accounts: sa.Table) -> None:
-    from slidge import global_config
-
-    home = getattr(global_config, "HOME_DIR", None)
-    if home is None:
-        return
-
-    db_file = home / "slidge.db"
-    if not db_file.exists():
-        return
-
-    try:
-        from slidge.db.alembic.old_user_store import user_store
-    except ImportError:
-        return
-
-    user_store.set_file(db_file, global_config.SECRET_KEY)
-
-    try:
-        users = list(user_store.get_all())
-    except AttributeError:
-        return
-    logging.info("Migrating %s users from the deprecated user_store shelf", len(users))
-    op.bulk_insert(
-        accounts,
-        [
-            {
-                "jid": user.jid,
-                "registration_date": (
-                    user.registration_date
-                    if user.registration_date is not None
-                    else datetime.now()
-                ),
-                "legacy_module_data": user.registration_form,
-                "preferences": {},
-            }
-            for user in users
-        ],
-    )
-
-    user_store.close()
-    db_file.unlink()

{slidge-0.2.5 → slidge-0.2.7}/slidge/db/models.py

@@ -388,6 +388,7 @@ class Participant(Base):
 
     resource: Mapped[Optional[str]] = mapped_column(default=None)
     nickname: Mapped[str] = mapped_column(nullable=True, default=None)
+    nickname_no_illegal: Mapped[str] = mapped_column(nullable=True, default=None)
 
     hats: Mapped[list["Hat"]] = relationship(
         secondary=participant_hats, back_populates="participants"

{slidge-0.2.5 → slidge-0.2.7}/slidge/db/store.py

@@ -698,6 +698,8 @@ class MultiStore(EngineMixin):
             ).scalar()
             if multi is None:
                 return []
+            if multi.legacy_ids_multi is None:
+                return []
             return [m.xmpp_id for m in multi.legacy_ids_multi.xmpp_ids]
 
     def set_xmpp_ids(
@@ -1072,6 +1074,7 @@ class ParticipantStore(EngineMixin):
                 .where(Participant.id == participant.pk)
                 .values(
                     resource=participant.jid.resource,
+                    nickname_no_illegal=participant._nickname_no_illegal,
                     affiliation=participant.affiliation,
                     role=participant.role,
                     presence_sent=participant._presence_sent,  # type:ignore

{slidge-0.2.5 → slidge-0.2.7}/slidge/group/participant.py

@@ -71,6 +71,7 @@ class LegacyParticipant(
         role: MucRole = "participant",
         affiliation: MucAffiliation = "member",
         resource: str | None = None,
+        nickname_no_illegal: str | None = None,
     ):
         self.session = session = muc.session
         self.xmpp = session.xmpp
@@ -87,7 +88,8 @@ class LegacyParticipant(
         if resource is None:
             self.__update_jid(nickname)
         else:
-            self._nickname_no_illegal = resource
+            assert nickname_no_illegal is not None
+            self._nickname_no_illegal = nickname_no_illegal
             self.jid = JID(self.muc.jid)
             self.jid.resource = resource
 
@@ -518,6 +520,7 @@ class LegacyParticipant(
             role=stored.role,
             affiliation=stored.affiliation,
             resource=stored.resource,
+            nickname_no_illegal=stored.nickname_no_illegal,
         )
         part.pk = stored.id
         if contact is not None: