X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/2b843a5bdd8523990cb720cefcb7b9256421f660..d4f7eb4ce6a0c5a703ddb0f5f5bfaf5d2037e605:/modules/m_dline.c diff --git a/modules/m_dline.c b/modules/m_dline.c index f3a40cea..cc62d572 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -20,15 +20,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id$ */ #include "stdinc.h" #include "channel.h" #include "class.h" #include "client.h" -#include "common.h" #include "match.h" #include "ircd.h" #include "hostmask.h" @@ -45,37 +42,38 @@ #include "bandbi.h" #include "operhash.h" -static int mo_dline(struct Client *, struct Client *, int, const char **); -static int me_dline(struct Client *, struct Client *, int, const char **); -static int mo_undline(struct Client *, struct Client *, int, const char **); -static int me_undline(struct Client *, struct Client *, int, const char **); +static const char dline_desc[] = "Provides the DLINE facility to ban users via IP address"; + +static void mo_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void me_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void mo_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void me_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message dline_msgtab = { - "DLINE", 0, 0, 0, MFLG_SLOW, - {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 3}, {mo_dline, 2}} + "DLINE", 0, 0, 0, 0, + {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 4}, {mo_dline, 2}} }; struct Message undline_msgtab = { - "UNDLINE", 0, 0, 0, MFLG_SLOW, - {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 1}, {mo_undline, 2}} + "UNDLINE", 0, 0, 0, 0, + {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 2}, {mo_undline, 2}} }; mapi_clist_av1 dline_clist[] = { &dline_msgtab, &undline_msgtab, NULL }; -DECLARE_MODULE_AV1(dline, NULL, NULL, dline_clist, NULL, NULL, "$Revision$"); +DECLARE_MODULE_AV2(dline, NULL, NULL, dline_clist, NULL, NULL, NULL, NULL, dline_desc); -static int valid_comment(char *comment); -static int remove_temp_dline(struct ConfItem *); -static int apply_dline(struct Client *, const char *, int, char *); -static int apply_undline(struct Client *, const char *); +static bool remove_temp_dline(struct ConfItem *); +static void apply_dline(struct Client *, const char *, int, char *); +static void apply_undline(struct Client *, const char *); /* mo_dline() - * + * * parv[1] - dline to add * parv[2] - reason */ -static int -mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +mo_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char def[] = "No Reason"; const char *dlhost; @@ -88,7 +86,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char if(!IsOperK(source_p)) { sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kline"); - return 0; + return; } if((tdline_time = valid_temp_time(parv[loc])) >= 0) @@ -102,7 +100,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char if (*dlhost == ':') { sendto_one_notice(source_p, ":Invalid D-Line"); - return 0; + return; } if(parc >= loc + 2 && !irccmp(parv[loc], "ON")) @@ -111,7 +109,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char { sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "remoteban"); - return 0; + return; } target_server = parv[loc + 1]; @@ -129,21 +127,20 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char target_server, tdline_time, dlhost, reason); if(!match(target_server, me.name)) - return 0; + return; } apply_dline(source_p, dlhost, tdline_time, reason); check_dlines(); - return 0; } /* mo_undline() * * parv[1] = dline to remove */ -static int -mo_undline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +mo_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *cidr; const char *target_server = NULL; @@ -151,7 +148,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha if(!IsOperK(source_p)) { sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "unkline"); - return 0; + return; } cidr = parv[1]; @@ -162,7 +159,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha { sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "remoteban"); - return 0; + return; } target_server = parv[3]; @@ -170,16 +167,14 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha CAP_ENCAP, NOCAPS, "ENCAP %s UNDLINE %s", target_server, cidr); if(!match(target_server, me.name)) - return 0; + return; } apply_undline(source_p, cidr); - - return 0; } -static int -me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +static void +me_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv) { int tdline_time = atoi(parv[1]); /* Since this is coming over a server link, assume that the originating @@ -187,35 +182,32 @@ me_dline(struct Client *client_p, struct Client *source_p, int parc, const char */ if(!IsPerson(source_p)) - return 0; + return; if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, tdline_time > 0 ? SHARED_TDLINE : SHARED_PDLINE)) - return 0; + return; apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3])); check_dlines(); - return 0; } -static int -me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +static void +me_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv) { if(!IsPerson(source_p)) - return 0; + return; if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_UNDLINE)) - return 0; + return; apply_undline(source_p, parv[1]); - - return 0; } -static int +static void apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *reason) { struct ConfItem *aconf; @@ -224,17 +216,15 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * int t = AF_INET, ty, b; const char *creason; - ty = parse_netmask(dlhost, (struct sockaddr *) &daddr, &b); + ty = parse_netmask(dlhost, &daddr, &b); if(ty == HM_HOST) { sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", me.name, source_p->name); - return 0; + return; } -#ifdef RB_IPV6 if(ty == HM_IPV6) t = AF_INET6; else -#endif t = AF_INET; /* This means dlines wider than /16 cannot be set remotely */ @@ -244,7 +234,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * { sendto_one_notice(source_p, ":For safety, bitmasks less than 8 require conf access."); - return 0; + return; } } else @@ -253,18 +243,10 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * { sendto_one_notice(source_p, ":Dline bitmasks less than 16 are for admins only."); - return 0; + return; } } - if(!valid_comment(reason)) - { - sendto_one(source_p, - ":%s NOTICE %s :Invalid character '\"' in comment", - me.name, source_p->name); - return 0; - } - if(ConfigFileEntry.non_redundant_klines) { if((aconf = find_dline((struct sockaddr *) &daddr, t)) != NULL) @@ -284,7 +266,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * ":%s NOTICE %s :[%s] already D-lined by [%s] - %s", me.name, source_p->name, dlhost, aconf->host, creason); - return 0; + return; } } } @@ -298,6 +280,9 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * aconf->passwd = rb_strdup(reason); aconf->info.oper = operhash_add(get_oper_name(source_p)); + if(strlen(reason) > BANREASONLEN) + reason[BANREASONLEN] = '\0'; + /* Look for an oper reason */ if((oper_reason = strchr(reason, '|')) != NULL) { @@ -361,11 +346,9 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * aconf->host, reason, oper_reason); } } - - return 0; } -static int +static void apply_undline(struct Client *source_p, const char *cidr) { char buf[BUFSIZE]; @@ -374,14 +357,14 @@ apply_undline(struct Client *source_p, const char *cidr) if(parse_netmask(cidr, NULL, NULL) == HM_HOST) { sendto_one_notice(source_p, ":Invalid D-Line"); - return 0; + return; } aconf = find_exact_conf_by_address(cidr, CONF_DLINE, NULL); if(aconf == NULL) { sendto_one_notice(source_p, ":No D-Line for %s", cidr); - return 0; + return; } rb_strlcpy(buf, aconf->host, sizeof buf); @@ -394,7 +377,7 @@ apply_undline(struct Client *source_p, const char *cidr) "%s has removed the temporary D-Line for: [%s]", get_oper_name(source_p), buf); ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), buf); - return 0; + return; } bandb_del(BANDB_DLINE, aconf->host, NULL); @@ -405,36 +388,15 @@ apply_undline(struct Client *source_p, const char *cidr) get_oper_name(source_p), aconf->host); ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), aconf->host); delete_one_address_conf(aconf->host, aconf); - - return 0; -} - -/* - * valid_comment - * inputs - pointer to client - * - pointer to comment - * output - 0 if no valid comment, 1 if valid - * side effects - NONE - */ -static int -valid_comment(char *comment) -{ - if(strchr(comment, '"')) - return 0; - - if(strlen(comment) > BANREASONLEN) - comment[BANREASONLEN] = '\0'; - - return 1; } /* remove_temp_dline() * * inputs - confitem to undline - * outputs - + * outputs - true if removed, false otherwise. * side effects - tries to undline anything that matches */ -static int +static bool remove_temp_dline(struct ConfItem *aconf) { rb_dlink_node *ptr; @@ -448,10 +410,10 @@ remove_temp_dline(struct ConfItem *aconf) { rb_dlinkDestroy(ptr, &temp_dlines[i]); delete_one_address_conf(aconf->host, aconf); - return YES; + return true; } } } - return NO; + return false; }