Mercurial > prosody-hg
annotate loader.lua @ 14218:926f25af2ffe 13.0
util.tlsref: New util library to encapsulate the Mozilla/TLSRef recommendations
Previously we embedded this data directly into core.certmanager. This splits
it out, for various benefits:
- Removes data from the business logic (the config parsing is complex enough
as it is)
- Allows easier testing and tracking of the data (this commit adds various
consistency checks, so that we can have more confidence in future updates
to the data not breaking stuff)
This library also supports multiple versions of the recommendations.
Previously we picked a single version, and put that into certmanager. But this
meant we had to make choices for our users, and one of the choices is between
advancing security standards and ensuring we don't break connectivity for
people doing minor upgrades (deterring people from performing minor upgrades
would have a security impact too).
This library supports the concept of a "default" and a "latest" version, so we
are now free to add new versions into stable releases, and admins can pick
between compatibility and security.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Jun 2026 13:01:56 +0100 |
| parents | ef586363d90f |
| children | 76ece4dd9782 |
| rev | line source |
|---|---|
|
12948
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
1 -- Allow for both require"util.foo" and require"prosody.util.foo" for a |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
2 -- transition period while we update all require calls. |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
3 |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
4 if (...) == "prosody.loader" then |
| 14062 | 5 -- For require"util.foo" also look in paths equivalent to "prosody.util.foo" |
| 6 package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); | |
| 7 package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); | |
|
12948
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
8 else |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
9 -- When requiring "prosody.x", also look for "x" |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
10 for i = #package.searchers, 1, -1 do |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
11 local search = package.searchers[i]; |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
12 table.insert(package.searchers, i, function(module_name) |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
13 local lib = module_name:match("^prosody%.(.*)$"); |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
14 if lib then |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
15 return search(lib); |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
16 end |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
17 end) |
|
29983f09c913
prosody.loader: Incorporate search path rewrite patch from Debian packages
Kim Alvefur <zash@zash.se>
parents:
12947
diff
changeset
|
18 end |
|
12947
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 end |
|
12949
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
20 |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
21 -- Look for already loaded module with or without prefix |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
22 setmetatable(package.loaded, { |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
23 __index = function(loaded, module_name) |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
24 local suffix = module_name:match("^prosody%.(.*)$"); |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
25 if suffix then |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
26 return rawget(loaded, suffix); |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
27 end |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
28 local prefixed = rawget(loaded, "prosody." .. module_name); |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
29 if prefixed ~= nil then |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
30 return prefixed; |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
31 end |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
32 end; |
|
2f61ebcf37c0
prosody.loader: Ensure already loaded modules are found in old and new namespaces
Kim Alvefur <zash@zash.se>
parents:
12948
diff
changeset
|
33 }) |
