X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/3667397189fa2f82776ae75f956274810c3fc860..28aa186de14dc4fa7488866e70beb6ae933dde79:/trojanscan/trojanscan.c?ds=sidebyside diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c index ea24e8eb..bfcf02be 100644 --- a/trojanscan/trojanscan.c +++ b/trojanscan/trojanscan.c @@ -15,6 +15,7 @@ #include "../lib/strlfunc.h" #include "../lib/version.h" #include "../core/nsmalloc.h" +#include "../glines/glines.h" #include #define tmalloc(x) nsmalloc(POOL_TROJANSCAN, x) @@ -41,6 +42,8 @@ static char *versionreply; static int hooksregistered = 0; static void *trojanscan_connect_nick_schedule; +static void *db_ping_schedule; + void _init() { trojanscan_cmds = newcommandtree(); @@ -129,6 +132,7 @@ void _fini(void) { for (i=0;icontent, dbuser->content, dbpass->content, db->content, atoi(dbport->content)) < 0) { Error("trojanscan", ERR_FATAL, "Cannot connect to database host!"); + freesstring(dbhost); + freesstring(dbuser); + freesstring(dbpass); + freesstring(db); + freesstring(dbport); return; /* PPA: module failed to load */ } @@ -473,7 +487,7 @@ int trojanscan_strip_codes(char *buf, size_t max, char *original) { struct trojanscan_worms *trojanscan_find_worm_by_id(int id) { int i; for(i=0;iclone->ipnode = np->fakeipnode; - ret = nickbanned(np->clone, cp); + ret = nickbanned(np->clone, cp, 0); np->clone->ipnode = realipnode; @@ -1916,7 +1930,7 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args) trojanscan_chans[j].watch_clone = NULL; } else { for(rp=trojanscan_realchanlist;rp;rp=rp->next) - if ((rp->clone == &(trojanscan_swarm[i]))) + if (rp->clone == &(trojanscan_swarm[i])) rp->donotpart = 1; } derefnode(iptree, trojanscan_swarm[i].fakeipnode); @@ -1993,36 +2007,12 @@ static void trojanscan_part_watch(int hook, void *arg) { trojanscan_process(np, cp, trojanscan_getmtfromhooktype(hook), reason); } -static int trojanscan_hostcount(nick *sender, int hostmode, char *mask, int masklen) { - int usercount = 0, j; - nick *np = NULL; /* sigh at warnings */ - - if(hostmode) - usercount = sender->ipnode->usercount; - - if(usercount > TROJANSCAN_MAX_HOST_GLINE) { - hostmode = 0; - usercount = 0; - } - - /* should really go through the ipnode I guess */ - if(!hostmode) - for (j=0;jnext) - if (np->ipnode==sender->ipnode && !ircd_strcmp(np->ident, sender->ident)) - usercount++; - - if(mask) - snprintf(mask, masklen, "%s@%s", hostmode?"*":sender->ident, IPtostr(sender->p_ipaddr)); - - return usercount; -} - void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phrase, char messagetype, char *matchbuf) { char glinemask[HOSTLEN + USERLEN + NICKLEN + 4], enick[TROJANSCAN_QUERY_TEMP_BUF_SIZE], eident[TROJANSCAN_QUERY_TEMP_BUF_SIZE], ehost[TROJANSCAN_QUERY_TEMP_BUF_SIZE]; unsigned int frequency; int glining = 0, usercount; struct trojanscan_worms *worm = phrase->worm; + char reason[200]; trojanscan_database.detections++; @@ -2032,7 +2022,7 @@ void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phra } else if(worm->glinehost || worm->glineuser) { glining = 1; - usercount = trojanscan_hostcount(sender, worm->glinehost, glinemask, sizeof(glinemask)); + usercount = glinebynick(sender, 0, NULL, GLINE_SIMULATE, "trojanscan"); } if (!usercount) { @@ -2079,7 +2069,8 @@ void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phra trojanscan_database_query("INSERT INTO hits (nickname, ident, host, phrase, messagetype, glined) VALUES ('%s', '%s', '%s', %d, '%c', %d)", enick, eident, ehost, phrase->id, messagetype, glining); trojanscan_database.glines++; - irc_send("%s GL * +%s %d %jd :You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours\r\n", mynumeric->content, glinemask, glinetime * 3600, (intmax_t)time(NULL), sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime); + snprintf(reason, sizeof(reason), "You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours", sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime); + glinebynick(sender, glinetime * 3600, reason, 0, "trojanscan"); trojanscan_mainchanmsg("g: *!%s t: %c u: %s!%s@%s%s%s c: %d w: %s%s p: %d f: %d%s%s", glinemask, messagetype, sender->nick, sender->ident, sender->host->name->content, messagetype=='N'||messagetype=='M'||messagetype=='P'?" #: ":"", messagetype=='N'||messagetype=='M'||messagetype=='P'?chp->index->name->content:"", usercount, worm->name->content, worm->epidemic?"(E)":"", phrase->id, frequency, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:""); } @@ -2500,7 +2491,21 @@ void trojanscan_generaterealname(char *buf, int maxsize) { strlcpy(buf, np->realname->name->content, maxsize + 1); } +static void db_ping(void *arg) { + if (!(trojanscan_database_query("SELECT 1"))) { + trojanscan_database_res *res; + if ((res = trojanscan_database_store_result(&trojanscan_sql))) { + trojanscan_database_free_result(res); + } + } + + db_ping_schedule = scheduleoneshot(time(NULL) + 60, &db_ping, NULL); +} + void trojanscan_database_close(void) { + if(db_ping_schedule) + deleteschedule(db_ping_schedule, db_ping, NULL); + mysql_close(&trojanscan_sql); } @@ -2508,6 +2513,10 @@ int trojanscan_database_connect(char *dbhost, char *dbuser, char *dbpass, char * mysql_init(&trojanscan_sql); if (!mysql_real_connect(&trojanscan_sql, dbhost, dbuser, dbpass, db, port, NULL, 0)) return -1; + + + db_ping_schedule = scheduleoneshot(time(NULL) + 60, &db_ping, NULL); + return 0; }