author | Thilo Cestonaro <thilo@cestona.ro> |
Sun, 01 Nov 2009 10:38:51 +0100 | |
changeset 77 | 85b8622ccffd |
parent 74 | d70813f7d90a |
child 79 | 34f5818c90e9 |
permissions | -rw-r--r-- |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
1 |
-- Copyright (C) 2009 Thilo Cestonaro |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
2 |
-- |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
3 |
-- This project is MIT/X11 licensed. Please see the |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
4 |
-- COPYING file in the source package for more information. |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
5 |
-- |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
6 |
|
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
7 |
if module:get_host_type() ~= "component" then |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
8 |
error("proxy65 should be loaded as a component, please see http://prosody.im/doc/components", 0); |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
9 |
end |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
10 |
|
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
11 |
local jid_split = require "util.jid".split; |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
12 |
local st = require "util.stanza"; |
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
13 |
local componentmanager = require "core.componentmanager"; |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
14 |
local config_get = require "core.configmanager".get; |
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
15 |
local connlisteners = require "net.connlisteners"; |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
16 |
local sha1 = require "util.hashes".sha1; |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
17 |
|
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
18 |
local host, name = module:get_host(), "SOCKS5 Bytestreams Service"; |
72
2bf6c7c590a1
mod_proxy65: component register and deregister are with "_component" appended
Thilo Cestonaro <thilo@cestona.ro>
parents:
70
diff
changeset
|
19 |
local sessions, transfers, component, replies_cache = {}, {}, nil, {}; |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
20 |
|
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
21 |
local proxy_port = config_get(host, "core", "proxy65_port") or 5000; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
22 |
local proxy_interface = config_get(host, "core", "proxy65_interface") or "*"; |
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
23 |
local proxy_address = config_get(host, "core", "proxy65_address") or (proxy_interface ~= "*" and proxy_interface) or host; |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
24 |
|
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
25 |
local connlistener = { default_port = proxy_port, default_interface = proxy_interface, default_mode = "*a" }; |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
26 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
27 |
function connlistener.listener(conn, data) |
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
28 |
local session = sessions[conn] or {}; |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
29 |
|
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
30 |
if session.setup == nil and data ~= nil and data:sub(1):byte() == 0x05 and data:len() > 2 then |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
31 |
local nmethods = data:sub(2):byte(); |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
32 |
local methods = data:sub(3); |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
33 |
local supported = false; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
34 |
for i=1, nmethods, 1 do |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
35 |
if(methods:sub(i):byte() == 0x00) then -- 0x00 == method: NO AUTH |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
36 |
supported = true; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
37 |
break; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
38 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
39 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
40 |
if(supported) then |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
41 |
module:log("debug", "new session found ... ") |
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
42 |
session.setup = true; |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
43 |
sessions[conn] = session; |
69
87dfd34dceb2
mod_proxy65: removed unneeded var and session stuff
Thilo Cestonaro <thilo@cestona.ro>
parents:
68
diff
changeset
|
44 |
conn.write(string.char(5, 0)); |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
45 |
end |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
46 |
return; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
47 |
end |
70
d3afb1403aa7
mod_proxy65: Remove unused bin2hex function, and compact more code. Finally down <200 lines :)
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
48 |
if session.setup then |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
49 |
if session.sha ~= nil and transfers[session.sha] ~= nil then |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
50 |
local sha = session.sha; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
51 |
if transfers[sha].activated == true and transfers[sha].initiator == conn and transfers[sha].target ~= nil then |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
52 |
transfers[sha].target.write(data); |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
53 |
return; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
54 |
end |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
55 |
end |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
56 |
if data ~= nil and data:len() == 0x2F and -- 40 == length of SHA1 HASH, and 7 other bytes => 47 => 0x2F |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
57 |
data:sub(1):byte() == 0x05 and -- SOCKS5 has 5 in first byte |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
58 |
data:sub(2):byte() == 0x01 and -- CMD must be 1 |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
59 |
data:sub(3):byte() == 0x00 and -- RSV must be 0 |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
60 |
data:sub(4):byte() == 0x03 and -- ATYP must be 3 |
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
61 |
data:sub(5):byte() == 40 and -- SHA1 HASH length must be 40 (0x28) |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
62 |
data:sub(-2):byte() == 0x00 and -- PORT must be 0, size 2 byte |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
63 |
data:sub(-1):byte() == 0x00 |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
64 |
then |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
65 |
local sha = data:sub(6, 45); -- second param is not count! it's the ending index (included!) |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
66 |
if transfers[sha] == nil then |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
67 |
transfers[sha] = {}; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
68 |
transfers[sha].activated = false; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
69 |
transfers[sha].target = conn; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
70 |
session.sha = sha; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
71 |
module:log("debug", "target connected ... "); |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
72 |
elseif transfers[sha].target ~= nil then |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
73 |
transfers[sha].initiator = conn; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
74 |
session.sha = sha; |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
75 |
module:log("debug", "initiator connected ... "); |
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
76 |
end |
69
87dfd34dceb2
mod_proxy65: removed unneeded var and session stuff
Thilo Cestonaro <thilo@cestona.ro>
parents:
68
diff
changeset
|
77 |
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) |
66
b86ae5e21a56
mod_proxy65: done! Who wants to test? :)
Thilo Cestonaro <thilo@cestona.ro>
parents:
65
diff
changeset
|
78 |
end |
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
79 |
else |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
80 |
if data ~= nil then |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
81 |
module:log("debug", "unknown connection with no authentication data -> closing it"); |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
82 |
conn.close(); |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
83 |
end |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
84 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
85 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
86 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
87 |
function connlistener.disconnect(conn, err) |
77
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
88 |
local session = sessions[conn]; |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
89 |
if session then |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
90 |
if session.sha and transfers[session.sha] then |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
91 |
local initiator, target = transfers[session.sha].initiator, transfers[session.sha].target; |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
92 |
if initiator == conn then |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
93 |
target.close(); |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
94 |
elseif target == conn then |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
95 |
initiator.close(); |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
96 |
end |
85b8622ccffd
mod_proxy65: close unknown connection with no authentication data, close target if initator hangs up and vica versa
Thilo Cestonaro <thilo@cestona.ro>
parents:
74
diff
changeset
|
97 |
end |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
98 |
-- Clean up any session-related stuff here |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
99 |
sessions[conn] = nil; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
100 |
end |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
101 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
102 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
103 |
local function get_disco_info(stanza) |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
104 |
local reply = replies_cache.disco_info; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
105 |
if reply == nil then |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
106 |
reply = st.iq({type='result', from=host}):query("http://jabber.org/protocol/disco#info") |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
107 |
:tag("identity", {category='proxy', type='bytestreams', name=name}):up() |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
108 |
:tag("feature", {var="http://jabber.org/protocol/bytestreams"}); |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
109 |
replies_cache.disco_info = reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
110 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
111 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
112 |
reply.attr.id = stanza.attr.id; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
113 |
reply.attr.to = stanza.attr.from; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
114 |
return reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
115 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
116 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
117 |
local function get_disco_items(stanza) |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
118 |
local reply = replies_cache.disco_items; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
119 |
if reply == nil then |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
120 |
reply = st.iq({type='result', from=host}):query("http://jabber.org/protocol/disco#items"); |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
121 |
replies_cache.disco_info = reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
122 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
123 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
124 |
reply.attr.id = stanza.attr.id; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
125 |
reply.attr.to = stanza.attr.from; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
126 |
return reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
127 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
128 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
129 |
local function get_stream_host(stanza) |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
130 |
local reply = replies_cache.stream_host; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
131 |
local sid = stanza.tags[1].attr.sid; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
132 |
if reply == nil then |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
133 |
reply = st.iq({type="result", from=host}) |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
134 |
:query("http://jabber.org/protocol/bytestreams") |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
135 |
:tag("streamhost", {jid=host, host=proxy_address, port=proxy_port}); -- TODO get the correct data |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
136 |
replies_cache.stream_host = reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
137 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
138 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
139 |
reply.attr.id = stanza.attr.id; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
140 |
reply.attr.to = stanza.attr.from; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
141 |
reply.tags[1].attr.sid = sid; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
142 |
return reply; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
143 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
144 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
145 |
module.unload = function() |
72
2bf6c7c590a1
mod_proxy65: component register and deregister are with "_component" appended
Thilo Cestonaro <thilo@cestona.ro>
parents:
70
diff
changeset
|
146 |
componentmanager.deregister_component(host); |
74
d70813f7d90a
mod_proxy65: make it work again
Thilo Cestonaro <thilo@cestona.ro>
parents:
73
diff
changeset
|
147 |
connlisteners.deregister(module.host .. ':proxy65'); |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
148 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
149 |
|
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
150 |
local function set_activation(stanza) |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
151 |
local from, to, sid, reply = nil; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
152 |
from = stanza.attr.from; |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
153 |
if stanza.tags[1] ~= nil and tostring(stanza.tags[1].name) == "query" then |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
154 |
if stanza.tags[1].attr ~= nil then |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
155 |
sid = stanza.tags[1].attr.sid; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
156 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
157 |
if stanza.tags[1].tags[1] ~= nil and tostring(stanza.tags[1].tags[1].name) == "activate" then |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
158 |
to = stanza.tags[1].tags[1][1]; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
159 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
160 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
161 |
if from ~= nil and to ~= nil and sid ~= nil then |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
162 |
reply = st.iq({type="result", from=host}); |
65
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
163 |
reply.attr.id = stanza.attr.id; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
164 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
165 |
return reply, from, to, sid; |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
166 |
end |
a35eb0764ac6
mod_proxy65: tcp connection of initiator and target are established
Thilo Cestonaro <thilo@cestona.ro>
parents:
64
diff
changeset
|
167 |
|
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
168 |
function handle_to_domain(origin, stanza) |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
169 |
local to_node, to_host, to_resource = jid_split(stanza.attr.to); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
170 |
if to_node == nil then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
171 |
local type = stanza.attr.type; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
172 |
if type == "error" or type == "result" then return; end |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
173 |
if stanza.name == "iq" and type == "get" then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
174 |
local xmlns = stanza.tags[1].attr.xmlns |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
175 |
if xmlns == "http://jabber.org/protocol/disco#info" then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
176 |
origin.send(get_disco_info(stanza)); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
177 |
return true; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
178 |
elseif xmlns == "http://jabber.org/protocol/disco#items" then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
179 |
origin.send(get_disco_items(stanza)); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
180 |
return true; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
181 |
elseif xmlns == "http://jabber.org/protocol/bytestreams" then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
182 |
origin.send(get_stream_host(stanza)); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
183 |
return true; |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
184 |
end |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
185 |
elseif stanza.name == "iq" and type == "set" then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
186 |
local reply, from, to, sid = set_activation(stanza); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
187 |
if reply ~= nil and from ~= nil and to ~= nil and sid ~= nil then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
188 |
local sha = sha1(sid .. from .. to, true); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
189 |
if transfers[sha] == nil then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
190 |
module:log("error", "transfers[sha]: nil"); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
191 |
elseif(transfers[sha] ~= nil and transfers[sha].initiator ~= nil and transfers[sha].target ~= nil) then |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
192 |
origin.send(reply); |
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
193 |
transfers[sha].activated = true; |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
194 |
end |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
195 |
end |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
196 |
end |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
197 |
end |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
198 |
return; |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
199 |
end |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
200 |
|
73
adb9d1b879c2
mod_proxy65: changed the listener name to be unique on a per component basis and display a good error description when connlistener register fails
Thilo Cestonaro <thilo@cestona.ro>
parents:
72
diff
changeset
|
201 |
if not connlisteners.register(module.host .. ':proxy65', connlistener) then |
68
0df3e4d1f1a3
mod_proxy65: Reviewed and re-factored the code, added proxy_address to specify the address which the proxy advertises for clients to connect to
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
202 |
error("mod_proxy65: Could not establish a connection listener. Check your configuration please."); |
73
adb9d1b879c2
mod_proxy65: changed the listener name to be unique on a per component basis and display a good error description when connlistener register fails
Thilo Cestonaro <thilo@cestona.ro>
parents:
72
diff
changeset
|
203 |
error(" one possible cause for this would be that two proxy65 components share the same port."); |
64
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
204 |
end |
853c3c7e9936
mod_proxy65: remove the proxy65 folder
Thilo Cestonaro <thilo@cestona.ro>
parents:
diff
changeset
|
205 |
|
74
d70813f7d90a
mod_proxy65: make it work again
Thilo Cestonaro <thilo@cestona.ro>
parents:
73
diff
changeset
|
206 |
connlisteners.start(module.host .. ':proxy65'); |
72
2bf6c7c590a1
mod_proxy65: component register and deregister are with "_component" appended
Thilo Cestonaro <thilo@cestona.ro>
parents:
70
diff
changeset
|
207 |
component = componentmanager.register_component(host, handle_to_domain); |