From 64ad22d6965453cd9dafed81f8c05138044d9551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Thu, 28 May 2020 14:30:12 +0200 Subject: [PATCH 1/7] XEP-0157: Add status-addresses registrar entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- xep-0157.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xep-0157.xml b/xep-0157.xml index f623df33..4e371a8f 100644 --- a/xep-0157.xml +++ b/xep-0157.xml @@ -139,6 +139,9 @@ xmpp:security@shakespeare.lit + + https://status.shakespeare.lit + http://shakespeare.lit/support.php xmpp:support@shakespeare.lit @@ -192,6 +195,10 @@ var='security-addresses' type='list-multi' label='One or more addresses for communication related to security concerns'/> + Date: Thu, 28 May 2020 09:53:58 +0200 Subject: [PATCH 2/7] XEP-0157: Add to status-address registry entry Signed-off-by: Florian Schmaus --- xep-0157.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xep-0157.xml b/xep-0157.xml index 4e371a8f..fcd042ce 100644 --- a/xep-0157.xml +++ b/xep-0157.xml @@ -198,7 +198,12 @@ + label='One or more addresses for service status'> + + + + Date: Thu, 28 May 2020 14:34:56 +0200 Subject: [PATCH 3/7] XEP-0157: Add version block for registrar change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- xep-0157.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xep-0157.xml b/xep-0157.xml index fcd042ce..61afd3bd 100644 --- a/xep-0157.xml +++ b/xep-0157.xml @@ -28,6 +28,12 @@ jajcus@jajcus.net jajcus@jabber.bnet.pl + + 1.1.0 + 2020-05-25 + mb, fs +

Add 'status-addresses' value in registrar, with example.

+
1.0.1 2018-07-21 From 952c19edc3ddc078aa5b6751dc0c0942f6098064 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 8 Jun 2020 15:25:06 +0200 Subject: [PATCH 4/7] XEP-0156: reorganize stating XRD/JRD requirements The reference to RFC 6120 was incorrect, what this really meant is RFC 6415. But instead of simply s/RFC 6120/RFC 6415/ here, I decided to reorganize stating the requirements of XRD and JRD a little. --- xep-0156.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xep-0156.xml b/xep-0156.xml index 21febf7e..593c8a6d 100644 --- a/xep-0156.xml +++ b/xep-0156.xml @@ -200,6 +200,7 @@ _xmppconnect IN TXT "_xmpp-client-websocket=wss://web.example.com:443/ws"

The following business rules apply:

    +
  1. Services implementing this XEP MUST offer the information in the Extensible Resource Descriptor (XRD) format and SHOULD additionally provide the JRD format (both formats are specified in &rfc6415;).
  2. HTTP queries for host-meta information MUST be used only as a fallback after the methods specified in RFC 6120 have been exhausted.
  3. A domain SHOULD NOT present information in host-meta link records that is available via the DNS SRV records defined in RFC 6120.
  4. The order of XMPP related link entries in the host-meta file SHOULD NOT be interpreted as significant by the presenting domain or the receiving entity.
  5. @@ -208,7 +209,6 @@ _xmppconnect IN TXT "_xmpp-client-websocket=wss://web.example.com:443/ws"

    The following examples show two host-meta link records: the first indicates support for the XMPP Over BOSH connection method defined in XEP-0124 and XEP-0206 and the second indicates support for the XMPP Over WebSocket connection method defined in &rfc7395;.

    -

    As specified in RFC 6120 §3, support for the XML encoding of the host-meta resource is REQUIRED while alternative representations such as JSON are OPTIONAL.

    ... @@ -219,7 +219,7 @@ _xmppconnect IN TXT "_xmpp-client-websocket=wss://web.example.com:443/ws" ... ]]> -

    It is possible to use an alternative JSON format for host-meta information, in which case the above example would be presented as:

    +

    It is possible to use an alternative JSON format for host-meta information. The JSON representation of the host metadata is named JRD and specified in Appendix A of &rfc6415;. The above XRD example would be presented in JRD as:

    Date: Mon, 15 Jun 2020 18:30:36 +0200 Subject: [PATCH 5/7] XEP-0157: Remove , instead state the requirement in text Remove from the registrar submission and instead state the requirement that 'status-addresses' form field values must be of type xs:anyURI in the text. --- xep-0157.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xep-0157.xml b/xep-0157.xml index 61afd3bd..8eb94aa8 100644 --- a/xep-0157.xml +++ b/xep-0157.xml @@ -105,6 +105,12 @@

    The administrators of an XMPP service may desire to advertise contact information related to that service. Many existing Jabber/XMPP server implementations use the bare domain &DOMAINBARE; of the server (e.g., "example.org") as an alias for the server administrators, such that a &MESSAGE; stanza addressed to that domain name is delivered to the JIDs of the server administrators. (Currently, this functionality does not apply to &IQ; or &PRESENCE; stanzas.) Unfortunately, using the "domain.tld" address as a way to direct messages to the server administrators may result in overloading of the bare domain address (i.e., it may be desirable to send messages to the server's address without having those messages delivered to the server admins, for example if the server doubles as a &xep0060; service). Therefore, it is instead RECOMMENDED to support service discovery of contact addresses as specified herein. This contact information may include email addresses, web URLs, and JabberIDs for specific roles and functions such as the service administrators, abuse reports, customer feedback, sales inquiries, technical support, and security concerns. For this purpose, domains SHOULD support the electronic mailboxes required by RFC 2142. However, additional contact mechanisms may be desirable, and it would be helpful if those who want to initiate contact could discover the contact information using standard XMPP extensions, specifically &xep0030;. To make such discovery possible, we specify a &xep0128; mechanism that a server SHOULD return in response to service discovery information ("disco#info") requests sent to the bare domain of the server. This information MUST be scoped using a FORM_TYPE of "http://jabber.org/network/serverinfo" (as already specified in XEP-0128) and data form fields registered for this purpose as defined in the XMPP Registrar Considerations section of this document.

    + +

    Values of 'status-addresses' form field MUST be valid URIs, i.e. comply with the + 'xs:anyURI' datatype of &w3xmlschema2;. Values of the 'abuse-addresses', + 'admin-addresses', 'feedback-addresses', 'sales-addresses', + 'security-addresses' and 'support-addresses' SHOULD be valid URIs.

    +

    To illustrate this usage, consider the following example of a disco#info request sent to the mythical shakespeare.lit XMPP server:

    - - - Date: Wed, 17 Jun 2020 18:25:13 +0200 Subject: [PATCH 6/7] XEP-0156: Refer to JSON as an "additional format", not alternative one Thanks Dave Cridland for the suggestion. --- xep-0156.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0156.xml b/xep-0156.xml index 593c8a6d..4f28e88a 100644 --- a/xep-0156.xml +++ b/xep-0156.xml @@ -219,7 +219,7 @@ _xmppconnect IN TXT "_xmpp-client-websocket=wss://web.example.com:443/ws" ... ]]> -

    It is possible to use an alternative JSON format for host-meta information. The JSON representation of the host metadata is named JRD and specified in Appendix A of &rfc6415;. The above XRD example would be presented in JRD as:

    +

    It is possible to use additionally a JSON-based format for host-meta information. The JSON representation of the host metadata is named JRD and specified in Appendix A of &rfc6415;. The above XRD example would be presented in JRD as:

    Date: Tue, 23 Jun 2020 18:36:15 +0200 Subject: [PATCH 7/7] XEP-0156: add revision block --- xep-0156.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xep-0156.xml b/xep-0156.xml index 4f28e88a..e048ca97 100644 --- a/xep-0156.xml +++ b/xep-0156.xml @@ -25,6 +25,12 @@ &hildjj; &stpeter; &lance; + + 1.3.0 + 2020-06-23 + fs +

    Fix reference to RFC 6415 and organize requirements more clearly. This raises the JSON requirement from MAY (OPTIONAL) to SHOULD (effectively), to accustom web-based software.

    +
    1.2.0 2019-02-20