Stop vendoring prosody modules

xmppjs · Dec 21, 2024 · 441efe0 · 441efe0
1 parent 21bb7cb
commit 441efe0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 703 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -26,9 +26,13 @@ jobs:
         run: |
           echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/prosody.list
           sudo wget https://prosody.im/files/prosody-debian-packages.key -O/etc/apt/trusted.gpg.d/prosody.gpg
-          sudo apt-get update
-          sudo apt-get -y install lua5.3 prosody-trunk lua-bitop lua-sec
+          sudo apt update
+          sudo apt install lua5.4 prosody-trunk lua-bitop lua-sec luarocks
           sudo service prosody stop
+          prosodyctl --config server/prosody.cfg.lua install mod_sasl2
+          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_bind2
+          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_fast
+          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_sm
 
       # - run: npm install -g npm
       - run: make

diff --git a/packages/sasl2/test.js b/packages/sasl2/test.js
@@ -195,7 +195,12 @@ test("with bind2", async () => {
     </authenticate>,
   );
 
-  entity.mockInput(<success xmlns="urn:xmpp:sasl:2" />);
+  entity.mockInput(
+    <success xmlns="urn:xmpp:sasl:2">
+      <authorization-identity>{entity.jid}</authorization-identity>
+      <bound xmlns="urn:xmpp:bind:0" />
+    </success>,
+  );
   entity.mockInput(<features xmlns="http://etherx.jabber.org/streams" />);
 
   await promise(entity, "online");

diff --git a/server/modules/.gitkeep b/server/modules/.gitkeep
diff --git a/server/modules/mod_sasl2.lua b/server/modules/mod_sasl2.lua
diff --git a/server/modules/mod_sasl2_bind2.lua b/server/modules/mod_sasl2_bind2.lua