1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-21 08:45:04 -05:00

Merge commit 'refs/pull/714/head' of https://github.com/xsf/xeps

This commit is contained in:
Jonas Schäfer 2018-11-08 20:39:04 +01:00
commit e9f570521f

View File

@ -33,6 +33,12 @@
<email>flo@geekplace.eu</email>
<jid>flo@geekplace.eu</jid>
</author>
<revision>
<version>0.1.1</version>
<date>2018-11-03</date>
<initials>fs</initials>
<remark><p>Minor fixes and clarifications</p></remark>
</revision>
<revision>
<version>0.1.0</version>
<date>2018-01-22</date>
@ -145,7 +151,7 @@
<isr xmlns='https://xmpp.org/extensions/isr/0'>
<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
<mechanism>HT-SHA-256-ENDP</mechanism>
</mechaisms>
</mechanisms>
</isr>
</stream:features>
]]></example>
@ -175,9 +181,9 @@
</enable>
]]></example>
<p>Next, the &lt;enabled/&gt; Nonza (see &xep0360;) which is send as
<p>Next, the &lt;enabled/&gt; Nonza (see &xep0360;) which is sent as
positive reply upon a request to enable Stream Management, MUST
contain an 'isr-enabled' element qualified by the 'htpps://xmpp.org/extensions/isr/0'
contain an 'isr-enabled' element qualified by the 'https://xmpp.org/extensions/isr/0'
namespace containing a ISR token as value of its 'token' attribute. The
token MUST be newly generated by a cryptographically secure random
number generator and MUST contain at least 128 bit of entropy. The
@ -220,7 +226,7 @@
<ol>
<li>The host provided in the optional 'location' attribute
qualified by the 'htpps://xmpp.org/extensions/isr/0' namespace found in the
qualified by the 'https://xmpp.org/extensions/isr/0' namespace found in the
&lt;enabled/&gt; element of <cite>XEP-0198</cite> (the
"isr:location").
</li>
@ -234,7 +240,7 @@
tried by the initiating entity in this order.</p>
<p>Note that the hosts announced by the 'location' attribute
qualified by the 'htpps://xmpp.org/extensions/isr/0' namespace MUST be connected to
qualified by the 'https://xmpp.org/extensions/isr/0' namespace MUST be connected to
using TLS from the beginning, i.e. &lt;starttls/&gt; MUST NOT be
used, instead the TLS handshake is performed right after
establishing the connection.</p>
@ -259,14 +265,14 @@
<p>Now the initiating entity sends an XMPP &lt;stream&gt; open
element followed by a &lt;authenticate/&gt; Nonza as specified in
the &xep0388;. The initiating entity must also provide a
&lt;inst-resume/&gt; element qualified by the 'htpps://xmpp.org/extensions/isr/0'
&lt;inst-resume/&gt; element qualified by the 'https://xmpp.org/extensions/isr/0'
namespace, which must contain a &lt;resume/&gt; element as defined
in &xep0198;.</p>
<p>If the with-isr-token' attribute is set to 'false', then the
<p>The only defined attributed of the &lt;inst-resume/&gt; element is the 'with-isr-token'
attribute, whose value, if omitted, defaults to 'true'. If is set to 'false', then the
SASL mechanism is performed as when traditionally authenticating
the XMPP session. If the value of the attribute is 'true', which is
the default value for this attribute, then the "password" given to
the XMPP session. If the value of the attribute is 'true' then the "password" given to
the SASL mechanism is the ISR token. Note that this implies that only
SASL mechanisms which take a password/token can be used this
way.</p>
@ -316,7 +322,7 @@
<p>On success the server replies with a &lt;success/&gt; nonza as
specified in the &xep0388;, which must include a
&lt;inst-resumed/&gt; element qualified by the 'htpps://xmpp.org/extensions/isr/0'
&lt;inst-resumed/&gt; element qualified by the 'https://xmpp.org/extensions/isr/0'
namespace. This element MUST contain a <em>new</em> ISR Token found in
the 'token' attribute. It also MUST include a &lt;resumed/&gt; as
specified in &xep0198; containing the sequence number of the last by
@ -353,7 +359,7 @@
but is unable to resume the stream instantly it MUST reply with a
&lt;success/&gt; Nonza as defined in the &xep0388; containing
a &lt;inst-resume-failed/&gt; element qualified by the
'htpps://xmpp.org/extensions/isr/0' namespace. This
'https://xmpp.org/extensions/isr/0' namespace. This
&lt;inst-resume-failed/&gt; MUST contain a &lt;failed/&gt;
element as defined in &xep0198;.</p>
@ -448,7 +454,7 @@
<section1 topic='XMPP Registrar Considerations' anchor='registrar'>
<p>The &REGISTRAR; includes 'htpps://xmpp.org/extensions/isr/0' in its registry of protocol namespaces (see &NAMESPACES;).</p>
<p>The &REGISTRAR; includes 'https://xmpp.org/extensions/isr/0' in its registry of protocol namespaces (see &NAMESPACES;).</p>
</section1>
@ -461,7 +467,7 @@
<section1 topic='Acknowledgements' anchor='acknowledgements'>
<p>Thanks to Jonas Wielicki, Thijs Alkemade, Dave Cridland, Maxime
Buquet, Alexander Würstlein and Sam Whited for their feedback.</p>
Buquet, Alexander Würstlein, Sam Whited and Ivan Vučica for their feedback.</p>
</section1>