From 64e6deb98dbd2fc4cce5ae311f4837efeede9b3c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 8 Jun 2017 22:18:38 +0200 Subject: [PATCH 1/6] XEP-0060: Fix examples using invalid XEP-0082 dates. --- xep-0060.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xep-0060.xml b/xep-0060.xml index 8c099df9..e636a37a 100644 --- a/xep-0060.xml +++ b/xep-0060.xml @@ -49,6 +49,12 @@ &stpeter; &ralphm; + + 1.13.6 + 2017-06-08 + egp +

Fix examples using invalid XEP-0082 dates.

 + 1.13.5 2016-12-21 @@ -951,7 +957,7 @@ And by opposing end them? hamlet@denmark.lit - 2003-07-29T22:56Z + 2003-07-29T22:56:10Z Princely Musings (Atom) @@ -5513,7 +5519,7 @@ And by opposing end them? http://jabber.org/protocol/pubsub#subscribe_options ... - 2006-02-28T11:59Z + 2006-02-28T11:59:59Z ... @@ -5530,7 +5536,7 @@ And by opposing end them? http://jabber.org/protocol/pubsub#subscribe_options ... - 2006-03-31T23:59Z + 2006-03-31T23:59:59Z ... From 8656899927b77aea2704ad3c5e0dbd5553014fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Fri, 7 Jul 2017 13:35:30 +0200 Subject: [PATCH 2/6] XEP-0357: Use server JID as 'from' address --- xep-0357.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xep-0357.xml b/xep-0357.xml index 2303f15e..8771a834 100644 --- a/xep-0357.xml +++ b/xep-0357.xml @@ -29,6 +29,12 @@ lancestout@gmail.com lance@lance.im + + 0.3 + 2017-07-07 + hw +

Use server JID as 'from' address for notifications.

 + 0.2.1 2016-02-16 @@ -189,8 +195,8 @@

Each PubSub node is a delivery target for the Push Service, which could represent multiple devices for a single user.

-

In order to prevent information leaks, each node SHOULD be configured with a 'whitelist' access model so that only trusted entities are able to view or subscribe to published notifications. Furthermore, the 'publish-only' affiliation SHOULD be used to allow acceptable entities (such as the user's bare JID) to publish to the node to trigger notifications.

-

Care SHOULD be taken to ensure that publish requests are coming from the user's server and not from other third-party client applications using the full JID of a user. A Push Service MAY opt to only accept or further process publish requests from bare JIDs to ensure that only a user's server is able to publish, but it SHOULD instead use publish options with credentials shared only with the user's server (see Enabling Notifications).

+

In order to prevent information leaks, each node SHOULD be configured with a 'whitelist' access model so that only trusted entities are able to view or subscribe to published notifications. Furthermore, the 'publish-only' affiliation SHOULD be used to allow acceptable entities (such as the server JID and the user's bare JID) to publish to the node to trigger notifications.

+

Care SHOULD be taken to ensure that publish requests are coming from the user's server and not from other third-party client applications using the full JID of a user. A Push Service MAY opt to only accept or further process publish requests from server JIDs and bare user JIDs to ensure that only a user's server is able to publish, but it SHOULD instead use publish options with credentials shared only with the user's server (see Enabling Notifications).

 @@ -324,7 +330,7 @@

Other elements MAY be included if relevant for the notification.

@@ -349,7 +355,7 @@ From b25ea42cbdfefe404965441ad153c7327fa6b102 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Mon, 10 Jul 2017 14:55:09 -0700 Subject: [PATCH 3/6] XEP-0357: Add Kev as author --- xep-0357.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xep-0357.xml b/xep-0357.xml index 8771a834..1faabe7e 100644 --- a/xep-0357.xml +++ b/xep-0357.xml @@ -23,12 +23,14 @@ push - - Lance - Stout - lancestout@gmail.com - lance@lance.im - + &kev; + &lance; + + 0.3.1 + 2017-07-10 + ls +

Added Kevin Smith as author

 + 0.3 2017-07-07 From af6aa0d6d0244cd30588c5e77caf15112e0b7a2f Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sat, 15 Jul 2017 17:14:55 -0500 Subject: [PATCH 4/6] 0133: fix broken node in example --- xep-0133.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xep-0133.xml b/xep-0133.xml index 523b2adb..4fadc78b 100644 --- a/xep-0133.xml +++ b/xep-0133.xml @@ -21,6 +21,12 @@ admin &stpeter; + + 1.2 + 2017-07-15 + XEP Editor: ssw + Fix broken node value in example. + 1.1 2005-08-19 @@ -1613,7 +1619,7 @@ type='set' xml:lang='en'> From 4a0ac549f203468090440c971478d77a941d3215 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Mon, 21 Aug 2017 14:21:13 +0200 Subject: [PATCH 5/6] Add hash-used element --- xep-0300.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/xep-0300.xml b/xep-0300.xml index aba2df22..00779ac5 100644 --- a/xep-0300.xml +++ b/xep-0300.xml @@ -24,6 +24,12 @@ &mwild; &ksmith; &tobias; + + 0.5.2 + 2017-08-21 + ps +

Add hash-used element

 + 0.5.1 2017-03-17 @@ -93,6 +99,8 @@

An XMPP protocol can include more than one instance of the <hash/> element, as long as each one has a different value for the 'algo' attribute:

2AfMGH8O7UNPTvUVAM9aK13mpCY= 2XarmwTlNxDAMkvymloX3S5+VbylNrJt/l5QyPa+YoU=]]> +

In certain scenarios it makes sense to communicate the hash algorithm that is used prior to the calculation of the hash value.

+ ]]>

The value of the 'algo' attribute MUST be one of the values from the &ianahashes; maintained by &IANA;, or one of the values defined in the following table.

@@ -393,6 +401,14 @@ + + + + + + + + ]]> From 79ea21477e3ea529a1a0663996f09eff27c49951 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 23 Aug 2017 18:50:49 +0200 Subject: [PATCH 6/6] Use hash-used element in 0234. --- xep-0234.xml | 17 ++++++++++++++--- xep-0300.xml | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xep-0234.xml b/xep-0234.xml index 79ddd7e5..9ad2b7c1 100644 --- a/xep-0234.xml +++ b/xep-0234.xml @@ -24,6 +24,12 @@ NOT_YET_ASSIGNED &stpeter; &lance; + + 0.18.2 + 2017-08.21 + ps +

Make use of <hash-used/> from XEP-0300.

 + 0.18.1 2017-05-20 @@ -354,7 +360,12 @@ - + + + + + + @@ -785,7 +796,7 @@ a=file-range:1024-*]]>

At any time during the lifetime of the file transfer session, the File Sender can communicate the checksum of the file to the File Receiver.

This can be done in the session-initiate message if the File Sender already knows the checksum, as shown above in Example 3.

-

After the session-initiate message, this can also be done by sending a session-info message containing a <checksum/> element qualified by the 'urn:xmpp:jingle:apps:file-transfer:5' namespace. The <checksum/> element SHOULD contain 'creator' and 'name' attributes sufficient to identitfy the content the checksum belongs to. Additionally, the <checksum/> element MUST contain a <file/> element which MUST contain at least one <hash/> element qualified by the 'urn:xmpp:hashes:2' namespace. Each <hash/> element contains a checksum of the file data produced in accordance with the hashing function specified by the 'algo' attribute, which MUST be one of the functions listed in the &ianahashes;.

+

After the session-initiate message, this can also be done by sending a session-info message containing a <checksum/> element qualified by the 'urn:xmpp:jingle:apps:file-transfer:5' namespace. In such a case however, the session-initiate message MUST contain a <hash-used/> element. The <checksum/> element SHOULD contain 'creator' and 'name' attributes sufficient to identitfy the content the checksum belongs to. Additionally, the <checksum/> element MUST contain a <file/> element which MUST contain at least one <hash/> or <hash-used/> element qualified by the 'urn:xmpp:hashes:2' namespace. Each <hash/> element contains a checksum of the file data produced in accordance with the hashing function specified by the 'algo' attribute, which MUST be one of the functions listed in the &ianahashes;.

-

Thanks to Diana Cionoiu, Olivier Crête, Viktor Fast, Philipp Hancke, Waqas Hussain, Justin Karneges, Steffen Larsen, Yann Leboulanger, Marcus Lundblad, Robert McQueen, Joe Maissel, Glenn Maynard, Ali Sabil, Sjoerd Simons, Will Thompson, Matthew Wild, and Jiří Zárevúcky for their feedback.

+

Thanks to Diana Cionoiu, Olivier Crête, Viktor Fast, Philipp Hancke, Waqas Hussain, Justin Karneges, Steffen Larsen, Yann Leboulanger, Marcus Lundblad, Robert McQueen, Joe Maissel, Glenn Maynard, Ali Sabil, Sjoerd Simons, Will Thompson, Matthew Wild, Paul Schaub and Jiří Zárevúcky for their feedback.

 diff --git a/xep-0300.xml b/xep-0300.xml index 00779ac5..83a367c1 100644 --- a/xep-0300.xml +++ b/xep-0300.xml @@ -415,7 +415,7 @@

Thanks to Dave Cridland, Waqas Hussain, Glenn Maynard, Remko - Tronçon, and Christian Schudt for their input.

+ Tronçon, Paul Schaub and Christian Schudt for their input.
hash A hash of the file content, using the <hash/> element defined in &xep0300; and qualifed by the 'urn:xmpp:hashes:2' namespace. Multiple hashes MAY be included for hash agility.REQUIRED when offering a file, otherwise OPTIONALSee <hash-used/>
hash-usedAlternatively to a <hash/> element, the initiator can also include a <hash-used/> element. This avoids the need to read the file twice to calculate the hash.Either a <hash/> or a <hash-used/> element MUST be included when offering a file.
media-type