Update protoxep to include generic SASL2 upgrade tasks

This part was split-out from XEP-0388 and moved to this XEP.

inbox/xep-scram-upgrade.xml

@@ -6,8 +6,8 @@
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
-  <title>SCRAM Upgrade Tasks</title>
+  <title>SASL Upgrade Tasks</title>
-  <abstract>This specification provides a way to upgrade to newer SCRAM hash algorithms using a SASL2 upgrade task.</abstract>
+  <abstract>This specification provides a way to upgrade to newer SASL mechanisms using SASL2 tasks.</abstract>
   &LEGALNOTICE;
   <number>xxxx</number>
   <status>ProtoXEP</status>
@@ -23,6 +23,12 @@
   <supersededby/>
   <shortname>sut</shortname>
   &tmolitor;
+  <revision>
+    <version>0.0.2</version>
+    <date>2022-12-30</date>
+    <initials>tm</initials>
+    <remark>Move SASL upgrade tasks from XEP-0388.</remark>
+  </revision>
   <revision>
     <version>0.0.1</version>
     <date>2022-10-19</date>
@@ -31,19 +37,214 @@
   </revision>
 </header>
 <section1 topic='Introduction' anchor='intro'>
-  <p>&xep0388; section 3 defines a way to upgrade to newer SASL mechanisms by providing the server with the needed data for that mechanism using upgrade tasks.</p>
+  <p>While &xep0388; provides a modern and extensible way to use SASL in XMPP, it lacks support for SASL mechanism upgrades.</p>
-  <p>This specification uses those &xep0388; upgrade tasks to upgrade to newer SCRAM mechanisms using hash methods, which the server does not yet have the required data for.</p>
+  <p>Modern XMPP server deployments typically store only the hash of a user's password, to improve account security. At times, it may be desirable for servers to upgrade to newer or different hash algorithms, e.g. so they can offer different authentication mechanisms for improved security or interoperability. Due to the security properties of one-way cryptographic hash algorithms, it is not possible for the server to extract the original data and simply hash it in a new format. To perform such upgrades, the cooperation of the client is necessary - because it has, or can obtain from the user, the original password to derive a hash from.</p>
-</section1>
+  <p>This specification fills that gap by providing a pluggable way to perform such SASL mechanism upgrades using &xep0388; tasks to provide the server with the needed data it does not yet have.</p>
-
+  <p>This specification also provides a concrete definition of SCRAM upgrade tasks in <link url="#scram">Section 3</link>.</p>
-<section1 topic='Requirements' anchor='reqs'>
-  <p>This protocol was designed to allow the client to upgrade to newer SCRAM mechanisms.</p>
 </section1>
 
 <section1 topic="Protocol" anchor="protocol">
+  <p>Clients capable of SASL mechanism upgrades defined herein MUST send the desired bare JID they want to authenticate for in the "from" attribute of the stream-header unless they don't know it (e.g. when using the GSS-API SASL mechanism etc.) according to section 4.7.1 of &rfc6120;. Providing the bare JID in the "from" attribute, rather than introducing additional nonzas, saves one round-trip, see &xep0388;.</p>
+  <section2 topic="Server advertising possible upgrade tasks" anchor="disco">
+    <p>To inform the client which SASL mechanism upgrades it supports, the server adds &lt;upgrade/> elements in the namespace "urn:xmpp:sasl:upgrade:0", each containing the name of one upgrade task, to the SASL2 &lt;authentication/> element inside the stream features.</p>
+    <p>Upgrade task names SHOULD have a prefix of "UPGR-" (to distinguish them from "normal" SASL mechanisms) followed by the SASL mechanism name to upgrade to, and if multiple mechanisms differ only in their support for channel-binding (e.g. SCRAM's -PLUS variants), implementations MUST use only the names of variants without channel-binding for the task names, because mechanism upgrades are independent of any channel-binding. Finally, upgrade tasks MUST NOT transmit plaintext passwords (or any reversible encoding of them) if the SASL mechanism to upgrade allows this to be avoided.</p>
+    <example caption="Server advertises support for SASL mechanism upgrades to fictional BLOOP2 and BLOOP-42 mechanisms"><![CDATA[
+<!-- Client sending stream header -->
+<stream:stream
+  from='user@example.org'
+  to='example.org'
+  version='1.0'
+  xml:lang='en'
+  xmlns='jabber:client'
+  xmlns:stream='http://etherx.jabber.org/streams'>
+
+<!-- Server responding with stream header and features -->
+<stream:stream
+  from='example.org'
+  id='++TR84Sm6A3hnt3Q065SnAbbk3Y='
+  to='user@example.org'
+  version='1.0'
+  xml:lang='en'
+  xmlns='jabber:client'
+  xmlns:stream='http://etherx.jabber.org/streams'>
+<stream:features>
+  <authentication xmlns='urn:xmpp:sasl:2'>
+    <mechanism>SCRAM-SHA-1</mechanism>
+    <mechanism>SCRAM-SHA-1-PLUS</mechanism>
+    <inline>
+      <!-- Server indicates that XEP-0198 stream resumption can be done "inline" -->
+      <resume xmlns='urn:xmpp:sm:3'/>
+      <!-- Server indicates support for XEP-0386 Bind 2 -->
+      <bind xmlns='urn:xmpp:bind2:1'/>
+    </inline>
+    <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-BLOOP2</upgrade>
+    <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-BLOOP-42</upgrade>
+  </authentication>
+  <!-- Channel-binding information provided by XEP-0440 -->
+  <sasl-channel-binding xmlns='urn:xmpp:sasl-cb:0'>
+    <channel-binding type='tls-server-end-point'/>
+    <channel-binding type='tls-exporter'/>
+  </sasl-channel-binding>
+</stream:features>
+]]></example>
+  </section2>
+  <section2 topic="Client requesting SASL upgrades" anchor="request">
+    <p>The client SHOULD always request one or more upgrade tasks it recognises. To do this, it includes the &lt;upgrade/> element namespaced to "urn:xmpp:sasl:upgrade:0" in its &lt;authenticate/> element listing the upgrade tasks it wants to perform, as specified in the Initiation section of &xep0388;, one &lt;upgrade> element for each task.</p>
+    <p>Upon successfully authenticating the client (including any secondary authentication steps required for the account), but before the final &lt;success/> would be sent, the server sends a &lt;continue/> element, which MUST contain a single task, matching whatever was selected by the client. If the client selected more than one upgrade task, as sequence of upgrade tasks occur. The client then initiates this upgrade task by providing a corresponding &lt;next/> element providing the task name and optionally including any further child-elements as defined by the specification for this concrete upgrade task.</p>
+    <example caption="Client requests upgrades for fictional BLOOP2 and BLOOP-42 mechanisms"><![CDATA[
+<!-- Client sends authentication request, requesting upgrades to BLOOP2 and BLOOP-42-->
+<authenticate xmlns='urn:xmpp:sasl:2' mechanism='SCRAM-SHA-1-PLUS'>
+  <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-BLOOP2</upgrade>
+  <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-BLOOP-42</upgrade>
+  <!-- Base64 of: 'p=tls-exporter,,n=user,r=12C4CD5C-E38E-4A98-8F6D-15C38F51CCC6' -->
+  <initial-response>cD10bHMtZXhwb3J0ZXIsLG49dXNlcixyPTEyQzRDRDVDLUUzOEUtNEE5OC04RjZELTE1QzM4RjUxQ0NDNg==</initial-response>
+  <user-agent id='d4565fa7-4d72-4749-b3d3-740edbf87770'>
+    <software>AwesomeXMPP</software>
+    <device>Kiva's Phone</device>
+  </user-agent>
+</authenticate>
+]]></example>
+    <example caption="Server initiates first upgrade task for BLOOP2"><![CDATA[
+<!-- Client authenticates using SCRAM-SHA-1-PLUS (or whatever mechanism was selected)-->
+[...]
+
+<!-- The Server requests the client to perform the first requested upgrade task for BLOOP2 -->
+<continue xmlns='urn:xmpp:sasl:2'>
+  <additional-data>
+    SSdtIGJvcmVkIG5vdy4=
+  </additional-data>
+  <tasks>
+    <task>UPGR-BLOOP2</task>
+  </tasks>
+  <text>This account requires an upgrade to BLOOP2 as requested by the client</text>
+</continue>
+]]></example>
+  </section2>
+  <section2 topic="Performing the upgrade" anchor="upgrade">
+    <p>Upon receiving the &lt;next/> element for the upgrade, the server provides the elements and data needed for the client to calculate the requested data. The concrete elements and exchanges needed for the upgrade are specific to individual tasks. These tasks may be documented in other documents.</p>
+  </section2>
+  <example caption="SASL mechanism upgrades to fictional BLOOP2 and BLOOP-42 mechanisms"><![CDATA[
+<!-- The Client initiates the task requested by the server in the <continue/> element -->
+<next xmlns='urn:xmpp:sasl:2' task='UPGR-BLOOP2'>
+  <request xmlns='urn:xmpp:bloop2:example'>
+    UGxlYXNlIHVwZ3JhZGUgbWUh
+  </request>
+</next>
+
+<!-- The Server provides the needed data -->
+<task-data xmlns='urn:xmpp:sasl:2'>
+  <data xmlns='urn:xmpp:bloop2:example'>
+    <data>U28sIG5leHQgRk9TREVNIC0gMjAxOCwgdGhhdCBpcy4uLg==</data>
+    <description>BLOOP2 is cool!</description>
+  </data>
+</task-data>
+
+<!-- The Client now responds -->
+<task-data xmlns='urn:xmpp:sasl:2'>
+  <upgrade xmlns='urn:xmpp:bloop2:example'>
+    <response>Li4uSSdsbCBidXkgYSBiZWVyIGZvciB0aGUgZmlyc3QgcGVyc29uIHdoby4uLg==</response>
+    <finalize>2</finalize>
+  </upgrade>
+</task-data>
+
+<!-- The Server requests the client to perform the second requested upgrade task for BLOOP-42 -->
+<continue xmlns='urn:xmpp:sasl:2'>
+  <additional-data>
+    SSdtIGJvcmVkIG5vdy4=
+  </additional-data>
+  <tasks>
+    <task>UPGR-BLOOP-42</task>
+  </tasks>
+  <text>This account requires an upgrade to BLOOP-42 as requested by the client</text>
+</continue>
+
+<!-- The Client initiates the task -->
+<next xmlns='urn:xmpp:sasl:2' task='UPGR-BLOOP-42'>
+  <request xmlns='urn:xmpp:bloop42:example'>
+    UGxlYXNlIHVwZ3JhZGUgbWUh
+  </request>
+</next>
+
+<!-- The Server provides the needed data -->
+<task-data xmlns='urn:xmpp:sasl:2'>
+  <data xmlns='urn:xmpp:bloop42:example'>
+    <data>U28sIG5leHQgRk9TREVNIC0gMjAxOCwgdGhhdCBpcy4uLg==</data>
+    <description>BLOOP-42 is cool!</description>
+  </data>
+</task-data>
+
+<!-- The Client now responds -->
+<task-data xmlns='urn:xmpp:sasl:2'>
+  <upgrade xmlns='urn:xmpp:bloop42:example'>
+    <response>Li4uSSdsbCBidXkgYSBiZWVyIGZvciB0aGUgZmlyc3QgcGVyc29uIHdoby4uLg==</response>
+    <finalize>42</finalize>
+  </upgrade>
+</task-data>
+
+<!-- The upgrade was performed and the Server finishes authentication -->
+<success xmlns='urn:xmpp:sasl:2'>
+  <authorization-identifier>user@example.org</authorization-identifier>
+</success>
+]]></example>
+</section1>
+
+<section1 topic="SCRAM upgrade tasks" anchor="scram">
   <p>For upgrades of SCRAM mechanisms as defined in &rfc5802;, the server has to provide the needed data for the client to calculate the SaltedPassword as defined in this RFC (or some RFC updating it), namely the iteration count and salt. To do so the server sends a &lt;salt/> element namespaced to "urn:xmpp:scram-upgrade:0" containing the salt and an attribute named "iteration" containing the iteration count as defined in that RFC, omitting the "s=" and "i=" prefix. The &lt;salt/> element is contained within a &lt;task-data/> wrapper element as defined in &xep0388;.</p>
   <p>The client then calculates the SaltedPassword and sends back its base64 encoded value inside a &lt;hash/> element namespaced to "urn:xmpp:scram-upgrade:0". The &lt;hash/> element is contained within a &lt;task-data/> wrapper element as defined in &xep0388;.</p>
   <p>The name of the upgrade task MUST NOT conain the "-PLUS" suffix, because channel-binding is not relevant for upgrade tasks.</p>
   <example caption="SCRAM hash upgrade task for SCRAM-SHA-256 after successful SCRAM-SHA-1-PLUS authentication"><![CDATA[
+  <!-- Client sending stream header -->
+  <stream:stream
+    from='user@example.org'
+    to='example.org'
+    version='1.0'
+    xml:lang='en'
+    xmlns='jabber:client'
+    xmlns:stream='http://etherx.jabber.org/streams'>
+
+  <!-- Server responding with stream header and features -->
+  <stream:stream
+    from='example.org'
+    id='++TR84Sm6A3hnt3Q065SnAbbk3Y='
+    to='user@example.org'
+    version='1.0'
+    xml:lang='en'
+    xmlns='jabber:client'
+    xmlns:stream='http://etherx.jabber.org/streams'>
+  <stream:features>
+    <authentication xmlns='urn:xmpp:sasl:2'>
+      <mechanism>SCRAM-SHA-1</mechanism>
+      <mechanism>SCRAM-SHA-1-PLUS</mechanism>
+      <inline>
+        <!-- Server indicates that XEP-0198 stream resumption can be done "inline" -->
+        <resume xmlns='urn:xmpp:sm:3'/>
+        <!-- Server indicates support for XEP-0386 Bind 2 -->
+        <bind xmlns='urn:xmpp:bind2:1'/>
+      </inline>
+      <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-SCRAM-SHA-256</upgrade>
+      <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-SCRAM-SHA-512</upgrade>
+    </authentication>
+    <!-- Channel-binding information provided by XEP-0440 -->
+    <sasl-channel-binding xmlns='urn:xmpp:sasl-cb:0'>
+      <channel-binding type='tls-server-end-point'/>
+      <channel-binding type='tls-exporter'/>
+    </sasl-channel-binding>
+  </stream:features>
+
+  <!-- Client sends authentication request, requsting an upgrade to SCRAM-SHA-256 -->
+  <authenticate xmlns='urn:xmpp:sasl:2' mechanism='SCRAM-SHA-1-PLUS'>
+    <upgrade xmlns='urn:xmpp:sasl:upgrade:0'>UPGR-SCRAM-SHA-256</upgrade>
+    <!-- Base64 of: 'p=tls-exporter,,n=user,r=12C4CD5C-E38E-4A98-8F6D-15C38F51CCC6' -->
+    <initial-response>cD10bHMtZXhwb3J0ZXIsLG49dXNlcixyPTEyQzRDRDVDLUUzOEUtNEE5OC04RjZELTE1QzM4RjUxQ0NDNg==</initial-response>
+    <user-agent id='d4565fa7-4d72-4749-b3d3-740edbf87770'>
+      <software>AwesomeXMPP</software>
+      <device>Kiva's Phone</device>
+    </user-agent>
+  </authenticate>
+
+  <!-- Client authenticates using SCRAM-SHA-1-PLUS (or whatever mechanism was selected)-->
+  [...]
+
   <!-- The Server provides the SCRAM upgrade task requested by the client in its <authenticate/> element -->
   <continue xmlns='urn:xmpp:sasl:2'>
     <!-- Base64 of: 'v=msVHs/BzIOHDqXeVH7EmmDu9id8=' -->
@@ -69,7 +270,7 @@
 
   <!-- The client responds with the base64 encoded SaltedPassword. -->
   <task-data xmlns='urn:xmpp:sasl:2'>
-  <hash xmlns='urn:xmpp:sasl:2'>
+    <hash xmlns='urn:xmpp:scram-upgrade:0'>
       BzOnw3Pc5H4bOLlPZ/8JAy6wnTpH05aH21KW2+Xfpaw=
     </hash>
   </task-data>
@@ -84,9 +285,12 @@
   ]]></example>
 </section1>
 
+<section1 topic='Business Rules' anchor='rules'>
+  <p>For compatibility purposes, the server SHOULD keep the older authentication data (password hashes etc.) of all configured mechanisms to continue offering the same mechanisms as before.</p>
+</section1>
+
 <section1 topic='Security Considerations' anchor='security'>
-  <p>Sending the password hash to the server (after authentication) is only protected by TLS and possibly channel-binding. Clients SHOULD use channel-binding, if available, to make sure no MITM can eavesdrop that hash and subsequently use it for authentication.</p>
+  <p>Clients SHOULD use channel-binding, if available, when requesting an upgrade to make sure no MITM can eavesdrop that hash and subsequently use it for authentication. Note that a client can always choose to not upgrade SASL mechanisms if it can not use channel-binding or the connection is otherwise deemed not secure enough.</p>
-  <p>Note that a client can always choose to not take server-offered upgrades to newer SCRAM hash algorithms if it can not use channel-binding or the connection is otherwise deemed not secure enough.</p>
 </section1>
 <section1 topic='IANA Considerations' anchor='iana'>
   <p>This document requires no interaction with &IANA;.</p>
@@ -97,6 +301,24 @@
 <section1 topic="XML Schema">
   <code><![CDATA[
 <?xml version='1.0' encoding='utf-8'?>
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+           targetNamespace="urn:xmpp:sasl:upgrade:0"
+           xmlns="urn:xmpp:sasl:upgrade:0"
+           elementFormDefault="qualified">
+
+    <xs:element name="upgrade" type="SaslMechName" minOccurs="0" maxOccurs="unbounded"/>
+
+    <xs:simpleType name="SaslMechName">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="20"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>
+]]></code>
+  <code><![CDATA[
+<?xml version='1.0' encoding='utf-8'?>
 <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
            targetNamespace="urn:xmpp:scram-upgrade:0"
            xmlns="urn:xmpp:scram-upgrade:0"
@@ -122,7 +344,12 @@
       <xs:minInclusive value="1"/>
     </xs:restriction>
   </xs:simpleType>
+
 </xs:schema>
 ]]></code>
 </section1>
+
+<section1 topic='Acknowledgements' anchor='acknowledgements'>
+  <p>Thanks to Matthew Wild and Dave Cridland for all of their valuable feedback and improvements.</p>
+</section1>
 </xep>