From 2b0083790b89bc9be5ba7ee1cae812bf57134b6a Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 7 Dec 2008 03:12:22 +0000 Subject: Slightly more secure dialback secret generation --- core/s2smanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/s2smanager.lua b/core/s2smanager.lua index ae834a9c..7827381d 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -43,7 +43,7 @@ local log = logger_init("s2smanager"); local sha256_hash = require "util.hashes".sha256; -local dialback_secret = "This is very secret!!! Ha!"; +local dialback_secret = sha256_hash(tostring{} .. math.random() .. socket.gettime(), true); local dns = require "net.dns"; -- cgit v1.2.3 From 8d26c23a92e18fb829cafe285b11b2ff2f693be7 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 7 Dec 2008 03:12:56 +0000 Subject: Small logging adjustment for mod_posix --- plugins/mod_posix.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 8dc4c77d..7559d3ed 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -35,15 +35,13 @@ if not config_get("*", "core", "no_daemonize") then log("info", "Daemonized to pid %d", ret); os.exit(0); else - log("info", "Successfully daemonized"); - if logwriter then local ok, ret = logger_set(logwriter); if not ok then log("error", "Couldn't set new log output: %s", ret); end end - + log("info", "Successfully daemonized"); end end module:add_event_hook("server-starting", daemonize_server); -- cgit v1.2.3 From 1fedb0c64940adc497f12338abe1e0a60d7958c6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 7 Dec 2008 19:04:23 +0000 Subject: stanza_dispatch = core_process_stanza, fixed for xmpp{client,server} listeners, and sessionmanager for the new syntax --- core/sessionmanager.lua | 2 +- net/xmppclient_listener.lua | 5 +---- net/xmppserver_listener.lua | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index a597e724..34cc9f0f 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -69,7 +69,7 @@ function destroy_session(session, err) local pres = st.presence{ type = "unavailable" }; if (not err) or err == "closed" then err = "connection closed"; end pres:tag("status"):text("Disconnected: "..err); - session.stanza_dispatch(pres); + session:dispatch_stanza(pres); end -- Remove session/resource from user's session list diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index c2326a55..ce45ab92 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -126,10 +126,7 @@ function xmppclient.listener(conn, data) session_reset_stream(session); -- Initialise, ready for use - -- Debug version -- - --local function handleerr(err) print("Traceback:", err, debug.traceback()); end - --session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end - + session.stanza_dispatch = streamcallbacks.handlestanza; end if data then session.data(conn, data); diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index e4816b1e..ffc0b24b 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -129,9 +129,7 @@ function xmppserver.listener(conn, data) session_reset_stream(session); -- Initialise, ready for use - -- Debug version -- --- local function handleerr(err) print("Traceback:", err, debug.traceback()); end --- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end + session.stanza_dispatch = streamcallbacks.handlestanza; end if data then session.data(conn, data); -- cgit v1.2.3 From d3e7e2f1a7007f79edd38daf0adcf63e4fe950e3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 7 Dec 2008 19:12:50 +0000 Subject: Typo in variable name in last commit --- net/xmppclient_listener.lua | 2 +- net/xmppserver_listener.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index ce45ab92..e54445b0 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -126,7 +126,7 @@ function xmppclient.listener(conn, data) session_reset_stream(session); -- Initialise, ready for use - session.stanza_dispatch = streamcallbacks.handlestanza; + session.stanza_dispatch = stream_callbacks.handlestanza; end if data then session.data(conn, data); diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index ffc0b24b..4d2840e7 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -129,7 +129,7 @@ function xmppserver.listener(conn, data) session_reset_stream(session); -- Initialise, ready for use - session.stanza_dispatch = streamcallbacks.handlestanza; + session.stanza_dispatch = stream_callbacks.handlestanza; end if data then session.data(conn, data); -- cgit v1.2.3