[packages/lighttpd.git] / lighttpd-mod_evasive-status_code.patch

--- lighttpd-1.4.19/src/mod_evasive.c	2008-09-19 17:50:24.307245276 +0300
+++ lighttpd-1.4.22/src/mod_evasive.c	2009-05-12 02:21:58.524447939 +0300
@@ -28,11 +28,15 @@
 typedef struct {
 	unsigned short max_conns;
 	unsigned short silent;
+	unsigned short http_status_code;
+	unsigned int retry_after;
 } plugin_config;
 
 typedef struct {
 	PLUGIN_DATA;
 
+	buffer *evasive_rftmp;
+
 	plugin_config **config_storage;
 
 	plugin_config conf;
@@ -46,6 +50,10 @@
 
 	p = calloc(1, sizeof(*p));
 
+	p->evasive_rftmp = buffer_init();
+	
+	buffer_prepare_copy(p->evasive_rftmp, 255);
+
 	return p;
 }
 
@@ -56,6 +64,8 @@
 
 	if (!p) return HANDLER_GO_ON;
 
+	buffer_free(p->evasive_rftmp);
+
 	if (p->config_storage) {
 		size_t i;
 		for (i = 0; i < srv->config_context->used; i++) {
@@ -73,8 +83,10 @@
 	size_t i = 0;
 
 	config_values_t cv[] = {
-		{ "evasive.max-conns-per-ip",    NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 1 */
-		{ "evasive.silent",              NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */
+		{ "evasive.max-conns-per-ip",    NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 0 */
+		{ "evasive.silent",              NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+		{ "evasive.http-status-code",    NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 2 */
+		{ "evasive.retry-after",         NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 3 */
 		{ NULL,                          NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
 	};
 
@@ -84,10 +96,14 @@
 		plugin_config *s;
 
 		s = calloc(1, sizeof(plugin_config));
-		s->max_conns       = 0;
-		s->silent          = 0;
+		s->max_conns        = 0;
+		s->silent           = 0;
+		s->http_status_code = 503;
+		s->retry_after      = 0;
 
 		cv[0].destination = &(s->max_conns);
+		cv[2].destination = &(s->http_status_code);
+		cv[3].destination = &(s->retry_after);
 
 		p->config_storage[i] = s;
 
@@ -107,6 +123,8 @@
 
 	PATCH(max_conns);
 	PATCH(silent);
+	PATCH(http_status_code);
+	PATCH(retry_after);
 
 	/* skip the first, the global context */
 	for (i = 1; i < srv->config_context->used; i++) {
@@ -124,6 +142,10 @@
 				PATCH(max_conns);
 			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.silent"))) {
 				PATCH(silent);
+			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.http-status-code"))) {
+				PATCH(http_status_code);
+			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.retry-after"))) {
+				PATCH(retry_after);
 			}
 		}
 	}
@@ -192,8 +214,10 @@
 				inet_ntop_cache_get_ip(srv, &(con->dst_addr)),
 				"turned away. Too many connections.");
 
-			con->http_status = 403;
 			con->mode = DIRECT;
+			con->http_status = p->conf.http_status_code;
+			buffer_copy_long(p->evasive_rftmp, p->conf.retry_after);
+			response_header_overwrite(srv, con, CONST_STR_LEN("Retry-After"), CONST_BUF_LEN(p->evasive_rftmp));
 			return HANDLER_FINISHED;
 		}
 	}
Commit	Line	Data
	1	--- lighttpd-1.4.19/src/mod_evasive.c 2008-09-19 17:50:24.307245276 +0300
	2	+++ lighttpd-1.4.22/src/mod_evasive.c 2009-05-12 02:21:58.524447939 +0300
	3	@@ -28,11 +28,15 @@
	4	typedef struct {
	5	unsigned short max_conns;
	6	unsigned short silent;
	7	+ unsigned short http_status_code;
	8	+ unsigned int retry_after;
	9	} plugin_config;
	10
	11	typedef struct {
	12	PLUGIN_DATA;
	13
	14	+ buffer *evasive_rftmp;
	15	+
	16	plugin_config **config_storage;
	17
	18	plugin_config conf;
	19	@@ -46,6 +50,10 @@
	20
	21	p = calloc(1, sizeof(*p));
	22
	23	+ p->evasive_rftmp = buffer_init();
	24	+
	25	+ buffer_prepare_copy(p->evasive_rftmp, 255);
	26	+
	27	return p;
	28	}
	29
	30	@@ -56,6 +64,8 @@
	31
	32	if (!p) return HANDLER_GO_ON;
	33
	34	+ buffer_free(p->evasive_rftmp);
	35	+
	36	if (p->config_storage) {
	37	size_t i;
	38	for (i = 0; i < srv->config_context->used; i++) {
	39	@@ -73,8 +83,10 @@
	40	size_t i = 0;
	41
	42	config_values_t cv[] = {
	43	- { "evasive.max-conns-per-ip", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
	44	- { "evasive.silent", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */
	45	+ { "evasive.max-conns-per-ip", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
	46	+ { "evasive.silent", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
	47	+ { "evasive.http-status-code", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 2 */
	48	+ { "evasive.retry-after", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 3 */
	49	{ NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
	50	};
	51
	52	@@ -84,10 +96,14 @@
	53	plugin_config *s;
	54
	55	s = calloc(1, sizeof(plugin_config));
	56	- s->max_conns = 0;
	57	- s->silent = 0;
	58	+ s->max_conns = 0;
	59	+ s->silent = 0;
	60	+ s->http_status_code = 503;
	61	+ s->retry_after = 0;
	62
	63	cv[0].destination = &(s->max_conns);
	64	+ cv[2].destination = &(s->http_status_code);
	65	+ cv[3].destination = &(s->retry_after);
	66
	67	p->config_storage[i] = s;
	68
	69	@@ -107,6 +123,8 @@
	70
	71	PATCH(max_conns);
	72	PATCH(silent);
	73	+ PATCH(http_status_code);
	74	+ PATCH(retry_after);
	75
	76	/* skip the first, the global context */
	77	for (i = 1; i < srv->config_context->used; i++) {
	78	@@ -124,6 +142,10 @@
	79	PATCH(max_conns);
	80	} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.silent"))) {
	81	PATCH(silent);
	82	+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.http-status-code"))) {
	83	+ PATCH(http_status_code);
	84	+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.retry-after"))) {
	85	+ PATCH(retry_after);
	86	}
	87	}
	88	}
	89	@@ -192,8 +214,10 @@
	90	inet_ntop_cache_get_ip(srv, &(con->dst_addr)),
	91	"turned away. Too many connections.");
	92
	93	- con->http_status = 403;
	94	con->mode = DIRECT;
	95	+ con->http_status = p->conf.http_status_code;
	96	+ buffer_copy_long(p->evasive_rftmp, p->conf.retry_after);
	97	+ response_header_overwrite(srv, con, CONST_STR_LEN("Retry-After"), CONST_BUF_LEN(p->evasive_rftmp));
	98	return HANDLER_FINISHED;
	99	}
	100	}