From 7c53a9d655eda352277994ce2e0146710a7c2f35 Mon Sep 17 00:00:00 2001 From: Ian Paterson Date: Thu, 23 Nov 2006 20:25:33 +0000 Subject: [PATCH] URN namespace git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@209 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0158.xml | 62 ++++++++++++++++++++++++++-------------------------- xep-0159.xml | 4 ++-- xep-0189.xml | 34 ++++++++++++++++------------ 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/xep-0158.xml b/xep-0158.xml index 40f22a28..b9d82c99 100644 --- a/xep-0158.xml +++ b/xep-0158.xml @@ -78,13 +78,13 @@ -

This protocol requires multimedia to be included within &xep0004;. This section defines a new namespace ('http://jabber.org/protocols/media') for that purpose. The root element for the namespace is <media/>. It MUST be contained within a <field/> element qualified by the 'jabber:x:data' namespace.

+

This protocol requires multimedia to be included within &xep0004;. This section defines a new namespace ('urn:xmpp:media') for that purpose. The root element for the namespace is <media/>. It MUST be contained within a <field/> element qualified by the 'jabber:x:data' namespace.

If the media is an image or video then the <media/> element SHOULD include 'width' and 'height' attributes specifying the recommended display size of the media in pixels.

The <media/> element SHOULD contain at least one <uri/> element to specify the out-of-band location of the media data. Constrained execution environments prevent some clients rendering media unless it has been received out-of-band (e.g., Web clients). The <uri/> element MUST contain a URI that indicates the location.

The <media/> element MAY also contain one or more <data/> elements for distributing the media in-band. The <data/> element MUST contain the Base64 encoded (in accordance with Section 3 of &rfc3548;) media data. The encoded data SHOULD NOT be larger than 8 KB. Note that if a stanza contains more than one <data/> element then the sending entity MUST take care not to trigger karma limits.

Each <uri/> or <data/> element MUST include a 'type' atribute that specifies the MIME type (see &rfc2045;) of the media.

+ http://www.victim.com/challenges/speech.wav?F3A6292C http://www.victim.com/challenges/speech.ogg?F3A6292C http://www.victim.com/challenges/speech.mp3?F3A6292C @@ -108,7 +108,7 @@ ]]> -

Each of the challenge form's <field/> elements (see Data Forms) that are not hidden MAY contain a different challenge and any media required for the challenge. The hidden 'from' field MUST contain the value of the 'to' attribute of the client's stanza that triggered the challenge. If the stanza from the client included an 'id' attribute then the hidden 'sid' field MUST be set to that value. The 'xml:lang' attribute of the challenge stanza SHOULD be the same as the one received from the client. The hidden 'FORM_TYPE' field MUST have a value of "http://jabber.org/protocol/challenge" in accordance with &xep0068;.

+

Each of the challenge form's <field/> elements (see Data Forms) that are not hidden MAY contain a different challenge and any media required for the challenge. The hidden 'from' field MUST contain the value of the 'to' attribute of the client's stanza that triggered the challenge. If the stanza from the client included an 'id' attribute then the hidden 'sid' field MUST be set to that value. The 'xml:lang' attribute of the challenge stanza SHOULD be the same as the one received from the client. The hidden 'FORM_TYPE' field MUST have a value of "urn:xmpp:challenge" in accordance with &xep0068;.

The challenger SHOULD include an explanation (in the &BODY; element) for clients that do not support this protocol. The challenger MAY also include a URL (typically a Web page with instructions) using &xep0066; as an alternative for clients that do not support the challenge form. Note: even if it provides a URL, a challenger MUST always provide a challenge form. A constrained client, like a mobile phone, cannot present a Web page to its user.

http://www.victim.com/challenge.html?F3A6292C - + - http://jabber.org/protocol/challenge + urn:xmpp:challenge innocent@victim.com spam1 - http://www.victim.com/challenges/ocr.jpeg?F3A6292C @@ -136,7 +136,7 @@ - http://www.victim.com/challenges/picture.jpeg?F3A6292C @@ -144,13 +144,13 @@ - + http://www.victim.com/challenges/speech.wav?F3A6292C http://www.victim.com/challenges/speech.ogg?F3A6292C - http://www.victim.com/challenges/video.mpeg?F3A6292C @@ -201,10 +201,10 @@ to='victim.com' xml:lang='en' id='F3A6292C'> - + - http://jabber.org/protocol/challenge + urn:xmpp:challenge innocent@victim.com spam1 @@ -262,23 +262,23 @@ id='73DE28A2'> Your messages to innocent@victim.com are being blocked. To unblock them, ask innocent@victim.com to send you a message. - + - http://jabber.org/protocol/challenge + urn:xmpp:challenge innocent@victim.com spam2 2 - http://www.victim.com/challenges/ocr.jpeg?F3A6292C - + http://www.victim.com/challenges/audio.wav?F3A6292C @@ -298,10 +298,10 @@ to='victim.com' xml:lang='en' id='73DE28A2'> - + - http://jabber.org/protocol/challenge + urn:xmpp:challenge innocent@victim.com spam2 @@ -329,12 +329,12 @@ - http://jabber.org/protocol/challenge + urn:xmpp:challenge F3A6292C 3 - http://www.victim.com/challenges/ocr.jpeg?F3A6292C @@ -364,7 +364,7 @@ - http://jabber.org/protocol/challenge + urn:xmpp:challenge F3A6292C 3 @@ -496,10 +496,10 @@ id='F3A6292C'> Your messages to me are being blocked. To unblock them, reply with the color of a stop light followed by 'F3A6292C'. - + - http://jabber.org/protocol/challenge + urn:xmpp:challenge innocent@victim.com spam1 @@ -560,8 +560,8 @@

Upon approval of this document, the ®ISTRAR; shall register the following protocol namespaces:

    -
  • http://jabber.org/protocol/challenge
    • -
  • http://jabber.org/protocol/media
    • +
  • urn:xmpp:challenge
    • +
  • urn:xmpp:media
 @@ -569,7 +569,7 @@

Upon approval of this document, the XMPP Registrar shall register the following new FORM_TYPE. Additional fields will be defined in future submissions.

- http://jabber.org/protocol/challenge + urn:xmpp:challenge XEP-0158 forms enabling robot challenges - + @@ -714,14 +714,14 @@ ]]> - + diff --git a/xep-0159.xml b/xep-0159.xml index 2a3d31b9..ec1b9f04 100644 --- a/xep-0159.xml +++ b/xep-0159.xml @@ -100,7 +100,7 @@ ... - + ... @@ -236,7 +236,7 @@

Upon approval of this document, the XMPP Registrar shall register the following well-known Service Discovery node:

    -
  • http://jabber.org/protocol/spim-control
    • +
  • urn:xmpp:spim-control
 diff --git a/xep-0189.xml b/xep-0189.xml index 68aa58df..56c08bcb 100644 --- a/xep-0189.xml +++ b/xep-0189.xml @@ -23,6 +23,12 @@ None pubkeys &ianpaterson; + + 0.4 + 2006-11-23 + ip +

Changed namespace

 + 0.3 2006-11-20 @@ -57,7 +63,7 @@ - + @@ -84,7 +90,7 @@ - + julietRSAkey1 @@ -103,7 +109,7 @@ - + julietDSAkey1 @@ -121,7 +127,7 @@ - + julietX509cert1 @@ -145,7 +151,7 @@ - + julietPGPkey1 @@ -162,7 +168,7 @@ - + julietRSAkey1 @@ -188,7 +194,7 @@ from='romeo@montague.net/garden' id='items1'> - + ]]> @@ -198,7 +204,7 @@ from='juliet@capulet.com' id='items1'> - + julietRSAkey1 @@ -236,7 +242,7 @@ id='keys1' to='juliet@capulet.com/balcony' from='romeo@montague.net/garden'> - + ]]>

The other entity MUST make a careful access control decision before returning only those public keys for which it holds the corresponding private key (not necessarily the full list of keys being published via Personal Eventing via Pubsub):

@@ -245,7 +251,7 @@ id='keys1' to='romeo@montague.net/garden' from='juliet@capulet.com/balcony'> - + julietRSAkey1 ... @@ -263,7 +269,7 @@ id='keys1' to='romeo@montague.net/garden' from='juliet@capulet.com/balcony'> - + @@ -281,7 +287,7 @@ -

The ®ISTRAR; shall add 'http://jabber.org/protocol/pubkeys' to its registry of protocol namespaces.

+

The ®ISTRAR; shall add 'urn:xmpp:pubkeys' to its registry of protocol namespaces.

 @@ -290,8 +296,8 @@