mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index e2cf3cd8c2ee063e2fda740b1528a554209def8c..190d30bef5a9d9fae1b41be3bf1c6c937b3e5776 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -20,6 +20,7 @@ local componentmanager = require "core.componentmanager";
 local config_get = require "core.configmanager".get;
 local connlisteners = require "net.connlisteners";
 local sha1 = require "util.hashes".sha1;
+local server = require "net.server";
 
 local host, name = module:get_host(), "SOCKS5 Bytestreams Service";
 local sessions, transfers, component, replies_cache = {}, {}, nil, {};
@@ -28,6 +29,7 @@ local proxy_port = config_get(host, "core", "proxy65_port") or 5000;
 local proxy_interface = config_get(host, "core", "proxy65_interface") or "*";
 local proxy_address = config_get(host, "core", "proxy65_address") or (proxy_interface ~= "*" and proxy_interface) or host;
 local proxy_acl = config_get(host, "core", "proxy65_acl");
+local max_buffer_size = 4096;
 
 local connlistener = { default_port = proxy_port, default_interface = proxy_interface, default_mode = "*a" };
 
@@ -55,8 +57,12 @@ function connlistener.onincoming(conn, data)
        if session.setup then
                if session.sha ~= nil and transfers[session.sha] ~= nil then
                        local sha = session.sha;
-                       if transfers[sha].activated == true and transfers[sha].initiator == conn and transfers[sha].target ~= nil then
-                               transfers[sha].target:write(data);
+                       if transfers[sha].activated == true and transfers[sha].target ~= nil then
+                               if  transfers[sha].initiator == conn then
+                                       transfers[sha].target:write(data);
+                               else
+                                       transfers[sha].initiator:write(data);
+                               end
                                return;
                        end
                end
@@ -67,7 +73,7 @@ function connlistener.onincoming(conn, data)
                        data:sub(4):byte() == 0x03 and -- ATYP must be 3
                        data:sub(5):byte() == 40 and -- SHA1 HASH length must be 40 (0x28)
                        data:sub(-2):byte() == 0x00 and -- PORT must be 0, size 2 byte
-                       data:sub(-1):byte() == 0x00             
+                       data:sub(-1):byte() == 0x00
                then
                        local sha = data:sub(6, 45); -- second param is not count! it's the ending index (included!)
                        if transfers[sha] == nil then
@@ -80,16 +86,19 @@ function connlistener.onincoming(conn, data)
                                transfers[sha].initiator = conn;
                                session.sha = sha;
                                module:log("debug", "initiator connected ... ");
+                               server.link(conn, transfers[sha].target, max_buffer_size);
+                               server.link(transfers[sha].target, conn, max_buffer_size);
                        end
                        conn:write(string.char(5, 0, 0, 3, sha:len()) .. sha .. string.char(0, 0)); -- VER, REP, RSV, ATYP, BND.ADDR (sha), BND.PORT (2 Byte)
+                       conn:lock_read(true)
                else
                        module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
-                       conn.close();
+                       conn:close();
                end
        else
                if data ~= nil then
                        module:log("warn", "unknown connection with no authentication data -> closing it");
-                       conn.close();
+                       conn:close();
                end
        end
 end
@@ -100,9 +109,9 @@ function connlistener.ondisconnect(conn, err)
                if session.sha and transfers[session.sha] then
                        local initiator, target = transfers[session.sha].initiator, transfers[session.sha].target;
                        if initiator == conn and target ~= nil then
-                               target.close();
+                               target:close();
                        elseif target == conn and initiator ~= nil then
-                               initiator.close();
+                               initiator:close();
                        end
                        transfers[session.sha] = nil;
                end
@@ -227,8 +236,12 @@ function handle_to_domain(origin, stanza)
                        elseif xmlns == "http://jabber.org/protocol/bytestreams" then
                                origin.send(get_stream_host(origin, stanza));
                                return true;
+                       else
+                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+                               return true;
                        end
                elseif stanza.name == "iq" and type == "set" then
+                       module:log("debug", "Received activation request from %s", stanza.attr.from);
                        local reply, from, to, sid = set_activation(stanza);
                        if reply ~= nil and from ~= nil and to ~= nil and sid ~= nil then
                                local sha = sha1(sid .. from .. to, true);
@@ -237,6 +250,17 @@ function handle_to_domain(origin, stanza)
                                elseif(transfers[sha] ~= nil and transfers[sha].initiator ~= nil and transfers[sha].target ~= nil) then
                                        origin.send(reply);
                                        transfers[sha].activated = true;
+                                       transfers[sha].target:lock_read(false);
+                                       transfers[sha].initiator:lock_read(false);
+                               else
+                                       module:log("debug", "Both parties were not yet connected");
+                                       local message = "Neither party is connected to the proxy";
+                                       if transfers[sha].initiator then
+                                               message = "The recipient is not connected to the proxy";
+                                       elseif transfers[sha].target then
+                                               message = "The sender (you) is not connected to the proxy";
+                                       end
+                                       origin.send(st.error_reply(stanza, "cancel", "not-allowed", message));
                                end
                        else
                                module:log("error", "activation failed: sid: %s, initiator: %s, target: %s", tostring(sid), tostring(from), tostring(to));
@@ -247,8 +271,8 @@ function handle_to_domain(origin, stanza)
 end
 
 if not connlisteners.register(module.host .. ':proxy65', connlistener) then
-       error("mod_proxy65: Could not establish a connection listener. Check your configuration please.");
-       error(" one possible cause for this would be that two proxy65 components share the same port.");
+       module:log("error", "mod_proxy65: Could not establish a connection listener. Check your configuration please.");
+       module:log("error", "Possibly two proxy65 components are configured to share the same port.");
 end
 
 connlisteners.start(module.host .. ':proxy65');