projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
plugins
/
mod_http.lua
diff --git
a/plugins/mod_http.lua
b/plugins/mod_http.lua
index a7b4a45fcccfb92e180966dd9dce2962b5750167..8bda1cac2ea5703536c6ad6b3d6acf1f4d8c7828 100644
(file)
--- a/
plugins/mod_http.lua
+++ b/
plugins/mod_http.lua
@@
-1,7
+1,7
@@
-- Prosody IM
-- Copyright (C) 2008-2012 Matthew Wild
-- Copyright (C) 2008-2012 Waqas Hussain
-- Prosody IM
-- Copyright (C) 2008-2012 Matthew Wild
-- Copyright (C) 2008-2012 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
@@
-9,6
+9,7
@@
module:set_global();
module:depends("http_errors");
module:set_global();
module:depends("http_errors");
+local portmanager = require "core.portmanager";
local moduleapi = require "core.moduleapi";
local url_parse = require "socket.url".parse;
local url_build = require "socket.url".build;
local moduleapi = require "core.moduleapi";
local url_parse = require "socket.url".parse;
local url_build = require "socket.url".build;
@@
-38,9
+39,15
@@
local function get_http_event(host, app_path, key)
end
local function get_base_path(host_module, app_name, default_app_path)
end
local function get_base_path(host_module, app_name, default_app_path)
- return normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
+ return
(
normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
or module:get_option("http_paths", {})[app_name] -- Global
or module:get_option("http_paths", {})[app_name] -- Global
- or default_app_path); -- Default
+ or default_app_path)) -- Default
+ :gsub("%$(%w+)", { host = host_module.host });
+end
+
+local function redir_handler(event)
+ event.response.headers.location = event.request.path.."/";
+ return 301;
end
local ports_by_scheme = { http = 80, https = 443, };
end
local ports_by_scheme = { http = 80, https = 443, };
@@
-48,16
+55,19
@@
local ports_by_scheme = { http = 80, https = 443, };
-- Helper to deduce a module's external URL
function moduleapi.http_url(module, app_name, default_path)
app_name = app_name or (module.name:gsub("^http_", ""));
-- Helper to deduce a module's external URL
function moduleapi.http_url(module, app_name, default_path)
app_name = app_name or (module.name:gsub("^http_", ""));
- local ext = url_parse(module:get_option_string("http_external_url")) or {};
+ local external_url = url_parse(module:get_option_string("http_external_url")) or {};
+ if external_url.scheme and external_url.port == nil then
+ external_url.port = ports_by_scheme[external_url.scheme];
+ end
local services = portmanager.get_active_services();
local http_services = services:get("https") or services:get("http") or {};
for interface, ports in pairs(http_services) do
for port, services in pairs(ports) do
local url = {
local services = portmanager.get_active_services();
local http_services = services:get("https") or services:get("http") or {};
for interface, ports in pairs(http_services) do
for port, services in pairs(ports) do
local url = {
- scheme = (ext.scheme or services[1].service.name);
- host = (ext
.host or module.host
);
- port = tonumber(ext.port) or port or 80;
- path = normalize_path(ext.path or "/")..
+ scheme = (ext
ernal_url
.scheme or services[1].service.name);
+ host = (ext
ernal_url.host or module:get_option_string("http_host", module.host)
);
+ port = tonumber(ext
ernal_url
.port) or port or 80;
+ path = normalize_path(ext
ernal_url
.path or "/")..
(get_base_path(module, app_name, default_path or "/"..app_name):sub(2));
}
if ports_by_scheme[url.scheme] == url.port then url.port = nil end
(get_base_path(module, app_name, default_path or "/"..app_name):sub(2));
}
if ports_by_scheme[url.scheme] == url.port then url.port = nil end
@@
-88,12
+98,15
@@
function module.add_host(module)
local data = handler;
handler = function () return data; end
elseif event_name:sub(-2, -1) == "/*" then
local data = handler;
handler = function () return data; end
elseif event_name:sub(-2, -1) == "/*" then
- local base_path
= event_name:match("/(.+)/*
$");
+ local base_path
_len = #event_name:match("/.+
$");
local _handler = handler;
handler = function (event)
local _handler = handler;
handler = function (event)
- local path = event.request.path:sub(
#base_path+1
);
+ local path = event.request.path:sub(
base_path_len
);
return _handler(event, path);
end;
return _handler(event, path);
end;
+ module:hook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
+ elseif event_name:sub(-1, -1) == "/" then
+ module:hook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
end
if not app_handlers[event_name] then
app_handlers[event_name] = handler;
end
if not app_handlers[event_name] then
app_handlers[event_name] = handler;
@@
-106,7
+119,7
@@
function module.add_host(module)
end
end
end
end
end
end
-
+
local function http_app_removed(event)
local app_handlers = apps[event.item.name];
apps[event.item.name] = nil;
local function http_app_removed(event)
local app_handlers = apps[event.item.name];
apps[event.item.name] = nil;
@@
-114,7
+127,7
@@
function module.add_host(module)
module:unhook_object_event(server, event, handler);
end
end
module:unhook_object_event(server, event, handler);
end
end
-
+
module:handle_items("http-provider", http_app_added, http_app_removed);
server.add_host(host);
module:handle_items("http-provider", http_app_added, http_app_removed);
server.add_host(host);
@@
-137,6
+150,13
@@
module:provides("net", {
listener = server.listener;
default_port = 5281;
encryption = "ssl";
listener = server.listener;
default_port = 5281;
encryption = "ssl";
+ ssl_config = {
+ verify = {
+ peer = false,
+ client_once = false,
+ "none",
+ }
+ };
multiplex = {
pattern = "^[A-Z]";
};
multiplex = {
pattern = "^[A-Z]";
};