Software /
code /
prosody
Annotate
spec/scansion/pubsub_advanced.scs @ 12790:24b55f0e2db9 0.12
mod_http: Allow disabling CORS in the http_cors_override option and by default
Fixes #1779.
Due to an oversight in the logic, if the user set 'enabled' to false in an
override, it would disable the item's requested CORS settings, but still apply
Prosody's default CORS policy.
This change ensures that 'enabled = false' will now disable CORS entirely for
the requested item.
Due to the new structure of the code, it was necessary to have a flag to say
whether CORS is to be applied at all. Rather than hard-coding 'true' here, I
chose to add a new option: 'http_default_cors_enabled'. This is a boolean that
allows the operator to disable Prosody's default CORS policy entirely (the one
that is used when a module or config does not override it). This makes it
easier to disable CORS and then selectively enable it only on services you
want it on.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 31 Oct 2022 14:32:02 +0000 |
parent | 11714:d783716103c1 |
rev | line source |
---|---|
9291
329a670ae975
spec/scansion: Ensure all scripts have sensible titles
Matthew Wild <mwild1@gmail.com>
parents:
9290
diff
changeset
|
1 # Pubsub: Node creation, publish, subscribe, affiliations and delete |
329a670ae975
spec/scansion: Ensure all scripts have sensible titles
Matthew Wild <mwild1@gmail.com>
parents:
9290
diff
changeset
|
2 |
9266
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 [Client] Balthasar |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 jid: admin@localhost |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 password: password |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 [Client] Romeo |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 jid: romeo@localhost |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 password: password |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 [Client] Juliet |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 jid: juliet@localhost |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 password: password |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
15 --------- |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
17 Romeo connects |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
18 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
19 Romeo sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 <iq type="set" to="pubsub.localhost" id='create1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 <create node="princely_musings"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
25 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 Romeo receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 <iq type="error" id='create1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 <error type="auth"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 </error> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
33 Balthasar connects |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
35 Balthasar sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
36 <iq type='set' to='pubsub.localhost' id='create2'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 <pubsub xmlns='http://jabber.org/protocol/pubsub'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 <create node='princely_musings'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 Balthasar receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
43 <iq type="result" id='create2'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 Balthasar sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
46 <iq type="set" to="pubsub.localhost" id='create3'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 <create node="princely_musings"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
52 Balthasar receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 <iq type="error" id='create3'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 <error type="cancel"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
55 <conflict xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
56 </error> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
57 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
58 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
59 Juliet connects |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
60 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
61 Juliet sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
62 <iq type="set" to="pubsub.localhost" id='sub1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
63 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
64 <subscribe node="princely_musings" jid="${Romeo's full JID}"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
65 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
66 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
67 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
68 Juliet receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
69 <iq type="error" id='sub1'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
70 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
71 Juliet sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
72 <iq type="set" to="pubsub.localhost" id='sub2'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
73 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
74 <subscribe node="princely_musings" jid="${Juliet's full JID}"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
75 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
76 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
77 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
78 Juliet receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
79 <iq type="result" id='sub2'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
80 <pubsub xmlns='http://jabber.org/protocol/pubsub'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
81 <subscription jid="${Juliet's full JID}" node='princely_musings' subscription='subscribed'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
82 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
83 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
84 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
85 Balthasar sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
86 <iq type="get" id='aff1' to='pubsub.localhost'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
87 <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
88 <affiliations node="princely_musings"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
90 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 Balthasar receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
93 <iq type="result" id='aff1' from='pubsub.localhost'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> |
9290
decdaaf78f32
spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion
Matthew Wild <mwild1@gmail.com>
parents:
9266
diff
changeset
|
95 <affiliations node="princely_musings"> |
decdaaf78f32
spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion
Matthew Wild <mwild1@gmail.com>
parents:
9266
diff
changeset
|
96 <affiliation affiliation='owner' jid='admin@localhost' xmlns='http://jabber.org/protocol/pubsub#owner'/> |
decdaaf78f32
spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion
Matthew Wild <mwild1@gmail.com>
parents:
9266
diff
changeset
|
97 </affiliations> |
9266
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
98 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
99 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
101 Balthasar sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
102 <iq type="set" id='aff2' to='pubsub.localhost'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
103 <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
104 <affiliations node="princely_musings"> |
9290
decdaaf78f32
spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion
Matthew Wild <mwild1@gmail.com>
parents:
9266
diff
changeset
|
105 <affiliation affiliation='owner' jid='admin@localhost' xmlns='http://jabber.org/protocol/pubsub#owner'/> |
9266
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
106 <affiliation jid="${Romeo's JID}" affiliation="publisher"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
107 </affiliations> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
108 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
109 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
110 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
111 Balthasar receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
112 <iq type="result" id='aff2' from='pubsub.localhost'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
113 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
114 Romeo sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
115 <iq type="set" to="pubsub.localhost" id='pub1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
116 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
117 <publish node="princely_musings"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
118 <item id="current"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
119 <entry xmlns="http://www.w3.org/2005/Atom"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
120 <title>Soliloquy</title> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
121 <summary>Lorem ipsum dolor sit amet</summary> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
122 </entry> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
123 </item> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
124 </publish> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
125 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
126 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
127 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
128 Juliet receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
129 <message type="headline" from="pubsub.localhost"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
130 <event xmlns="http://jabber.org/protocol/pubsub#event"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
131 <items node="princely_musings"> |
11714
d783716103c1
mod_pubsub: Fix inclusion of publisher (fixes #1399)
Kim Alvefur <zash@zash.se>
parents:
11429
diff
changeset
|
132 <item id="current" publisher="${Romeo's JID}"> |
9266
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
133 <entry xmlns="http://www.w3.org/2005/Atom"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
134 <title>Soliloquy</title> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
135 <summary>Lorem ipsum dolor sit amet</summary> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
136 </entry> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
137 </item> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
138 </items> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
139 </event> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
140 </message> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
141 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
142 Romeo receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
143 <iq type="result" id='pub1'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
144 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
145 Juliet sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
146 <iq type="set" to="pubsub.localhost" id='unsub1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
147 <pubsub xmlns="http://jabber.org/protocol/pubsub"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
148 <unsubscribe node="princely_musings" jid="${Juliet's full JID}"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
149 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
150 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
151 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
152 Juliet receives: |
11429
ef623d719894
mod_pubsub: Include <pubsub> with unsubscribe reply
Kim Alvefur <zash@zash.se>
parents:
9291
diff
changeset
|
153 <iq type="result" id='unsub1'> |
ef623d719894
mod_pubsub: Include <pubsub> with unsubscribe reply
Kim Alvefur <zash@zash.se>
parents:
9291
diff
changeset
|
154 <pubsub xmlns='http://jabber.org/protocol/pubsub'> |
ef623d719894
mod_pubsub: Include <pubsub> with unsubscribe reply
Kim Alvefur <zash@zash.se>
parents:
9291
diff
changeset
|
155 <subscription jid="${Juliet's full JID}" node='princely_musings' subscription='none'/> |
ef623d719894
mod_pubsub: Include <pubsub> with unsubscribe reply
Kim Alvefur <zash@zash.se>
parents:
9291
diff
changeset
|
156 </pubsub> |
ef623d719894
mod_pubsub: Include <pubsub> with unsubscribe reply
Kim Alvefur <zash@zash.se>
parents:
9291
diff
changeset
|
157 </iq> |
9266
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
158 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
159 Balthasar sends: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
160 <iq type="set" to="pubsub.localhost" id='del1'> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
161 <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
162 <delete node="princely_musings"/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
163 </pubsub> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
164 </iq> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
165 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
166 Balthasar receives: |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
167 <iq type="result" from='pubsub.localhost' id='del1'/> |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
168 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
169 Romeo disconnects |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
170 |
c5267f5fd6e6
spec/scansion: Add scansion scripts used for testing
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
171 // vim: syntax=xml: |