# HG changeset patch
# User Marco Cirillo <maranda@lightwitch.org>
# Date 1329083887 0
# Node ID 15763c1d085cc8c4ecf2223becc3cdac702fd91f
# Parent  d87a9e1e6d30dd7355a88de8c9d701a8482a0fc2
mod_c2s_conn_throttle: renamed mod_c2s_auth_throttle, hooks at features and takes in account stream renegotiation.

diff -r d87a9e1e6d30 -r 15763c1d085c mod_c2s_auth_throttle/mod_c2s_auth_throttle.lua
--- a/mod_c2s_auth_throttle/mod_c2s_auth_throttle.lua	Sun Feb 12 18:26:02 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
--- Clients Connection Throttler.
--- Usage:
--- Add the module into modules loaded into the virtual host section
---
--- cthrottler_logins_count = 3 -> number of logins attempt allowed
--- cthrottler_time = 120 -> in x seconds
-
-local time = os.time
-local in_count = {}
-local logins_count = module:get_option_number("cthrottler_logins_count", 3)
-local throttle_time = module:get_option_number("cthrottler_time", 60)
-
-local function handle_sessions(event)
-	local session = event.origin
-
-	if not in_count[session.ip] and session.type == "c2s_unauthed" then
-		in_count[session.ip] = { t = time(), c = 1 }
-	elseif in_count[session.ip] and session.type == "c2s_unauthed" then
-		in_count[session.ip].c = in_count[session.ip].c + 1
-		
-		if in_count[session.ip].c > logins_count and time() - in_count[session.ip].t < throttle_time then
-			module:log("error", "Exceeded login count for %s, closing connection", session.ip)
-			session:close{ condition = "policy-violation", text = "You exceeded the number of connections/logins allowed in "..throttle_time.." seconds, good bye." }
-			return true
-		elseif time() - in_count[session.ip].t > throttle_time then
-			in_count[session.ip] = nil ; return
-		end
-	end	
-end
-
-module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", handle_sessions, 100)
-module:hook("stanza/iq/jabber:iq:auth:query", handle_sessions, 100) -- Legacy?
diff -r d87a9e1e6d30 -r 15763c1d085c mod_c2s_conn_throttle/mod_c2s_conn_throttle.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mod_c2s_conn_throttle/mod_c2s_conn_throttle.lua	Sun Feb 12 21:58:07 2012 +0000
@@ -0,0 +1,42 @@
+-- Clients Connection Throttler.
+-- Usage:
+-- Add the module into modules loaded into the virtual host section
+--
+-- cthrottler_logins_count = 3 -> number of logins attempt allowed
+-- cthrottler_time = 120 -> in x seconds
+
+local time = os.time
+local in_count = {}
+local logins_count = module:get_option_number("cthrottler_logins_count", 3)
+local throttle_time = module:get_option_number("cthrottler_time", 60)
+
+local function handle_sessions(event)
+	local session = event.origin
+
+	if not in_count[session.ip] and session.type == "c2s_unauthed" then
+		in_count[session.ip] = { t = time(), c = 1 }
+	elseif in_count[session.ip] and session.type == "c2s_unauthed" then
+		if in_count[session.ip].starttls_c then in_count[session.ip].c = in_count[session.ip].starttls_c else in_count[session.ip].c = in_count[session.ip].c + 1 end
+		
+		if in_count[session.ip].c > logins_count and time() - in_count[session.ip].t < throttle_time then
+			module:log("error", "Exceeded login count for %s, closing connection", session.ip)
+			session:close{ condition = "policy-violation", text = "You exceeded the number of connections/logins allowed in "..throttle_time.." seconds, good bye." }
+			return true
+		elseif time() - in_count[session.ip].t > throttle_time then
+			in_count[session.ip] = nil ; return
+		end
+	end	
+end
+
+local function check_starttls(event)
+	local session = event.origin
+
+	if in_count[session.ip] and type(in_count[session.ip].starttls_c) ~= "number" and session.type == "c2s_unauthed" then
+		in_count[session.ip].starttls_c = 1
+	elseif in_count[session.ip] and type(in_count[session.ip].starttls_c) == "number" and session.type == "c2s_unauthed" then
+		in_count[session.ip].starttls_c = in_count[session.ip].starttls_c + 1
+	end
+end
+
+module:hook("stream-features", handle_sessions, 100)
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", check_starttls, 100)