From 4dc6ff3dd9147bc5d15a49a437b1448fa925f54c Mon Sep 17 00:00:00 2001 From: Ed Kellett Date: Wed, 21 Oct 2020 00:20:04 +0100 Subject: [PATCH] Add /testkline --- modules/m_testline.c | 127 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/modules/m_testline.c b/modules/m_testline.c index 1f78d5d4..99bcc20d 100644 --- a/modules/m_testline.c +++ b/modules/m_testline.c @@ -42,18 +42,23 @@ static const char testline_desc[] = "Provides the ability to test I/K/D/X lines and RESVs"; static void mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void mo_testkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message testline_msgtab = { "TESTLINE", 0, 0, 0, 0, {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}} }; +struct Message testkline_msgtab = { + "TESTKLINE", 0, 0, 0, 0, + {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testkline, 2}} +}; struct Message testgecos_msgtab = { "TESTGECOS", 0, 0, 0, 0, {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}} }; -mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL }; +mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testkline_msgtab, &testgecos_msgtab, NULL }; DECLARE_MODULE_AV2(testline, NULL, NULL, testline_clist, NULL, NULL, NULL, NULL, testline_desc); @@ -233,6 +238,126 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou me.name, source_p->name, parv[1]); } + +static void +mo_testkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +{ + struct ConfItem *aconf; + struct rb_sockaddr_storage ip; + char user_trunc[USERLEN + 1]; + const char *username = NULL; + const char *host = NULL; + char *mask; + char *p; + int host_mask; + int type; + int duration; + char *puser, *phost, *reason, *operreason; + char reasonbuf[BUFSIZE]; + + if (!HasPrivilege(source_p, "oper:testline")) + { + sendto_one(source_p, form_str(ERR_NOPRIVS), + me.name, source_p->name, "testline"); + return; + } + + mask = LOCAL_COPY(parv[1]); + + if ((p = strchr(mask, '!'))) + { + mask = p + 1; + + if(EmptyString(mask)) + return; + } + + if ((p = strchr(mask, '@'))) + { + *p++ = '\0'; + username = mask; + host = p; + + if(EmptyString(host)) + return; + } + else + { + host = mask; + } + + /* parses as an IP, check for a dline */ + if ((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST) + { + if(type == HM_IPV6) + aconf = find_dline((struct sockaddr *)&ip, AF_INET6); + else + aconf = find_dline((struct sockaddr *)&ip, AF_INET); + + if(aconf && aconf->status & CONF_DLINE) + { + get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason); + snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason, + operreason ? "|" : "", operreason ? operreason : ""); + sendto_one(source_p, form_str(RPL_TESTLINE), + me.name, source_p->name, + (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D', + (aconf->flags & CONF_FLAGS_TEMPORARY) ? + (long) ((aconf->hold - rb_current_time()) / 60) : 0L, + phost, reasonbuf); + + return; + } + /* Otherwise, aconf is an exempt{} */ + if (aconf == NULL && (duration = is_reject_ip((struct sockaddr *)&ip))) + sendto_one(source_p, form_str(RPL_TESTLINE), + me.name, source_p->name, + '!', + duration / 60L, + host, "Reject cache"); + if (aconf == NULL && (duration = is_throttle_ip((struct sockaddr *)&ip))) + sendto_one(source_p, form_str(RPL_TESTLINE), + me.name, source_p->name, + '!', + duration / 60L, + host, "Throttled"); + } + + if (username != NULL) + rb_strlcpy(user_trunc, username, sizeof user_trunc); + else + rb_strlcpy(user_trunc, "dummy", sizeof user_trunc); + + aconf = find_conf_by_address(host, + type != HM_HOST ? host : NULL, + NULL, + type != HM_HOST ? (struct sockaddr *)&ip : NULL, + CONF_KILL, + type == HM_IPV6 ? AF_INET6 : AF_INET, + user_trunc, NULL); + + if (aconf != NULL && aconf->status & CONF_KILL) + { + static char buf[HOSTLEN+USERLEN+2]; + + get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason); + snprintf(buf, sizeof(buf), "%s@%s", + puser, phost); + snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason, + operreason ? "|" : "", operreason ? operreason : ""); + sendto_one(source_p, form_str(RPL_TESTLINE), + me.name, source_p->name, + (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K', + (aconf->flags & CONF_FLAGS_TEMPORARY) ? + (long) ((aconf->hold - rb_current_time()) / 60) : 0L, + buf, reasonbuf); + return; + } + + sendto_one(source_p, form_str(RPL_NOTESTLINE), + me.name, source_p->name, parv[1]); +} + static void mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) {