changeset 2707:dea35dfd5808

Merge
author Kim Alvefur <zash@zash.se>
date Thu, 27 Apr 2017 09:38:30 +0200
parents 3f44abfe7264 (diff) 3e97dae28215 (current diff)
children 07d6077d2db7
files
diffstat 3 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mod_log_http/mod_log_http.lua	Sat Apr 22 11:24:18 2017 +0200
+++ b/mod_log_http/mod_log_http.lua	Thu Apr 27 09:38:30 2017 +0200
@@ -69,7 +69,6 @@
 
 module:hook_object_event(http.events, "response", function (event)
 	module:log("warn", "Received response %d from %s!", event.code, event.url);
-	for k,v in pairs(event.response) do print("=====", k, v) end
 	append_response(event.request.id, event.response);
 end);
 
--- a/mod_onions/mod_onions.lua	Sat Apr 22 11:24:18 2017 +0200
+++ b/mod_onions/mod_onions.lua	Thu Apr 27 09:38:30 2017 +0200
@@ -5,6 +5,7 @@
 local s2s_new_outgoing = require "core.s2smanager".new_outgoing;
 local initialize_filters = require "util.filters".initialize;
 local st = require "util.stanza";
+local socket = require "socket";
 
 local portmanager = require "core.portmanager";
 
@@ -45,7 +46,7 @@
 		return;
 	end
 
-	request_status = byte(data, 2);
+	local request_status = byte(data, 2);
 
 	if not request_status == 0x00 then
 		module:log("debug", "Failed to connect to the SOCKS5 proxy. :(");
--- a/mod_smacks/mod_smacks.lua	Sat Apr 22 11:24:18 2017 +0200
+++ b/mod_smacks/mod_smacks.lua	Thu Apr 27 09:38:30 2017 +0200
@@ -49,8 +49,16 @@
 	if not cache then
 		local store = {};
 		return {
-			get = function(user, key) return store[key]; end;
-			set = function(user, key, value) store[key] = value; end;
+			get = function(user, key)
+				if not user then return nil; end
+				if not key then return nil; end
+				return store[key];
+			end;
+			set = function(user, key, value)
+				if not user then return nil; end
+				if not key then return nil; end
+				store[key] = value;
+			end;
 		};
 	end
 	
@@ -58,12 +66,16 @@
 	local stores = {};
 	return {
 			get = function(user, key)
+				if not user then return nil; end
+				if not key then return nil; end
 				if not stores[user] then
 					stores[user] = cache.new(max_entries, evict_callback);
 				end
 				return stores[user]:get(key);
 			end;
 			set = function(user, key, value)
+				if not user then return nil; end
+				if not key then return nil; end
 				if not stores[user] then stores[user] = cache.new(max_entries, evict_callback); end
 				stores[user]:set(key, value);
 				-- remove empty caches completely
@@ -73,7 +85,7 @@
 end
 local old_session_registry = init_session_cache(max_old_sessions, nil);
 local session_registry = init_session_cache(max_hibernated_sessions, function(resumption_token, session)
-	if session.destroyed then return; end
+	if session.destroyed then return true; end		-- destroyed session can always be removed from cache
 	session.log("warn", "User has too much hibernated sessions, removing oldest session (token: %s)", resumption_token);
 	-- store old session's h values on force delete
 	-- save only actual h value and username/host (for security)