aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-02-28 20:06:26 +0100
committerKim Alvefur <zash@zash.se>2018-02-28 20:06:26 +0100
commit43b814a83bc1e20d15d3cd38ddcf108d8e3ca356 (patch)
tree0f24fe5bf868191f9e33931f28c9db16e098d2bb
parent8e377a8d5586e64f4c75e0b40e7b84de6e2a7972 (diff)
downloadprosody-43b814a83bc1e20d15d3cd38ddcf108d8e3ca356.tar.gz
prosody-43b814a83bc1e20d15d3cd38ddcf108d8e3ca356.zip
vairious: Add annotation when an empty environment is set [luacheck]
-rw-r--r--core/certmanager.lua1
-rw-r--r--core/configmanager.lua1
-rw-r--r--core/hostmanager.lua1
-rw-r--r--core/loggingmanager.lua1
-rw-r--r--core/modulemanager.lua1
-rw-r--r--core/portmanager.lua1
-rw-r--r--core/rostermanager.lua1
-rw-r--r--core/s2smanager.lua1
-rw-r--r--core/sessionmanager.lua1
-rw-r--r--core/storagemanager.lua1
-rw-r--r--core/usermanager.lua1
-rw-r--r--net/adns.lua1
-rw-r--r--net/connlisteners.lua1
-rw-r--r--net/dns.lua1
-rw-r--r--net/http.lua1
-rw-r--r--net/httpserver.lua1
-rw-r--r--net/server_epoll.lua1
-rw-r--r--util/caps.lua1
-rw-r--r--util/dataforms.lua1
-rw-r--r--util/datamanager.lua1
-rw-r--r--util/datetime.lua1
-rw-r--r--util/events.lua1
-rw-r--r--util/filters.lua1
-rw-r--r--util/jid.lua1
-rw-r--r--util/logger.lua1
-rw-r--r--util/multitable.lua1
-rw-r--r--util/sasl.lua1
-rw-r--r--util/sasl/anonymous.lua1
-rw-r--r--util/sasl/digest-md5.lua1
-rw-r--r--util/sasl/external.lua1
-rw-r--r--util/sasl/plain.lua1
-rw-r--r--util/sasl/scram.lua1
-rw-r--r--util/sasl_cyrus.lua1
-rw-r--r--util/serialization.lua1
-rw-r--r--util/set.lua1
-rw-r--r--util/sql.lua1
-rw-r--r--util/sslconfig.lua1
-rw-r--r--util/stanza.lua1
-rw-r--r--util/template.lua1
-rw-r--r--util/termcolours.lua1
-rw-r--r--util/throttle.lua1
-rw-r--r--util/timer.lua1
-rw-r--r--util/watchdog.lua1
-rw-r--r--util/x509.lua1
-rw-r--r--util/xml.lua1
-rw-r--r--util/xmppstream.lua1
46 files changed, 46 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 1cbdac5d..3c1bd454 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -55,6 +55,7 @@ local luasec_has = softreq"ssl.config" or {
};
local _ENV = nil;
+-- luacheck: std none
-- Global SSL options if not overridden per-host
local global_ssl_config = configmanager.get("*", "ssl");
diff --git a/core/configmanager.lua b/core/configmanager.lua
index bb55d3f8..111c22a1 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -24,6 +24,7 @@ local nameprep = encodings and encodings.stringprep.nameprep or function (host)
local _M = {};
local _ENV = nil;
+-- luacheck: std none
_M.resolve_relative_path = resolve_relative_path; -- COMPAT
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 54944e29..43dabf99 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -27,6 +27,7 @@ local tostring, type = tostring, type;
local setmetatable = setmetatable;
local _ENV = nil;
+-- luacheck: std none
local host_mt = { }
function host_mt:__tostring()
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 004f4c3b..7fab30df 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -24,6 +24,7 @@ _G.log = logger.init("general");
prosody.log = logger.init("general");
local _ENV = nil;
+-- luacheck: std none
-- The log config used if none specified in the config file (see reload_logging for initialization)
local default_logging;
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 771f6fb1..c23043df 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -38,6 +38,7 @@ local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s
local _G = _G;
local _ENV = nil;
+-- luacheck: std none
local load_modules_for_host, load, unload, reload, get_module, get_items;
local get_modules, is_loaded, module_has_method, call_module_method;
diff --git a/core/portmanager.lua b/core/portmanager.lua
index 5b6476f3..1ed37da0 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -15,6 +15,7 @@ local prosody = prosody;
local fire_event = prosody.events.fire_event;
local _ENV = nil;
+-- luacheck: std none
--- Config
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 65be0de0..c8b94734 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -23,6 +23,7 @@ local st = require "util.stanza";
local storagemanager = require "core.storagemanager";
local _ENV = nil;
+-- luacheck: std none
local save_roster; -- forward declaration
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 1e8b1120..de13b3eb 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -23,6 +23,7 @@ local incoming_s2s = incoming_s2s;
local fire_event = prosody.events.fire_event;
local _ENV = nil;
+-- luacheck: std none
local function new_incoming(conn)
local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} };
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index e9771c58..4f2b3ecc 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -26,6 +26,7 @@ local initialize_filters = require "util.filters".initialize;
local gettime = require "socket".gettime;
local _ENV = nil;
+-- luacheck: std none
local function new_session(conn)
local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() };
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 1c0ef3bb..0aac947d 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -12,6 +12,7 @@ local log = require "util.logger".init("storagemanager");
local prosody = prosody;
local _ENV = nil;
+-- luacheck: std none
local olddm = {}; -- maintain old datamanager, for backwards compatibility
for k,v in pairs(datamanager) do olddm[k] = v; end
diff --git a/core/usermanager.lua b/core/usermanager.lua
index f795e8ae..ca1666ed 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -24,6 +24,7 @@ local setmetatable = setmetatable;
local default_provider = "internal_plain";
local _ENV = nil;
+-- luacheck: std none
local function new_null_provider()
local function dummy() return nil, "method not implemented"; end;
diff --git a/net/adns.lua b/net/adns.lua
index a19cbd59..560e4b53 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -17,6 +17,7 @@ local setmetatable = setmetatable;
local function dummy_send(sock, data, i, j) return (j-i)+1; end
local _ENV = nil;
+-- luacheck: std none
local async_resolver_methods = {};
local async_resolver_mt = { __index = async_resolver_methods };
diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 38cf8f08..259b80ee 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -3,6 +3,7 @@ local log = require "util.logger".init("net.connlisteners");
local traceback = debug.traceback;
local _ENV = nil;
+-- luacheck: std none
local function fail()
log("error", "Attempt to use legacy connlisteners API. For more info see https://prosody.im/doc/developers/network");
diff --git a/net/dns.lua b/net/dns.lua
index e6749025..08f5b121 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -73,6 +73,7 @@ local default_timeout = 15;
-------------------------------------------------- module dns
local _ENV = nil;
+-- luacheck: std none
local dns = {};
diff --git a/net/http.lua b/net/http.lua
index 8a669321..c17d734c 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -27,6 +27,7 @@ local error = error
local log = require "util.logger".init("http");
local _ENV = nil;
+-- luacheck: std none
local requests = {}; -- Open requests
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 56561306..f77b3dac 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -3,6 +3,7 @@ local log = require "util.logger".init("net.httpserver");
local traceback = debug.traceback;
local _ENV = nil;
+-- luacheck: std none
function fail()
log("error", "Attempt to use legacy HTTP API. For more info see https://prosody.im/doc/developers/legacy_http");
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index 3ce1be5a..b62bad83 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -28,6 +28,7 @@ local _SOCKETINVALID = socket._SOCKETINVALID or -1;
assert(socket.tcp6 and socket.tcp4, "Incompatible LuaSocket version");
local _ENV = nil;
+-- luacheck: std none
local default_config = { __index = {
read_timeout = 900;
diff --git a/util/caps.lua b/util/caps.lua
index cd5ff9c0..de492edb 100644
--- a/util/caps.lua
+++ b/util/caps.lua
@@ -13,6 +13,7 @@ local t_insert, t_sort, t_concat = table.insert, table.sort, table.concat;
local ipairs = ipairs;
local _ENV = nil;
+-- luacheck: std none
local function calculate_hash(disco_info)
local identities, features, extensions = {}, {}, {};
diff --git a/util/dataforms.lua b/util/dataforms.lua
index 469ce976..9f11bed2 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -14,6 +14,7 @@ local st = require "util.stanza";
local jid_prep = require "util.jid".prep;
local _ENV = nil;
+-- luacheck: std none
local xmlns_forms = 'jabber:x:data';
diff --git a/util/datamanager.lua b/util/datamanager.lua
index bd402b51..cf96887b 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -40,6 +40,7 @@ pcall(function()
end);
local _ENV = nil;
+-- luacheck: std none
---- utils -----
local encode, decode, store_encode;
diff --git a/util/datetime.lua b/util/datetime.lua
index abb4e867..06be9fc2 100644
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -15,6 +15,7 @@ local os_difftime = os.difftime;
local tonumber = tonumber;
local _ENV = nil;
+-- luacheck: std none
local function date(t)
return os_date("!%Y-%m-%d", t);
diff --git a/util/events.lua b/util/events.lua
index a71d118f..78700d65 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -15,6 +15,7 @@ local setmetatable = setmetatable;
local next = next;
local _ENV = nil;
+-- luacheck: std none
local function new()
-- Map event name to ordered list of handlers (lazily built): handlers[event_name] = array_of_handler_functions
diff --git a/util/filters.lua b/util/filters.lua
index f405c0bd..f30dfd9c 100644
--- a/util/filters.lua
+++ b/util/filters.lua
@@ -9,6 +9,7 @@
local t_insert, t_remove = table.insert, table.remove;
local _ENV = nil;
+-- luacheck: std none
local new_filter_hooks = {};
diff --git a/util/jid.lua b/util/jid.lua
index f402b7f4..37c48193 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -25,6 +25,7 @@ local unescapes = {};
for k,v in pairs(escapes) do unescapes[v] = k; end
local _ENV = nil;
+-- luacheck: std none
local function split(jid)
if not jid then return; end
diff --git a/util/logger.lua b/util/logger.lua
index ee257868..795b0b06 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -10,6 +10,7 @@
local pairs = pairs;
local _ENV = nil;
+-- luacheck: std none
local level_sinks = {};
diff --git a/util/multitable.lua b/util/multitable.lua
index b790dd7f..8d32ed8a 100644
--- a/util/multitable.lua
+++ b/util/multitable.lua
@@ -12,6 +12,7 @@ local pairs, next, type = pairs, next, type;
local unpack = table.unpack or unpack; --luacheck: ignore 113 143
local _ENV = nil;
+-- luacheck: std none
local function get(self, ...)
local t = self.data;
diff --git a/util/sasl.lua b/util/sasl.lua
index 3c5b8be0..50851405 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -20,6 +20,7 @@ local assert = assert;
local require = require;
local _ENV = nil;
+-- luacheck: std none
--[[
Authentication Backend Prototypes:
diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua
index acbb35a9..88e13b40 100644
--- a/util/sasl/anonymous.lua
+++ b/util/sasl/anonymous.lua
@@ -15,6 +15,7 @@
local generate_uuid = require "util.uuid".generate;
local _ENV = nil;
+-- luacheck: std none
--=========================
--SASL ANONYMOUS according to RFC 4505
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index 695dd2a3..7542a037 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -26,6 +26,7 @@ local generate_uuid = require "util.uuid".generate;
local nodeprep = require "util.encodings".stringprep.nodeprep;
local _ENV = nil;
+-- luacheck: std none
--=========================
--SASL DIGEST-MD5 according to RFC 2831
diff --git a/util/sasl/external.lua b/util/sasl/external.lua
index 5ba90190..ce50743e 100644
--- a/util/sasl/external.lua
+++ b/util/sasl/external.lua
@@ -1,6 +1,7 @@
local saslprep = require "util.encodings".stringprep.saslprep;
local _ENV = nil;
+-- luacheck: std none
local function external(self, message)
message = saslprep(message);
diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua
index cd59b1ac..00c6bd20 100644
--- a/util/sasl/plain.lua
+++ b/util/sasl/plain.lua
@@ -17,6 +17,7 @@ local nodeprep = require "util.encodings".stringprep.nodeprep;
local log = require "util.logger".init("sasl");
local _ENV = nil;
+-- luacheck: std none
-- ================================
-- SASL PLAIN according to RFC 4616
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 0163de5d..15c15d68 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -26,6 +26,7 @@ local char = string.char;
local byte = string.byte;
local _ENV = nil;
+-- luacheck: std none
--=========================
--SASL SCRAM-SHA-1 according to RFC 5802
diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index 4e9a4af5..a6bd0628 100644
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -61,6 +61,7 @@ local sasl_errstring = {
setmetatable(sasl_errstring, { __index = function() return "undefined error!" end });
local _ENV = nil;
+-- luacheck: std none
local method = {};
method.__index = method;
diff --git a/util/serialization.lua b/util/serialization.lua
index 206f5fbb..54c8110f 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -21,6 +21,7 @@ local log = require "util.logger".init("serialization");
local envload = require"util.envload".envload;
local _ENV = nil;
+-- luacheck: std none
local indent = function(i)
return string_rep("\t", i);
diff --git a/util/set.lua b/util/set.lua
index 8630638e..a4f20138 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -11,6 +11,7 @@ local ipairs, pairs, setmetatable, next, tostring =
local t_concat = table.concat;
local _ENV = nil;
+-- luacheck: std none
local set_mt = { __name = "set" };
function set_mt.__call(set, _, k)
diff --git a/util/sql.lua b/util/sql.lua
index 9648101a..67a5d683 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -14,6 +14,7 @@ DBI.Drivers();
local build_url = require "socket.url".build;
local _ENV = nil;
+-- luacheck: std none
local column_mt = {};
local table_mt = {};
diff --git a/util/sslconfig.lua b/util/sslconfig.lua
index 4c4e1d48..5c685f7d 100644
--- a/util/sslconfig.lua
+++ b/util/sslconfig.lua
@@ -8,6 +8,7 @@ local t_insert = table.insert;
local setmetatable = setmetatable;
local _ENV = nil;
+-- luacheck: std none
local handlers = { };
local finalisers = { };
diff --git a/util/stanza.lua b/util/stanza.lua
index 42b6abc3..a593a49b 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -37,6 +37,7 @@ end
local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas";
local _ENV = nil;
+-- luacheck: std none
local stanza_mt = { __name = "stanza" };
stanza_mt.__index = stanza_mt;
diff --git a/util/template.lua b/util/template.lua
index bc56020c..c11037c5 100644
--- a/util/template.lua
+++ b/util/template.lua
@@ -10,6 +10,7 @@ local t_remove = table.remove;
local parse_xml = require "util.xml".parse;
local _ENV = nil;
+-- luacheck: std none
local function trim_xml(stanza)
for i=#stanza,1,-1 do
diff --git a/util/termcolours.lua b/util/termcolours.lua
index 23c9156b..829d84af 100644
--- a/util/termcolours.lua
+++ b/util/termcolours.lua
@@ -26,6 +26,7 @@ end
local orig_color = windows and windows.get_consolecolor and windows.get_consolecolor();
local _ENV = nil;
+-- luacheck: std none
local stylemap = {
reset = 0; bright = 1, dim = 2, underscore = 4, blink = 5, reverse = 7, hidden = 8;
diff --git a/util/throttle.lua b/util/throttle.lua
index 1012f78a..d2036e9e 100644
--- a/util/throttle.lua
+++ b/util/throttle.lua
@@ -3,6 +3,7 @@ local gettime = require "util.time".now
local setmetatable = setmetatable;
local _ENV = nil;
+-- luacheck: std none
local throttle = {};
local throttle_mt = { __index = throttle };
diff --git a/util/timer.lua b/util/timer.lua
index c7996bfa..ff834068 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -16,6 +16,7 @@ local tostring = tostring;
local xpcall = xpcall;
local _ENV = nil;
+-- luacheck: std none
local _add_task = server.add_task;
diff --git a/util/watchdog.lua b/util/watchdog.lua
index aa8c6486..516e60e4 100644
--- a/util/watchdog.lua
+++ b/util/watchdog.lua
@@ -3,6 +3,7 @@ local setmetatable = setmetatable;
local os_time = os.time;
local _ENV = nil;
+-- luacheck: std none
local watchdog_methods = {};
local watchdog_mt = { __index = watchdog_methods };
diff --git a/util/x509.lua b/util/x509.lua
index f228b201..15cc4d3c 100644
--- a/util/x509.lua
+++ b/util/x509.lua
@@ -25,6 +25,7 @@ local log = require "util.logger".init("x509");
local s_format = string.format;
local _ENV = nil;
+-- luacheck: std none
local oid_commonname = "2.5.4.3"; -- [LDAP] 2.3
local oid_subjectaltname = "2.5.29.17"; -- [PKIX] 4.2.1.6
diff --git a/util/xml.lua b/util/xml.lua
index ec06fb01..dac3f6fe 100644
--- a/util/xml.lua
+++ b/util/xml.lua
@@ -5,6 +5,7 @@ local t_insert = table.insert;
local t_remove = table.remove;
local _ENV = nil;
+-- luacheck: std none
local parse_xml = (function()
local ns_prefixes = {
diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 53cb98ae..8c7851a5 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -25,6 +25,7 @@ local lxp_supports_bytecount = not not lxp.new({}).getcurrentbytecount;
local default_stanza_size_limit = 1024*1024*10; -- 10MB
local _ENV = nil;
+-- luacheck: std none
local new_parser = lxp.new;