{ "max_nick_time", CF_TIME, NULL, 0, &ConfigFileEntry.max_nick_time },
{ "max_nick_changes", CF_INT, NULL, 0, &ConfigFileEntry.max_nick_changes },
{ "max_targets", CF_INT, NULL, 0, &ConfigFileEntry.max_targets },
- { "max_unknown_ip", CF_INT, NULL, 0, &ConfigFileEntry.max_unknown_ip },
{ "min_nonwildcard", CF_INT, NULL, 0, &ConfigFileEntry.min_nonwildcard },
{ "nick_delay", CF_TIME, NULL, 0, &ConfigFileEntry.nick_delay },
{ "no_oper_flood", CF_YESNO, NULL, 0, &ConfigFileEntry.no_oper_flood },
{ "reject_after_count", CF_INT, NULL, 0, &ConfigFileEntry.reject_after_count },
{ "reject_ban_time", CF_TIME, NULL, 0, &ConfigFileEntry.reject_ban_time },
{ "reject_duration", CF_TIME, NULL, 0, &ConfigFileEntry.reject_duration },
+ { "throttle_count", CF_INT, NULL, 0, &ConfigFileEntry.throttle_count },
+ { "throttle_duration", CF_TIME, NULL, 0, &ConfigFileEntry.throttle_duration },
{ "short_motd", CF_YESNO, NULL, 0, &ConfigFileEntry.short_motd },
{ "stats_c_oper_only", CF_YESNO, NULL, 0, &ConfigFileEntry.stats_c_oper_only },
{ "stats_e_disabled", CF_YESNO, NULL, 0, &ConfigFileEntry.stats_e_disabled },
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
- * $Id: reject.c 3456 2007-05-18 19:14:18Z jilles $
+ * $Id: reject.c 25119 2008-03-13 16:57:05Z androsyn $
*/
#include "stdinc.h"
-#include "config.h"
#include "client.h"
#include "s_conf.h"
#include "reject.h"
#include "s_stats.h"
-#include "msg.h"
+#include "ircd.h"
+#include "send.h"
+#include "numeric.h"
+#include "parse.h"
+#include "hostmask.h"
+#include "match.h"
#include "hash.h"
+static rb_patricia_tree_t *global_tree;
static rb_patricia_tree_t *reject_tree;
-rb_dlink_list delay_exit;
+static rb_dlink_list delay_exit;
static rb_dlink_list reject_list;
+static rb_dlink_list throttle_list;
+static rb_patricia_tree_t *throttle_tree;
+static void throttle_expires(void *unused);
-static rb_patricia_tree_t *unknown_tree;
-struct reject_data
+typedef struct _reject_data
{
rb_dlink_node rnode;
time_t time;
unsigned int count;
uint32_t mask_hashv;
-};
+} reject_t;
+
+typedef struct _delay_data
+{
+ rb_dlink_node node;
+ rb_fde_t *F;
+} delay_t;
+
+typedef struct _throttle
+{
+ rb_dlink_node node;
+ time_t last;
+ int count;
+} throttle_t;
+
+unsigned long
+delay_exit_length(void)
+{
+ return rb_dlink_list_length(&delay_exit);
+}
static void
reject_exit(void *unused)
{
- struct Client *client_p;
rb_dlink_node *ptr, *ptr_next;
-
+ delay_t *ddata;
+ static const char *errbuf = "ERROR :Closing Link: (*** Banned (cache))\r\n";
+
RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
{
- client_p = ptr->data;
- if(IsDead(client_p))
- continue;
-
- /* this MUST be here, to prevent the possibility
- * sendto_one() generates a write error, and then a client
- * ends up on the dead_list and the abort_list --fl
- *
- * new disconnect notice stolen from ircu --nenolod
- * no, this only happens when someone's IP has some
- * ban on it and rejects them rather longer than the
- * ircu message suggests --jilles
- */
- if(!IsIOError(client_p))
- {
- if(IsExUnknown(client_p))
- sendto_one(client_p, "ERROR :Closing Link: %s (*** Too many unknown connections)", client_p->host);
- else
- sendto_one(client_p, "ERROR :Closing Link: %s (*** Banned (cache))", client_p->host);
- }
- close_connection(client_p);
- SetDead(client_p);
- rb_dlinkAddAlloc(client_p, &dead_list);
+ ddata = ptr->data;
+
+ rb_write(ddata->F, errbuf, strlen(errbuf));
+ rb_close(ddata->F);
+ rb_free(ddata);
}
- delay_exit.head = delay_exit.tail = NULL;
- delay_exit.length = 0;
+ delay_exit.head = delay_exit.tail = NULL;
+ delay_exit.length = 0;
}
static void
{
rb_dlink_node *ptr, *next;
rb_patricia_node_t *pnode;
- struct reject_data *rdata;
+ reject_t *rdata;
RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
init_reject(void)
{
reject_tree = rb_new_patricia(PATRICIA_BITS);
- unknown_tree = rb_new_patricia(PATRICIA_BITS);
+ throttle_tree = rb_new_patricia(PATRICIA_BITS);
rb_event_add("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
rb_event_add("reject_expires", reject_expires, NULL, 60);
+ rb_event_add("throttle_expires", throttle_expires, NULL, 10);
}
add_reject(struct Client *client_p, const char *mask1, const char *mask2)
{
rb_patricia_node_t *pnode;
- struct reject_data *rdata;
+ reject_t *rdata;
uint32_t hashv;
/* Reject is disabled */
- if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0)
+ if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return;
hashv = 0;
if (mask1 != NULL)
- hashv ^= fnv_hash_upper(mask1, 32);
+ hashv ^= fnv_hash_upper((const unsigned char *)mask1, 32);
if (mask2 != NULL)
- hashv ^= fnv_hash_upper(mask2, 32);
+ hashv ^= fnv_hash_upper((const unsigned char *)mask2, 32);
if((pnode = rb_match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
{
{
int bitlen = 32;
#ifdef RB_IPV6
- if(client_p->localClient->ip.ss_family == AF_INET6)
+ if(GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET6)
bitlen = 128;
#endif
pnode = make_and_lookup_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip, bitlen);
- pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
+ pnode->data = rdata = rb_malloc(sizeof(reject_t));
rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
rdata->time = rb_current_time();
rdata->count = 1;
}
int
-check_reject(struct Client *client_p)
+check_reject(rb_fde_t *F, struct sockaddr *addr)
{
rb_patricia_node_t *pnode;
- struct reject_data *rdata;
-
+ reject_t *rdata;
+ delay_t *ddata;
/* Reject is disabled */
- if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0 ||
- ConfigFileEntry.reject_duration == 0)
+ if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return 0;
- pnode = rb_match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip);
+ pnode = rb_match_ip(reject_tree, addr);
if(pnode != NULL)
{
rdata = pnode->data;
rdata->time = rb_current_time();
- if(rdata->count > ConfigFileEntry.reject_after_count)
+ if(rdata->count > (unsigned long)ConfigFileEntry.reject_after_count)
{
+ ddata = rb_malloc(sizeof(delay_t));
ServerStats.is_rej++;
- SetReject(client_p);
- rb_setselect(client_p->localClient->F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
- SetClosing(client_p);
- rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
+ rb_setselect(F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
+ ddata->F = F;
+ rb_dlinkAdd(ddata, &ddata->node, &delay_exit);
return 1;
}
}
{
rb_dlink_node *ptr, *next;
rb_patricia_node_t *pnode;
- struct reject_data *rdata;
+ reject_t *rdata;
RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
rb_patricia_node_t *pnode;
/* Reject is disabled */
- if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0 ||
- ConfigFileEntry.reject_duration == 0)
+ if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return -1;
if((pnode = rb_match_string(reject_tree, ip)) != NULL)
{
- struct reject_data *rdata = pnode->data;
+ reject_t *rdata = pnode->data;
rb_dlinkDelete(&rdata->rnode, &reject_list);
rb_free(rdata);
rb_patricia_remove(reject_tree, pnode);
{
rb_dlink_node *ptr, *next;
rb_patricia_node_t *pnode;
- struct reject_data *rdata;
+ reject_t *rdata;
uint32_t hashv;
int n = 0;
hashv = 0;
if (mask1 != NULL)
- hashv ^= fnv_hash_upper(mask1, 32);
+ hashv ^= fnv_hash_upper((const unsigned char *)mask1, 32);
if (mask2 != NULL)
- hashv ^= fnv_hash_upper(mask2, 32);
+ hashv ^= fnv_hash_upper((const unsigned char *)mask2, 32);
RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
pnode = ptr->data;
return n;
}
-
int
-add_unknown_ip(struct Client *client_p)
+throttle_add(struct sockaddr *addr)
{
+ throttle_t *t;
rb_patricia_node_t *pnode;
- if((pnode = rb_match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) == NULL)
+ if((pnode = rb_match_ip(throttle_tree, addr)) != NULL)
{
+ t = pnode->data;
+
+ if(t->count > ConfigFileEntry.throttle_count)
+ return 1;
+
+ /* Stop penalizing them after they've been throttled */
+ t->last = rb_current_time();
+ t->count++;
+
+ } else {
int bitlen = 32;
#ifdef RB_IPV6
- if(client_p->localClient->ip.ss_family == AF_INET6)
+ if(GET_SS_FAMILY(addr) == AF_INET6)
bitlen = 128;
#endif
- pnode = make_and_lookup_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip, bitlen);
- pnode->data = (void *)0;
- }
-
- if((unsigned long)pnode->data >= ConfigFileEntry.max_unknown_ip)
- {
- SetExUnknown(client_p);
- SetReject(client_p);
- rb_setselect(client_p->localClient->F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
- SetClosing(client_p);
- rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
- return 1;
- }
-
- pnode->data = (void *)((unsigned long)pnode->data + 1);
-
+ t = rb_malloc(sizeof(throttle_t));
+ t->last = rb_current_time();
+ t->count = 1;
+ pnode = make_and_lookup_ip(throttle_tree, addr, bitlen);
+ pnode->data = t;
+ rb_dlinkAdd(pnode, &t->node, &throttle_list);
+ }
return 0;
}
-void
-del_unknown_ip(struct Client *client_p)
+static void
+throttle_expires(void *unused)
{
+ rb_dlink_node *ptr, *next;
rb_patricia_node_t *pnode;
-
- if((pnode = rb_match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
+ throttle_t *t;
+
+ RB_DLINK_FOREACH_SAFE(ptr, next, throttle_list.head)
{
- pnode->data = (void *)((unsigned long)pnode->data - 1);
- if((unsigned long)pnode->data <= 0)
- {
- rb_patricia_remove(unknown_tree, pnode);
- }
+ pnode = ptr->data;
+ t = pnode->data;
+
+ if(t->last + ConfigFileEntry.throttle_duration > rb_current_time())
+ continue;
+
+ rb_dlinkDelete(ptr, &throttle_list);
+ rb_free(t);
+ rb_patricia_remove(throttle_tree, pnode);
}
- /* this can happen due to m_webirc.c's manipulations, for example */
}
+
projects / irc / rqf / shadowircd.git / commitdiff
