From 173990157fad6d4507e8ce2dc214e7bf35a17822 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 19 Dec 2019 10:03:16 +0000
Subject: rostermanager, mod_presence: Support for subscription preapproval
 (fixes #686)

---
 spec/scansion/presence_preapproval.scs | 74 ++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 spec/scansion/presence_preapproval.scs

(limited to 'spec/scansion/presence_preapproval.scs')

diff --git a/spec/scansion/presence_preapproval.scs b/spec/scansion/presence_preapproval.scs
new file mode 100644
index 00000000..ce6158d2
--- /dev/null
+++ b/spec/scansion/presence_preapproval.scs
@@ -0,0 +1,74 @@
+# server supports contact subscription pre-approval (RFC 6121 3.4)
+
+[Client] Alice
+	jid: preappove-a@localhost
+	password: password
+
+[Client] Bob
+	jid: preapprove-b@localhost
+	password: password
+
+---------
+
+Alice connects
+
+Alice sends:
+	<presence/>
+
+Alice receives:
+	<presence/>
+
+Alice sends:
+	<presence to="${Bob's JID}" type="subscribed"/>
+
+Bob connects
+
+Bob sends:
+	<iq type="get" id="roster1">
+		<query xmlns="jabber:iq:roster"/>
+	</iq>
+
+Bob receives:
+	<iq type="result" id="roster1">
+		<query xmlns="jabber:iq:roster" ver="{scansion:any}">
+		</query>
+	</iq>
+
+Bob sends:
+	<presence/>
+
+Bob receives:
+	<presence from="${Bob's full JID}"/>
+	
+Bob sends:
+	<presence to="${Alice's JID}" type="subscribe" />
+
+Bob receives:
+	<iq type='set' id='{scansion:any}'>
+		<query ver='1' xmlns='jabber:iq:roster'>
+			<item jid="${Alice's JID}" subscription='none' ask='subscribe' />
+		</query>
+	</iq>
+
+	                                                    
+
+Bob receives:
+	<presence from="${Alice's JID}" type="subscribed" />
+
+Bob disconnects
+
+Alice sends:
+	<iq type="get" id="roster1">
+		<query xmlns="jabber:iq:roster"/>
+	</iq>
+
+Alice receives:
+	<iq type="result" id="roster1">
+		<query xmlns="jabber:iq:roster" ver="{scansion:any}">
+			<item jid="${Bob's JID}" subscription="from" />
+		</query>
+	</iq>
+
+Alice disconnects
+
+Bob disconnects
-- 
cgit v1.2.3


From 228ec67d9790822defd4cf7d64bb1de6f479f0aa Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 19 Dec 2019 16:22:12 +0100
Subject: scansion: Trim trailing whitespace in tests

---
 spec/scansion/presence_preapproval.scs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/scansion/presence_preapproval.scs')

diff --git a/spec/scansion/presence_preapproval.scs b/spec/scansion/presence_preapproval.scs
index ce6158d2..e34ac7cf 100644
--- a/spec/scansion/presence_preapproval.scs
+++ b/spec/scansion/presence_preapproval.scs
@@ -39,7 +39,7 @@ Bob sends:
 
 Bob receives:
 	<presence from="${Bob's full JID}"/>
-	
+
 Bob sends:
 	<presence to="${Alice's JID}" type="subscribe" />
 
@@ -50,7 +50,7 @@ Bob receives:
 		</query>
 	</iq>
 
-	                                                    
+
 
 Bob receives:
 	<presence from="${Alice's JID}" type="subscribed" />
-- 
cgit v1.2.3