From b6089b68d6112273a9fdf7fcf1540f703436fabb Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 18 Nov 2009 19:23:00 +0000
Subject: [PATCH] 1.1rc1

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3645 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0249.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/xep-0249.xml b/xep-0249.xml
index 67858244..b49b6da4 100644
--- a/xep-0249.xml
+++ b/xep-0249.xml
@@ -11,6 +11,7 @@
   &LEGALNOTICE;
   <number>0249</number>
   <status>Draft</status>
+  <interim/>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
@@ -25,6 +26,12 @@
     <url>http://xmpp.org/schemas/x-conference.xsd</url>
   </schemaloc>
   &stpeter;
+  <revision>
+    <version>1.1rc1</version>
+    <date>in progress, last updated 2009-11-18</date>
+    <initials>psa</initials>
+    <remark><p>Added password attribute for feature parity with mediated invitations.</p></remark>
+  </revision>
   <revision>
     <version>1.0</version>
     <date>2009-06-25</date>
@@ -93,11 +100,13 @@
     to='hecate@shakespeare.lit'>
   <x xmlns='jabber:x:conference'
      jid='darkcave@macbeth.shakespeare.lit'
+     password='cauldronburn'/>
      reason='Hey Hecate, this is the place for all good witches!'/>
 </message>
   ]]></example>
-  <p>The 'jid' attribute, which is REQUIRED, specifies the address of the groupchat room.</p>
-  <p>The 'reason' attribute, which is OPTIONAL, specifies a human-readable purpose for the invitation.</p>
+  <p>The 'jid' attribute, which is REQUIRED, specifies the address of the groupchat room to be joined.</p>
+  <p>The 'password' attribute, which is OPTIONAL, specifies a password needed for entry into a password-protected room and maps to the &lt;password/&gt; element in a mediated invitation.</p>
+  <p>The 'reason' attribute, which is OPTIONAL, specifies a human-readable purpose for the invitation and maps to the &lt;reason/&gt; element in a mediated invitation.</p>
   <p>Upon receiving a direct invitation, the contact's client SHOULD present the invitation to the contact so that the contact can accept it or decline it. If the contact accepts the invitation, the contact's client shall join the room as described in <cite>XEP-0045</cite>. If the contact declines the invitation, it shall silently discard the invitation.</p>
 </section1>
 
@@ -135,7 +144,7 @@
     <li><p>The sender of an invitation could overload the 'reason' attribute with malicious or offensive text. The recipient can mitigate this attack by blocking the sender using technologies such as &xep0016; and &xep0191;.</p></li>
     <li><p>A passive attacker could flood the recipient with a large number of chatroom invitations. This attack, too, can be mitigated with <cite>Privacy Lists</cite> or <cite>Simple Communications Blocking</cite>.</p></li>
     <li><p>A passive attacker could use a mimicked JID to fool the recipient into thinking that the sender is a known or trusted contact. This attack requires knowledge of the recipient's known or trusted contacts, and can be mitigated by following the recommendations in &xep0165;.</p></li>
-    <li><p>In the absence of end-to-end encryption, a passive attacker could eavesdrop on the chatroom invitations that a user sends or receives.</p></li>
+    <li><p>In the absence of end-to-end encryption, a passive attacker could eavesdrop on the chatroom invitations that a user sends or receives. This is especially threatening if the invitation includes a 'password' attribute for a password-protected room.</p></li>
     <li><p>In the absence of end-to-end encryption or signing, an active attacker could modify the invitation in transit so that the recipient is directed to a different room than intended by the sender.</p></li>
   </ol>
 </section1>
@@ -175,6 +184,10 @@
               name='jid'
               type='xs:string'
               use='required'/>
+          <xs:attribute
+              name='password'
+              type='xs:string'
+              use='optional'/>
           <xs:attribute
               name='reason'
               type='xs:string'