Software /
code /
prosody
Annotate
tools/http-status-codes.lua @ 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 | 12271:f31bb79f51d7 |
child | 13142:879a6a33c21b |
rev | line source |
---|---|
9166
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 -- Generate net/http/codes.lua from IANA HTTP status code registry |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 local xml = require "util.xml"; |
12271
f31bb79f51d7
tools: Allow processing instructions in some XML parsing tools
Kim Alvefur <zash@zash.se>
parents:
9166
diff
changeset
|
4 local registry = xml.parse(io.read("*a"), { allow_processing_instructions = true }); |
9166
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 io.write([[ |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 local response_codes = { |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 -- Source: http://www.iana.org/assignments/http-status-codes |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 ]]); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
12 for record in registry:get_child("registry"):childtags("record") do |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 -- Extract values |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
14 local value = record:get_child_text("value"); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 local description = record:get_child_text("description"); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 local ref = record:get_child_text("xref"); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
17 local code = tonumber(value); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 -- Space between major groups |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 if code and code % 100 == 0 then |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 io.write("\n"); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 end |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 -- Reserved and Unassigned entries should be not be included |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 if description == "Reserved" or description == "Unassigned" or description == "(Unused)" then |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 code = nil; |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 end |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 -- Non-empty references become comments |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 if ref and ref:find("%S") then |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 ref = " -- " .. ref; |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 else |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 ref = ""; |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 end |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 io.write((code and "\t[%d] = %q;%s\n" or "\t-- [%s] = %q;%s\n"):format(code or value, description, ref)); |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 end |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
38 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 io.write([[}; |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 for k,v in pairs(response_codes) do response_codes[k] = k.." "..v; end |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 return setmetatable(response_codes, { __index = function(_, k) return k.." Unassigned"; end }) |
cce55767004a
tools: Add a tool to generate net.http.codes from IANA registry
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
43 ]]); |