Software /
code /
prosody
File
spec/scansion/extdisco.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 | 11753:c4599a7c534c |
line wrap: on
line source
# XEP-0215: External Service Discovery [Client] Romeo password: password jid: user@localhost/mFquWxSr ----- Romeo connects Romeo sends: <iq type='get' xml:lang='sv' id='lx2' to='localhost'> <services xmlns='urn:xmpp:extdisco:2'/> </iq> Romeo receives: <iq type='result' id='lx2' from='localhost'> <services xmlns='urn:xmpp:extdisco:2'> <service host='default.example' transport='udp' port='9876' type='stun'/> <service port='9876' type='turn' restricted='1' password='yHYYBDN7M3mdlug0LTdJbW0GvvQ=' transport='udp' host='default.example' username='1219525744'/> <service port='9876' type='turn' restricted='1' password='1Uc6QfrDhIlbK97rGCUQ/cUICxs=' transport='udp' host='default.example' username='1219525744'/> <service port='2121' type='ftp' restricted='1' password='password' transport='tcp' host='default.example' username='john'/> <service port='21' type='ftp' restricted='1' password='password' transport='tcp' host='ftp.example.com' username='john'/> </services> </iq> Romeo sends: <iq type='get' xml:lang='sv' id='lx3' to='localhost'> <services xmlns='urn:xmpp:extdisco:2' type='ftp'/> </iq> Romeo receives: <iq type='result' id='lx3' from='localhost'> <services xmlns='urn:xmpp:extdisco:2'> <service port='2121' type='ftp' restricted='1' password='password' transport='tcp' host='default.example' username='john'/> <service port='21' type='ftp' restricted='1' password='password' transport='tcp' host='ftp.example.com' username='john'/> </services> </iq> Romeo sends: <iq type='get' xml:lang='sv' id='lx4' to='localhost'> <credentials xmlns='urn:xmpp:extdisco:2'> <service host='default.example' type='turn'/> </credentials> </iq> Romeo receives: <iq type='result' id='lx4' from='localhost'> <credentials xmlns='urn:xmpp:extdisco:2'> <service port='9876' type='turn' restricted='1' password='yHYYBDN7M3mdlug0LTdJbW0GvvQ=' transport='udp' host='default.example' username='1219525744'/> <service port='9876' type='turn' restricted='1' password='1Uc6QfrDhIlbK97rGCUQ/cUICxs=' transport='udp' host='default.example' username='1219525744'/> </credentials> </iq> Romeo sends: <iq type='get' xml:lang='sv' id='lx5' to='localhost'> <credentials xmlns='urn:xmpp:extdisco:2'> <service host='default.example' /> </credentials> </iq> Romeo receives: <iq type='error' id='lx5' from='localhost'> <error type='modify'> <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> </error> </iq> Romeo disconnects # recording ended on 2020-07-18T16:47:57Z