From e999fee5c39278f767f7f508a2c0c964ec964cd1 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 30 Nov 2018 23:58:55 +0100
Subject: tests: Add scansion test for #689 about keeping the full subscription
 request stanza

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

(limited to 'spec/scansion')

diff --git a/spec/scansion/keep_full_sub_req.scs b/spec/scansion/keep_full_sub_req.scs
new file mode 100644
index 00000000..318bbb60
--- /dev/null
+++ b/spec/scansion/keep_full_sub_req.scs
@@ -0,0 +1,37 @@
+# server MUST keep a record of the complete presence stanza comprising the subscription request (#689)
+
+[Client] Alice
+	jid: pars-a@localhost
+	password: password
+
+[Client] Bob
+	jid: pars-b@localhost
+	password: password
+
+---------
+
+Alice connects
+
+Alice sends:
+	<presence to="${Bob's JID}" type="subscribe">
+		<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
+	</presence>
+
+Alice disconnects
+
+Bob connects
+
+Bob sends:
+	<presence/>
+
+Bob receives:
+	<presence from="${Bob's full JID}"/>
+	
+
+Bob receives:
+	<presence from="${Alice's JID}">
+		<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
+	</presence>
+
+Bob disconnects
+
-- 
cgit v1.2.3


From 296555762ed5a515998d4b85d6d7fd4d9bfb62e5 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 1 Dec 2018 18:02:58 +0100
Subject: spec/keep_full_sub_req: Add missing type attribute

---
 spec/scansion/keep_full_sub_req.scs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/scansion')

diff --git a/spec/scansion/keep_full_sub_req.scs b/spec/scansion/keep_full_sub_req.scs
index 318bbb60..3b80b8b2 100644
--- a/spec/scansion/keep_full_sub_req.scs
+++ b/spec/scansion/keep_full_sub_req.scs
@@ -29,7 +29,7 @@ Bob receives:
 	
 
 Bob receives:
-	<presence from="${Alice's JID}">
+	<presence from="${Alice's JID}" type="subscribe">
 		<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
 	</presence>
 
-- 
cgit v1.2.3


From 8aac387431c7dad47c6afffc4bfcc024d3147950 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 1 Dec 2018 18:07:56 +0100
Subject: spec/keep_full_sub_req: Verify that the presence subscription stays
 the same after a reconnect

---
 spec/scansion/keep_full_sub_req.scs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'spec/scansion')

diff --git a/spec/scansion/keep_full_sub_req.scs b/spec/scansion/keep_full_sub_req.scs
index 3b80b8b2..5a5e1fdf 100644
--- a/spec/scansion/keep_full_sub_req.scs
+++ b/spec/scansion/keep_full_sub_req.scs
@@ -27,6 +27,23 @@ Bob sends:
 Bob receives:
 	<presence from="${Bob's full JID}"/>
 	
+Bob receives:
+	<presence from="${Alice's JID}" type="subscribe">
+		<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
+	</presence>
+
+Bob disconnects
+
+# Works if they reconnect too
+
+Bob connects
+
+Bob sends:
+	<presence/>
+
+Bob receives:
+	<presence from="${Bob's full JID}"/>
+
 
 Bob receives:
 	<presence from="${Alice's JID}" type="subscribe">
-- 
cgit v1.2.3


From c295aedbfeeab6ebacb9b5bece085b8a532a7e9d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 1 Dec 2018 18:12:01 +0100
Subject: spec/keep_full_sub_req: Make the second connect a differenct device
 (workaround for scansion issue)

scansion threw an error when a client connected again
---
 spec/scansion/keep_full_sub_req.scs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'spec/scansion')

diff --git a/spec/scansion/keep_full_sub_req.scs b/spec/scansion/keep_full_sub_req.scs
index 5a5e1fdf..244c1d55 100644
--- a/spec/scansion/keep_full_sub_req.scs
+++ b/spec/scansion/keep_full_sub_req.scs
@@ -8,6 +8,10 @@
 	jid: pars-b@localhost
 	password: password
 
+[Client] Bob's phone
+	jid: pars-b@localhost/phone
+	password: password
+
 ---------
 
 Alice connects
@@ -36,19 +40,19 @@ Bob disconnects
 
 # Works if they reconnect too
 
-Bob connects
+Bob's phone connects
 
-Bob sends:
+Bob's phone sends:
 	<presence/>
 
-Bob receives:
-	<presence from="${Bob's full JID}"/>
+Bob's phone receives:
+	<presence from="${Bob's phone's full JID}"/>
 
 
-Bob receives:
+Bob's phone receives:
 	<presence from="${Alice's JID}" type="subscribe">
 		<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
 	</presence>
 
-Bob disconnects
+Bob's phone disconnects
 
-- 
cgit v1.2.3


From c28be4a630e1e6872438a5822de098295b55b925 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 6 Dec 2018 17:54:50 +0100
Subject: MUC: Add test case for #667

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

(limited to 'spec/scansion')

diff --git a/spec/scansion/muc_subject_issue_667.scs b/spec/scansion/muc_subject_issue_667.scs
new file mode 100644
index 00000000..68f4c17a
--- /dev/null
+++ b/spec/scansion/muc_subject_issue_667.scs
@@ -0,0 +1,79 @@
+# #667 MUC message with subject and body SHALL NOT be interpreted as a subject change
+
+[Client] Romeo
+	password: password
+	jid: romeo@localhost
+
+-----
+
+Romeo connects
+
+# and creates a room
+Romeo sends:
+	<presence to="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc"/>
+	</presence>
+
+Romeo receives:
+	<presence from="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc#user">
+			<status code="201"/>
+			<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
+			<status code="110"/>
+		</x>
+	</presence>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost">
+		<subject/>
+	</message>
+
+Romeo sends:
+	<message to="issue667@conference.localhost" type="groupchat">
+		<subject>Greetings</subject>
+		<body>Hello everyone</body>
+	</message>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<subject>Greetings</subject>
+		<body>Hello everyone</body>
+	</message>
+
+Romeo sends:
+	<message to="issue667@conference.localhost" type="groupchat">
+		<subject>Something to talk about</subject>
+	</message>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<subject>Something to talk about</subject>
+	</message>
+
+Romeo sends:
+	<presence to="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc"/>
+	</presence>
+
+Romeo receives:
+	<presence from="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc#user">
+			<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
+			<status code="110"/>
+		</x>
+	</presence>
+
+# These have delay tags but we ignore those for now
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<subject>Greetings</subject>
+		<body>Hello everyone</body>
+	</message>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<subject>Something to talk about</subject>
+	</message>
+
+Romeo disconnects
+
-- 
cgit v1.2.3


From b1c3c4bc382df869fab3783a1ba35261e81420a6 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 11 Dec 2018 23:24:14 +0100
Subject: spec/scansion/prosody.cfg.lua: Update a comment from
 prosody.cfg.lua.dist for easier comparisons

---
 spec/scansion/prosody.cfg.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/scansion')

diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index 94861449..170371e1 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -14,7 +14,7 @@ modules_enabled = {
 
 	-- Not essential, but recommended
 		"carbons"; -- Keep multiple clients in sync
-		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
 		"private"; -- Private XML storage (for room bookmarks, etc.)
 		"blocklist"; -- Allow users to block communications with other users
 		"vcard"; -- Allow users to set vCards
-- 
cgit v1.2.3


From 35c3393bca3c7ce6f64ef22f0c2bfa133e4367e1 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 11 Dec 2018 23:25:16 +0100
Subject: spec/scansion/prosody.cfg.lua: Replace mod_vcard with mod_vcard4 and
 mod_vcard_legacy as in default config

---
 spec/scansion/prosody.cfg.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'spec/scansion')

diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index 170371e1..e8872bff 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -17,7 +17,8 @@ modules_enabled = {
 		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
 		"private"; -- Private XML storage (for room bookmarks, etc.)
 		"blocklist"; -- Allow users to block communications with other users
-		"vcard"; -- Allow users to set vCards
+		"vcard4"; -- User profiles (stored in PEP)
+		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
 
 	-- Nice to have
 		"version"; -- Replies to server version requests
-- 
cgit v1.2.3


From a270e6d5c8798dfad2fcd624f7ebb34ec72238a2 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 11 Dec 2018 23:26:16 +0100
Subject: spec/scansion/prosody.cfg.lua: Add remaining modules listened in
 prosody.cfg.lua.dist for easier comparisons

---
 spec/scansion/prosody.cfg.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'spec/scansion')

diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index e8872bff..8d6e7c0a 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -27,6 +27,11 @@ modules_enabled = {
 		"ping"; -- Replies to XMPP pings with pongs
 		"register"; -- Allow users to register on this server using a client and change passwords
 		--"mam"; -- Store messages in an archive and allow users to access it
+		--"csi_simple"; -- Simple Mobile optimizations
+
+	-- Admin interfaces
+		--"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
 	-- HTTP modules
 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-- 
cgit v1.2.3


From 09d88cefa5738c1ec7a60c50c73685c2378335d4 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 16 Dec 2018 22:49:58 +0100
Subject: MUC: Add another message to #667 test

---
 spec/scansion/muc_subject_issue_667.scs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'spec/scansion')

diff --git a/spec/scansion/muc_subject_issue_667.scs b/spec/scansion/muc_subject_issue_667.scs
index 68f4c17a..859a0bfd 100644
--- a/spec/scansion/muc_subject_issue_667.scs
+++ b/spec/scansion/muc_subject_issue_667.scs
@@ -50,6 +50,16 @@ Romeo receives:
 		<subject>Something to talk about</subject>
 	</message>
 
+Romeo sends:
+	<message to="issue667@conference.localhost" type="groupchat">
+		<body>Lorem ipsum dolor sit amet</body>
+	</message>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<body>Lorem ipsum dolor sit amet</body>
+	</message>
+
 Romeo sends:
 	<presence to="issue667@conference.localhost/Romeo">
 		<x xmlns="http://jabber.org/protocol/muc"/>
@@ -70,6 +80,11 @@ Romeo receives:
 		<body>Hello everyone</body>
 	</message>
 
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<body>Lorem ipsum dolor sit amet</body>
+	</message>
+
 Romeo receives:
 	<message type="groupchat" from="issue667@conference.localhost/Romeo">
 		<subject>Something to talk about</subject>
-- 
cgit v1.2.3


From 826c511cac78d521e6f336a658f50d66cb10d78a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 16 Dec 2018 22:53:56 +0100
Subject: MUC: Add descriptive comments to #667 test

---
 spec/scansion/muc_subject_issue_667.scs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'spec/scansion')

diff --git a/spec/scansion/muc_subject_issue_667.scs b/spec/scansion/muc_subject_issue_667.scs
index 859a0bfd..417f957a 100644
--- a/spec/scansion/muc_subject_issue_667.scs
+++ b/spec/scansion/muc_subject_issue_667.scs
@@ -23,11 +23,13 @@ Romeo receives:
 		</x>
 	</presence>
 
+# the default (empty) subject
 Romeo receives:
 	<message type="groupchat" from="issue667@conference.localhost">
 		<subject/>
 	</message>
 
+# this should be treated as a normal message
 Romeo sends:
 	<message to="issue667@conference.localhost" type="groupchat">
 		<subject>Greetings</subject>
@@ -40,6 +42,7 @@ Romeo receives:
 		<body>Hello everyone</body>
 	</message>
 
+# this is a subject change
 Romeo sends:
 	<message to="issue667@conference.localhost" type="groupchat">
 		<subject>Something to talk about</subject>
@@ -50,6 +53,7 @@ Romeo receives:
 		<subject>Something to talk about</subject>
 	</message>
 
+# a message without <subject>
 Romeo sends:
 	<message to="issue667@conference.localhost" type="groupchat">
 		<body>Lorem ipsum dolor sit amet</body>
@@ -60,11 +64,13 @@ Romeo receives:
 		<body>Lorem ipsum dolor sit amet</body>
 	</message>
 
+# Resync
 Romeo sends:
 	<presence to="issue667@conference.localhost/Romeo">
 		<x xmlns="http://jabber.org/protocol/muc"/>
 	</presence>
 
+# Presences
 Romeo receives:
 	<presence from="issue667@conference.localhost/Romeo">
 		<x xmlns="http://jabber.org/protocol/muc#user">
@@ -73,6 +79,7 @@ Romeo receives:
 		</x>
 	</presence>
 
+# History
 # These have delay tags but we ignore those for now
 Romeo receives:
 	<message type="groupchat" from="issue667@conference.localhost/Romeo">
@@ -85,6 +92,7 @@ Romeo receives:
 		<body>Lorem ipsum dolor sit amet</body>
 	</message>
 
+# Finally, the topic
 Romeo receives:
 	<message type="groupchat" from="issue667@conference.localhost/Romeo">
 		<subject>Something to talk about</subject>
-- 
cgit v1.2.3


From 24a020bbaa7d9d99d26330e2639f9249511f84cd Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 16 Dec 2018 22:59:14 +0100
Subject: MUC: Test that subject is still empty after sending a non-subject
 change message with a subject (#667)

---
 spec/scansion/muc_subject_issue_667.scs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'spec/scansion')

diff --git a/spec/scansion/muc_subject_issue_667.scs b/spec/scansion/muc_subject_issue_667.scs
index 417f957a..74980073 100644
--- a/spec/scansion/muc_subject_issue_667.scs
+++ b/spec/scansion/muc_subject_issue_667.scs
@@ -42,6 +42,33 @@ Romeo receives:
 		<body>Hello everyone</body>
 	</message>
 
+# Resync
+Romeo sends:
+	<presence to="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc"/>
+	</presence>
+
+# Presences
+Romeo receives:
+	<presence from="issue667@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc#user">
+			<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
+			<status code="110"/>
+		</x>
+	</presence>
+
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost/Romeo">
+		<subject>Greetings</subject>
+		<body>Hello everyone</body>
+	</message>
+
+# the still empty subject
+Romeo receives:
+	<message type="groupchat" from="issue667@conference.localhost">
+		<subject/>
+	</message>
+
 # this is a subject change
 Romeo sends:
 	<message to="issue667@conference.localhost" type="groupchat">
-- 
cgit v1.2.3