Bind 2 stream management

Author: sonnyp

Makefile

@@ -34,10 +34,9 @@ e2e:
 	$(warning e2e tests require prosody-trunk and luarocks)
 	cd server && prosodyctl --config prosody.cfg.lua install mod_sasl2 > /dev/null
 	cd server && prosodyctl --config prosody.cfg.lua install mod_sasl2_bind2 > /dev/null
-
+	cd server && prosodyctl --config prosody.cfg.lua install mod_sasl2_sm > /dev/null
 # https://github.com/xmppjs/xmpp.js/pull/1006
 # cd server && prosodyctl --config prosody.cfg.lua install mod_sasl2_fast > /dev/null
-# cd server && prosodyctl --config prosody.cfg.lua install mod_sasl2_sm > /dev/null
 	npm run e2e
 
 clean:

packages/client-core/src/bind2/bind2.js

@@ -2,16 +2,56 @@ import xml from "@xmpp/xml";
 
 const NS_BIND = "urn:xmpp:bind:0";
 
-export default function bind2({ sasl2 }, tag) {
-  sasl2.use(NS_BIND, async (element) => {
-    if (!element.is("bind", NS_BIND)) return;
-
-    tag = typeof tag === "function" ? await tag() : tag;
-
-    return xml(
-      "bind",
-      { xmlns: "urn:xmpp:bind:0" },
-      tag && xml("tag", null, tag),
-    );
-  });
+export default function bind2({ sasl2, entity }, tag) {
+  const features = new Map();
+
+  sasl2.use(
+    NS_BIND,
+    async (element) => {
+      if (!element.is("bind", NS_BIND)) return;
+
+      tag = typeof tag === "function" ? await tag() : tag;
+
+      const sessionFeatures = await getSessionFeatures({ element, features });
+
+      return xml(
+        "bind",
+        { xmlns: "urn:xmpp:bind:0" },
+        tag && xml("tag", null, tag),
+        ...sessionFeatures,
+      );
+    },
+    (element) => {
+      const aid = element.root().getChildText("authorization-identifier");
+      if (aid) entity._jid(aid);
+
+      for (const child of element.getChildElements()) {
+        const feature = features.get(child.getNS());
+        if (!feature?.[1]) continue;
+        feature?.[1](child);
+      }
+    },
+  );
+
+  return {
+    use(ns, req, res) {
+      features.set(ns, [req, res]);
+    },
+  };
+}
+
+function getSessionFeatures({ element, features }) {
+  const promises = [];
+
+  const inline = element.getChild("inline");
+  if (!inline) return promises;
+
+  for (const element of inline.getChildElements()) {
+    const xmlns = element.attrs.var;
+    const feature = features.get(xmlns);
+    if (!feature) continue;
+    promises.push(feature[0](element));
+  }
+
+  return Promise.all(promises);
 }

packages/client/example.js

@@ -34,6 +34,7 @@ xmpp.on("stanza", async (stanza) => {
 xmpp.on("online", async (address) => {
   console.log("online as", address.toString());
 
+  // return;
   // Makes itself available
   await xmpp.send(xml("presence"));
 

packages/client/index.js

@@ -60,6 +60,11 @@ function client(options = {}) {
     { streamFeatures, saslFactory },
     createOnAuthenticate(credentials ?? { username, password }, userAgent),
   );
+
+  // SASL2 inline features
+  const bind2 = _bind2({ sasl2, entity }, resource);
+
+  // Stream features - order matters and define priority
   const sasl = _sasl(
     { streamFeatures, saslFactory },
     createOnAuthenticate(credentials ?? { username, password }, userAgent),
@@ -68,6 +73,8 @@ function client(options = {}) {
     streamFeatures,
     entity,
     middleware,
+    bind2,
+    sasl2,
   });
   const resourceBinding = _resourceBinding(
     { iqCaller, streamFeatures },
@@ -78,9 +85,6 @@ function client(options = {}) {
     streamFeatures,
   });
 
-  // SASL2 inline features
-  const bind2 = _bind2({ sasl2 }, resource);
-
   return Object.assign(entity, {
     entity,
     reconnect,

packages/sasl2/index.js

@@ -1,6 +1,5 @@
 import { encode, decode } from "@xmpp/base64";
 import SASLError from "@xmpp/sasl/lib/SASLError.js";
-import jid from "@xmpp/jid";
 import xml from "@xmpp/xml";
 
 // https://xmpp.org/extensions/xep-0388.html
@@ -17,7 +16,8 @@ async function authenticate({
   mechanism,
   credentials,
   userAgent,
-  sessionFeatures,
+  streamFeatures,
+  features,
 }) {
   const mech = saslFactory.create([mechanism]);
   if (!mech) {
@@ -38,7 +38,7 @@ async function authenticate({
 
   return new Promise((resolve, reject) => {
     const handler = (element) => {
-      if (element.attrs.xmlns !== NS) {
+      if (element.getNS() !== NS) {
         return;
       }
 
@@ -61,7 +61,6 @@ async function authenticate({
       }
 
       if (element.name === "continue") {
-        // No tasks supported yet
         reject(new Error("continue is not supported yet"));
         return;
       }
@@ -71,19 +70,14 @@ async function authenticate({
         if (additionalData && mech.final) {
           mech.final(decode(additionalData));
         }
-        // This jid will be bare unless we do inline bind2 then it will be the bound full jid
-        const aid = element.getChild("authorization-identifier")?.text();
-        if (aid) {
-          if (!entity.jid?.resource) {
-            // No jid or bare jid, so update it
-            entity._jid(aid);
-          } else if (jid(aid).resource) {
-            // We have a full jid so use it
-            entity._jid(aid);
-          }
+
+        for (const child of element.getChildElements()) {
+          const feature = features.get(child.getNS());
+          if (!feature?.[1]) continue;
+          feature?.[1](child);
         }
+
         resolve(element);
-        return;
       }
 
       entity.removeListener("nonza", handler);
@@ -97,15 +91,14 @@ async function authenticate({
           mech.clientFirst &&
             xml("initial-response", {}, encode(mech.response(creds))),
           userAgent,
-          ...sessionFeatures,
+          ...streamFeatures,
         ]),
       )
       .catch(reject);
   });
 }
 
 export default function sasl2({ streamFeatures, saslFactory }, onAuthenticate) {
-  // inline
   const features = new Map();
 
   streamFeatures.use(
@@ -120,7 +113,7 @@ export default function sasl2({ streamFeatures, saslFactory }, onAuthenticate) {
         throw new SASLError("SASL: No compatible mechanism available.");
       }
 
-      const sessionFeatures = await getSessionFeatures({ element, features });
+      const streamFeatures = await getStreamFeatures({ element, features });
 
       async function done(credentials, mechanism, userAgent) {
         await authenticate({
@@ -129,7 +122,8 @@ export default function sasl2({ streamFeatures, saslFactory }, onAuthenticate) {
           mechanism,
           credentials,
           userAgent,
-          sessionFeatures,
+          streamFeatures,
+          features,
         });
       }
 
@@ -141,12 +135,12 @@ export default function sasl2({ streamFeatures, saslFactory }, onAuthenticate) {
 
   return {
     use(ns, req, res) {
-      features.set(ns, req, res);
+      features.set(ns, [req, res]);
     },
   };
 }
 
-function getSessionFeatures({ element, features }) {
+function getStreamFeatures({ element, features }) {
   const promises = [];
 
   const inline = element.getChild("inline");
@@ -156,7 +150,7 @@ function getSessionFeatures({ element, features }) {
     const xmlns = element.getNS();
     const feature = features.get(xmlns);
     if (!feature) continue;
-    promises.push(feature(element));
+    promises.push(feature[0](element));
   }
 
   return Promise.all(promises);

packages/stream-management/README.md

@@ -11,3 +11,7 @@ However `entity.status` is set to `online`.
 If the session fails to resume, entity will fallback to regular session establishment in which case `online` event will be emitted.
 
 Automatically responds to acks but does not support requesting acks yet.
+
+## References
+
+[XEP-0198: Stream Management](https://xmpp.org/extensions/xep-0198.html#inline-enable)