prosodyctl, util.pluginloader: Remove support for storing plugins in the data store...

diff --git a/prosodyctl b/prosodyctl
index 5bdc51879d0a287d710aa992650bfa78bbd1a4b3..26183b21204af1db3b7ea35f26ea8256e2157645 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -29,14 +29,6 @@ if CFG_DATADIR then
        end
 end
 
--- Global 'prosody' object
-prosody = {
-       hosts = {},
-       events = require "util.events".new(),
-       platform = "posix"
-};
-local prosody = prosody;
-
 config = require "core.configmanager"
 
 do
@@ -71,6 +63,8 @@ if not require "util.dependencies".check_dependencies() then
        os.exit(1);
 end
 
+prosody = { hosts = {}, events = events, platform = "posix" };
+
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 require "util.datamanager".set_data_path(data_path);
 
@@ -120,14 +114,12 @@ local error_messages = setmetatable({
                ["not-running"] = "Prosody is not running";
                }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
 
-hosts = prosody.hosts;
+local events = require "util.events".new();
 
-local function make_host(hostname)
-       return { events = prosody.events, users = require "core.usermanager".new_null_provider(hostname) };
-end
+hosts = prosody.hosts;
 
 for hostname, config in pairs(config.getconfig()) do
-       hosts[hostname] = make_host(hostname);
+       hosts[hostname] = { events = events };
 end
        
 require "core.modulemanager"
@@ -239,23 +231,16 @@ function commands.adduser(arg)
                return 1;
        end
        
-       if not hosts[host] then
-               show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
-               show_warning("The user will not be able to log in until this is changed.");
-               hosts[host] = make_host(host);
-       elseif config.get(host, "core", "authentication")
-               and config.get(host, "core", "authentication") ~= "default" then
-               show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
-                       config.get(host, "core", "authentication"));
-               show_warning("prosodyctl currently only supports the default provider, sorry :(");
-               return 1;
-       end
-       
        if prosodyctl.user_exists{ user = user, host = host } then
                show_message [[That user already exists]];
                return 1;
        end
        
+       if not hosts[host] then
+               show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
+               show_warning("The user will not be able to log in until this is changed.");
+       end
+       
        local password = read_password();
        if not password then return 1; end
        
@@ -284,18 +269,6 @@ function commands.passwd(arg)
                return 1;
        end
        
-       if not hosts[host] then
-               show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
-               show_warning("The user will not be able to log in until this is changed.");
-               hosts[host] = make_host(host);
-       elseif config.get(host, "core", "authentication")
-               and config.get(host, "core", "authentication") ~= "default" then
-               show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
-                       config.get(host, "core", "authentication"));
-               show_warning("prosodyctl currently only supports the default provider, sorry :(");
-               return 1;
-       end
-       
        if not prosodyctl.user_exists { user = user, host = host } then
                show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
                return 1;
@@ -329,18 +302,6 @@ function commands.deluser(arg)
                return 1;
        end
        
-       if not hosts[host] then
-               show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
-               show_warning("The user will not be able to log in until this is changed.");
-               hosts[host] = make_host(host);
-       elseif config.get(host, "core", "authentication")
-               and config.get(host, "core", "authentication") ~= "default" then
-               show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
-                       config.get(host, "core", "authentication"));
-               show_warning("prosodyctl currently only supports the default provider, sorry :(");
-               return 1;
-       end
-
        if not prosodyctl.user_exists { user = user, host = host } then
                show_message [[That user does not exist on this server]]
                return 1;
@@ -538,37 +499,6 @@ function commands.unregister(arg)
        return 1;
 end
 
-local http_errors = {
-       [404] = "Plugin not found, did you type the address correctly?"
-       };
-
-function commands.addplugin(arg)
-       if not arg[1] or arg[1] == "--help" then
-               show_usage("addplugin URL", "Download and install a plugin from a URL");
-               return 1;
-       end
-       local url = arg[1];
-       if url:match("^http://") then
-               local http = require "socket.http";
-               show_message("Fetching...");
-               local code, err = http.request(url);
-               if not code or not tostring(err):match("^[23]") then
-                       show_message("Failed: "..(http_errors[err] or ("HTTP error "..err)));
-                       return 1;
-               end
-               if url:match("%.lua$") then
-                       local ok, err = datamanager.store(url:match("/mod_([^/]+)$"), "*", "plugins", {code});
-                       if not ok then
-                               show_message("Failed to save to data store: "..err);
-                               return 1;
-                       end
-               end
-               show_message("Saved. Don't forget to load the module using the config file or admin console!");
-       else
-               show_message("Sorry, I don't understand how to fetch plugins from there.");
-       end
-end
-
 ---------------------
 
 if command and command:match("^mod_") then -- Is a command in a module

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 90138a3eff86b895e6d719bb5a8cddd2a6096d7c..956b92bd640f2d5b437f43ea8b41bcfea2286568 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -16,12 +16,6 @@ local datamanager = require "util.datamanager";
 
 module "pluginloader"
 
-local function load_from_datastore(name)
-       local content = datamanager.load(name, nil, "plugins");
-       if not content or not content[1] then return nil, "Resource not found"; end
-       return content[1], name;
-end
-
 local function load_file(name)
        local file, err = io_open(plugin_dir..name);
        if not file then return file, err; end
@@ -40,26 +34,9 @@ function load_resource(plugin, resource, loader)
        if not content then content, err = loader(resource); end
        -- TODO add support for packed plugins
        
-       if not content and loader == load_file then
-               return load_resource(plugin, resource, load_from_datastore);
-       end
-       
        return content, err;
 end
 
-function store_resource(plugin, resource, content, metadata)
-       if not resource then
-               resource = "mod_"..plugin..".lua";
-       end
-       local store = { content };
-       if metadata then
-               for k,v in pairs(metadata) do
-                       store[k] = v;
-               end
-       end
-       datamanager.store(plugin.."/"..resource, nil, "plugins", store);
-end
-
 function load_code(plugin, resource)
        local content, err = load_resource(plugin, resource);
        if not content then return content, err; end