diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-02-01 21:28:07 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-02-01 21:28:07 +0000 |
| commit | 6cb4a340b97827f572c55b87b254352e20e38f4a (patch) | |
| tree | b1ba3e9f2c4c1b332f4b0264453b7b9c01952163 | |
| parent | 83d80d03ff08842f1d36a38136ad778ba9ff3a25 (diff) | |
| parent | d0c5e1571fcd0d0242815c1076d56ecf917eec13 (diff) | |
| download | prosody-6cb4a340b97827f572c55b87b254352e20e38f4a.tar.gz prosody-6cb4a340b97827f572c55b87b254352e20e38f4a.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/moduleapi.lua | 5 | ||||
| -rw-r--r-- | util/pluginloader.lua | 15 | ||||
| -rw-r--r-- | util/random.lua | 8 |
3 files changed, 23 insertions, 5 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 114a97a7..bdf9959f 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -137,10 +137,7 @@ function api:wrap_global(event, handler) end function api:require(lib) - local f, n = pluginloader.load_code(self.name, lib..".lib.lua", self.environment); - if not f then - f, n = pluginloader.load_code(lib, lib..".lib.lua", self.environment); - end + local f, n = pluginloader.load_code_ext(self.name, lib, "lib.lua", self.environment); if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message return f(); end diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 0d7eafa7..004855f0 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -55,8 +55,23 @@ local function load_code(plugin, resource, env) return f, path; end +local function load_code_ext(plugin, resource, extension, env) + local content, err = load_resource(plugin, resource.."."..extension); + if not content then + content, err = load_resource(resource, resource.."."..extension); + if not content then + return content, err; + end + end + local path = err; + local f, err = envload(content, "@"..path, env); + if not f then return f, err; end + return f, path; +end + return { load_file = load_file; load_resource = load_resource; load_code = load_code; + load_code_ext = load_code_ext; }; diff --git a/util/random.lua b/util/random.lua index 05f36aba..e4b4a700 100644 --- a/util/random.lua +++ b/util/random.lua @@ -6,7 +6,7 @@ -- COPYING file in the source package for more information. -- -local urandom = assert(io.open("/dev/urandom", "r")); +local urandom, urandom_err = io.open("/dev/urandom", "r"); local function seed() end @@ -15,6 +15,12 @@ local function bytes(n) return urandom:read(n); end +if not urandom then + function bytes() + error("Unable to obtain a secure random number generator, please see https://prosody.im/doc/random ("..urandom_err..")"); + end +end + return { seed = seed; bytes = bytes; |