#include "regexgline.h"
#include "../lib/version.h"
+#include "../dbapi/dbapi.h"
+#include "../lib/stringbuf.h"
+#include "../core/hooks.h"
+#include "../server/server.h"
-MODULE_VERSION("");
+#define INSTANT_IDENT_GLINE 1
+#define INSTANT_HOST_GLINE 2
+#define INSTANT_KILL 3
+#define DELAYED_IDENT_GLINE 4
+#define DELAYED_HOST_GLINE 5
+#define DELAYED_KILL 6
+
+MODULE_VERSION("1.41");
typedef struct rg_glinenode {
nick *np;
void rg_dogline(struct rg_glinelist *gll, nick *np, struct rg_struct *rp, char *matched);
+static DBModuleIdentifier dbid;
+static unsigned long highestid = 0;
+static int attached = 0, started = 0;
+
+/* shadowserver only reports classes[0] */
+static const char *classes[] = { "drone", "proxy", "spam", "fakeauth", "other", (char *)0 };
+
void _init(void) {
sstring *max_casualties, *max_spew, *expiry_time, *max_per_gline;
rg_delays = NULL;
- if(!rg_dbconnect()) {
+ if(dbconnected()) {
+ attached = 1;
+ dbid = dbgetid();
rg_dbload();
-
- registercontrolhelpcmd("regexgline", NO_OPER, 4, &rg_gline, "Usage: regexgline <text>\nAdds a new regular expression pattern.");
- registercontrolhelpcmd("regexdelgline", NO_OPER, 1, &rg_delgline, "Usage: regexdelgline <pattern>\nDeletes a regular expression pattern.");
- registercontrolhelpcmd("regexglist", NO_OPER, 1, &rg_glist, "Usage: regexglist <pattern>\nLists regular expression patterns.");
- registercontrolhelpcmd("regexspew", NO_OPER, 1, &rg_spew, "Usage: regexspew <pattern>\nLists users currently on the network which match the given pattern.");
- registercontrolhelpcmd("regexidlookup", NO_OPER, 1, &rg_idlist, "Usage: regexidlookup <id>\nFinds a regular expression pattern by it's ID number.");
-
- registerhook(HOOK_NICK_NEWNICK, &rg_nick);
- registerhook(HOOK_NICK_RENAME, &rg_nick);
- registerhook(HOOK_NICK_LOSTNICK, &rg_lostnick);
- rg_startup();
-
- rg_schedule = schedulerecurring(time(NULL) + 1, 0, 1, rg_checkexpiry, NULL);
+ } else {
+ Error("regexgline", ERR_STOP, "Could not connect to database.");
}
}
-
+
void _fini(void) {
struct rg_struct *gp = rg_list, *oldgp;
rg_delay *delay, *delaynext;
- deregisterhook(HOOK_NICK_NEWNICK, &rg_nick);
- deregisterhook(HOOK_NICK_RENAME, &rg_nick);
- deregisterhook(HOOK_NICK_LOSTNICK, &rg_lostnick);
- deregistercontrolcmd("regexspew", rg_spew);
- deregistercontrolcmd("regexglist", rg_glist);
- deregistercontrolcmd("regexdelgline", rg_delgline);
- deregistercontrolcmd("regexgline", rg_gline);
- deregistercontrolcmd("regexidlookup", rg_idlist);
-
+ if(started) {
+ deregisterhook(HOOK_NICK_NEWNICK, &rg_nick);
+ deregisterhook(HOOK_NICK_RENAME, &rg_nick);
+ deregisterhook(HOOK_NICK_LOSTNICK, &rg_lostnick);
+ deregistercontrolcmd("regexspew", rg_spew);
+ deregistercontrolcmd("regexglist", rg_glist);
+ deregistercontrolcmd("regexdelgline", rg_delgline);
+ deregistercontrolcmd("regexgline", rg_gline);
+ deregistercontrolcmd("regexidlookup", rg_idlist);
+ }
+
if(rg_delays) {
for(delay=rg_delays;delay;delay=delaynext) {
delaynext=delay->next;
gp = gp->next;
rg_freestruct(oldgp);
}
-
- if(rg_sqlconnected)
- rg_sqldisconnect();
+
+ if(attached) {
+ dbdetach("regexgline");
+ dbfreeid(dbid);
+ }
}
void rg_checkexpiry(void *arg) {
delay->sch = scheduleoneshot(time(NULL) + (RG_MINIMUM_DELAY_TIME + (rand() % RG_MAXIMUM_RAND_TIME)), rg_dodelay, delay);
}
+static void rg_shadowserver(nick *np, struct rg_struct *reason, int type) {
+ char buf[1024];
+
+ if(reason->class != classes[0]) /* drone */
+ return;
+
+ snprintf(buf, sizeof(buf), "regex-ban %lu %s!%s@%s %s %s", time(NULL), np->nick, np->ident, np->host->name->content, reason->mask->content, serverlist[homeserver(np->numeric)].name->content);
+
+ triggerhook(HOOK_SHADOW_SERVER, (void *)buf);
+}
+
void rg_deletedelay(rg_delay *delay) {
rg_delay *temp, *prev;
prev = NULL;
return;
}
- if (delay->reason->type == 5) {
+ if (delay->reason->type == DELAYED_HOST_GLINE) {
usercount = delay->np->host->clonecount;
snprintf(hostname, sizeof(hostname), "*@%s", IPtostr(delay->np->p_ipaddr));
}
- if((delay->reason->type == 4) || (usercount > rg_max_per_gline)) {
+ if((delay->reason->type == DELAYED_IDENT_GLINE) || (usercount > rg_max_per_gline)) {
nick *tnp;
for(usercount=0,tnp=delay->np->host->nicks;tnp;tnp=tnp->nextbyhost)
snprintf(hostname, sizeof(hostname), "%s@%s", delay->np->ident, IPtostr(delay->np->p_ipaddr));
}
- if ((delay->reason->type == 6) || (usercount > rg_max_per_gline)) {
+ if ((delay->reason->type == DELAYED_KILL) || (usercount > rg_max_per_gline)) {
if (IsAccount(delay->np)) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed kill regex %08lx", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid);
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed kill regex %08lx (class: %s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid, delay->reason->class);
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed kill regex %08lx", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid);
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed kill regex %08lx (class: %s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid, delay->reason->class);
}
+
+ rg_shadowserver(delay->np, delay->reason, DELAYED_KILL);
killuser(NULL, delay->np, "%s (ID: %08lx)", delay->reason->reason->content, delay->reason->glineid);
return;
}
- if ((delay->reason->type <= 3) || (delay->reason->type >= 6))
- return;
-
- if (delay->reason->type == 4) {
+ if (delay->reason->type == DELAYED_IDENT_GLINE) {
if (IsAccount(delay->np)) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed user@host gline regex %08lx (hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed user@host gline regex %08lx (class: %s, hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid, delay->reason->class, usercount, (usercount!=1)?"s":"");
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed user@host gline regex %08lx (hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed user@host gline regex %08lx (class: %s, hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid, delay->reason->class, usercount, (usercount!=1)?"s":"");
}
- } else {
+ } else if (delay->reason->type == DELAYED_HOST_GLINE) {
if (IsAccount(delay->np)) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed *@host gline regex %08lx (hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched delayed *@host gline regex %08lx (class: %s, hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->np->authname, delay->reason->glineid, delay->reason->class, usercount, (usercount!=1)?"s":"");
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed *@host gline regex %08lx (hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched delayed *@host gline regex %08lx (class: %s, hit %d user%s)", delay->np->nick, delay->np->ident, delay->np->host->name->content, delay->reason->glineid, delay->reason->class, usercount, (usercount!=1)?"s":"");
}
+ } else {
+ return;
}
- irc_send("%s GL * +%s %d :AUTO: %s (ID: %08lx)\r\n", mynumeric->content, hostname, rg_expiry_time, delay->reason->reason->content, delay->reason->glineid);
+ rg_shadowserver(delay->np, delay->reason, delay->reason->type);
+ irc_send("%s GL * +%s %d %d :AUTO: %s (ID: %08lx)\r\n", mynumeric->content, hostname, rg_expiry_time, time(NULL), delay->reason->reason->content, delay->reason->glineid);
rg_deletedelay(delay);
}
struct rg_glinenode *nn, *pn;
for(nn=gll->start;nn;nn=pn) {
pn = nn->next;
- if(nn->punish == 3) {
+ if(nn->punish == INSTANT_KILL) {
if ( IsAccount(nn->np) ) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched kill regex %08lx", nn->np->nick, nn->np->ident, nn->np->host->name->content, nn->np->authname, nn->reason->glineid);
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched kill regex %08lx (class: %s)", nn->np->nick, nn->np->ident, nn->np->host->name->content, nn->np->authname, nn->reason->glineid, nn->reason->class);
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched kill regex %08lx", nn->np->nick, nn->np->ident, nn->np->host->name->content, nn->reason->glineid);
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched kill regex %08lx (class: %s)", nn->np->nick, nn->np->ident, nn->np->host->name->content, nn->reason->glineid, nn->reason->class);
}
-
+
+ rg_shadowserver(nn->np, nn->reason, nn->punish);
killuser(NULL, nn->np, "%s (ID: %08lx)", nn->reason->reason->content, nn->reason->glineid);
- } else if ((nn->punish == 4) || (nn->punish == 5) || (nn->punish == 6)) {
+ } else if ((nn->punish == DELAYED_IDENT_GLINE) || (nn->punish == DELAYED_HOST_GLINE) || (nn->punish == DELAYED_KILL)) {
rg_setdelay(nn->np, nn->reason, nn->punish);
}
free(nn);
rg_initglinelist(gll);
}
-int rg_dbconnect(void) {
- sstring *dbhost, *dbusername, *dbpassword, *dbdatabase, *dbport;
-
- dbhost = getcopyconfigitem("regexgline", "dbhost", "localhost", HOSTLEN);
- dbusername = getcopyconfigitem("regexgline", "dbusername", "regexgline", 20);
- dbpassword = getcopyconfigitem("regexgline", "dbpassword", "moo", 20);
- dbdatabase = getcopyconfigitem("regexgline", "dbdatabase", "regexgline", 20);
- dbport = getcopyconfigitem("regexgline", "dbport", "3306", 8);
-
- if(rg_sqlconnect(dbhost->content, dbusername->content, dbpassword->content, dbdatabase->content, strtol(dbport->content, NULL, 10))) {
- Error("regexgline", ERR_FATAL, "Cannot connect to database host!");
- return 1; /* PPA: splidge: do something here 8]! */
- } else {
- rg_sqlconnected = 1;
+static void dbloaddata(DBConn *dbconn, void *arg) {
+ DBResult *dbres = dbgetresult(dbconn);
+
+ if(!dbquerysuccessful(dbres)) {
+ Error("chanserv", ERR_ERROR, "Error loading DB");
+ return;
}
-
- freesstring(dbhost);
- freesstring(dbusername);
- freesstring(dbpassword);
- freesstring(dbdatabase);
- freesstring(dbport);
- return 0;
+ if (dbnumfields(dbres) != 7) {
+ Error("regexgline", ERR_ERROR, "DB format error");
+ return;
+ }
+
+ while(dbfetchrow(dbres)) {
+ unsigned long id;
+ char *gline, *setby, *reason, *expires, *type, *class;
+
+ id = strtoul(dbgetvalue(dbres, 0), NULL, 10);
+ if(id > highestid)
+ highestid = id;
+
+ gline = dbgetvalue(dbres, 1);
+ setby = dbgetvalue(dbres, 2);
+ reason = dbgetvalue(dbres, 3);
+ expires = dbgetvalue(dbres, 4);
+ type = dbgetvalue(dbres, 5);
+ class = dbgetvalue(dbres, 6);
+
+ if (!rg_newsstruct(id, gline, setby, reason, expires, type, 0, class))
+ dbquery("DELETE FROM regexgline.glines WHERE id = %u", id);
+ }
+
+ dbclear(dbres);
}
-int rg_dbload(void) {
- rg_sqlquery("CREATE TABLE regexglines (id INT(10) PRIMARY KEY AUTO_INCREMENT, gline TEXT NOT NULL, setby VARCHAR(%d) NOT NULL, reason VARCHAR(%d) NOT NULL, expires BIGINT NOT NULL, type TINYINT(4) NOT NULL DEFAULT 1)", ACCOUNTLEN, RG_REASON_MAX);
- rg_sqlquery("CREATE TABLE regexlogs (id INT(10) PRIMARY KEY AUTO_INCREMENT, host VARCHAR(%d) NOT NULL, account VARCHAR(%d) NOT NULL, event TEXT NOT NULL, arg TEXT NOT NULL, ts TIMESTAMP)", RG_MASKLEN - 1, ACCOUNTLEN);
- rg_sqlquery("CREATE TABLE regexglinelog (id INT(10) PRIMARY KEY AUTO_INCREMENT, glineid INT(10) NOT NULL, ts TIMESTAMP, nickname VARCHAR(%d) NOT NULL, username VARCHAR(%d) NOT NULL, hostname VARCHAR(%d) NOT NULL, realname VARCHAR(%d))", NICKLEN, USERLEN, HOSTLEN, REALLEN);
-
- if(!rg_sqlquery("SELECT id, gline, setby, reason, expires, type FROM regexglines")) {
- rg_sqlresult res;
- if((res = rg_sqlstoreresult())) {
- rg_sqlrow row;
- while((row = rg_sqlgetrow(res))) {
- if (!rg_newsstruct(row[0], row[1], row[2], row[3], row[4], row[5], 0, 0))
- rg_sqlquery("DELETE FROM regexglines WHERE id = %s", row[0]);
- }
- rg_sqlfree(res);
- }
- }
-
- return 0;
+static void dbloadfini(DBConn *dbconn, void *arg) {
+ started = 1;
+ StringBuf b;
+ const char **p;
+ char helpbuf[8192 * 2], allclasses[8192];
+
+ sbinit(&b, (char *)allclasses, sizeof(allclasses));
+ for(p=classes;*p;p++) {
+ sbaddstr(&b, (char *)*p);
+ sbaddchar(&b, ' ');
+ }
+ sbterminate(&b);
+
+ snprintf(helpbuf, sizeof(helpbuf),
+ "Usage: regexgline <regex> <duration> <type> <class> <reason>\n"
+ "Adds a new regular expression pattern.\n"
+ "Duration is represented as 3d, 3M etc.\n"
+ "Class is one of the following: %s\n"
+ "Type is an integer which represents the following:\n"
+ "1 - Instant USER@IP GLINE (igu)\n"
+ "2 - Instant *@IP GLINE (igh)\n"
+ "3 - Instant KILL (ik)\n"
+ "4 - Delayed USER@IP GLINE (dgu)\n"
+ "5 - Delayed *@IP GLINE (dgh)\n"
+ "6 - Delayed KILL (dk)",
+ allclasses);
+
+ registercontrolhelpcmd("regexgline", NO_OPER, 5, &rg_gline, helpbuf);
+ registercontrolhelpcmd("regexdelgline", NO_OPER, 1, &rg_delgline, "Usage: regexdelgline <pattern>\nDeletes a regular expression pattern.");
+ registercontrolhelpcmd("regexglist", NO_OPER, 1, &rg_glist, "Usage: regexglist <pattern>\nLists regular expression patterns.");
+ registercontrolhelpcmd("regexspew", NO_OPER, 1, &rg_spew, "Usage: regexspew <pattern>\nLists users currently on the network which match the given pattern.");
+ registercontrolhelpcmd("regexidlookup", NO_OPER, 1, &rg_idlist, "Usage: regexidlookup <id>\nFinds a regular expression pattern by it's ID number.");
+
+ registerhook(HOOK_NICK_NEWNICK, &rg_nick);
+ registerhook(HOOK_NICK_RENAME, &rg_nick);
+ registerhook(HOOK_NICK_LOSTNICK, &rg_lostnick);
+ rg_startup();
+
+ rg_schedule = schedulerecurring(time(NULL) + 1, 0, 1, rg_checkexpiry, NULL);
+}
+
+void rg_dbload(void) {
+ dbattach("regexgline");
+ dbcreatequery("CREATE TABLE regexgline.glines (id INT NOT NULL PRIMARY KEY, gline TEXT NOT NULL, setby VARCHAR(%d) NOT NULL, reason VARCHAR(%d) NOT NULL, expires INT NOT NULL, type INT NOT NULL DEFAULT 1, class TEXT NOT NULL)", ACCOUNTLEN, RG_REASON_MAX);
+ dbcreatequery("CREATE TABLE regexgline.clog (host VARCHAR(%d) NOT NULL, account VARCHAR(%d) NOT NULL, event TEXT NOT NULL, arg TEXT NOT NULL, ts TIMESTAMP)", RG_MASKLEN - 1, ACCOUNTLEN);
+ dbcreatequery("CREATE TABLE regexgline.glog (glineid INT NOT NULL, ts TIMESTAMP, nickname VARCHAR(%d) NOT NULL, username VARCHAR(%d) NOT NULL, hostname VARCHAR(%d) NOT NULL, realname VARCHAR(%d))", NICKLEN, USERLEN, HOSTLEN, REALLEN);
+
+ dbloadtable("regexgline.glines", NULL, dbloaddata, dbloadfini);
}
void rg_nick(int hooknum, void *arg) {
int expiry, count, j, hostlen;
struct rg_struct *rp;
struct rg_glinelist gll;
+ const char **p;
- char eemask[RG_QUERY_BUF_SIZE], eesetby[RG_QUERY_BUF_SIZE], eereason[RG_QUERY_BUF_SIZE];
- char hostname[RG_MASKLEN];
+ char eemask[RG_QUERY_BUF_SIZE], eesetby[RG_QUERY_BUF_SIZE], eereason[RG_QUERY_BUF_SIZE], eeclass[RG_QUERY_BUF_SIZE];
+ char hostname[RG_MASKLEN], *class, *reason, *regex, type;
- if(cargc < 4)
+ if(cargc < 5)
return CMD_USAGE;
-
- if ((strlen(cargv[2]) != 1) || ((cargv[2][0] != '1') && (cargv[2][0] != '2') && (cargv[2][0] != '3') && (cargv[2][0] != '4') && (cargv[2][0] != '5') && (cargv[2][0] != '6'))) {
+
+ type = cargv[2][0];
+ if ((strlen(cargv[2]) != 1) || ((type != '1') && (type != '2') && (type != '3') && (type != '4') && (type != '5') && (type != '6'))) {
controlreply(np, "Invalid type specified!");
return CMD_USAGE;
}
+ regex = cargv[0];
+ class = cargv[3];
+ reason = cargv[4];
+
+ for(p=classes;*p;p++)
+ if(!strcasecmp(class, *p))
+ break;
+
+ if(!*p) {
+ controlreply(np, "Bad class supplied.");
+ return CMD_USAGE;
+ }
+
if (!(expiry = durationtolong(cargv[1]))) {
controlreply(np, "Invalid duration specified!");
return CMD_USAGE;
}
for(rp=rg_list;rp;rp=rp->next) {
- if (RGMasksEqual(rp->mask->content, cargv[0])) {
- controlreply(np, "That regexp gline already exists!");
+ if (RGMasksEqual(rp->mask->content, regex)) {
+ controlreply(np, "That regexgline already exists!");
return CMD_ERROR;
}
}
- if (rg_sanitycheck(cargv[0], &count)) {
+ if (rg_sanitycheck(regex, &count)) {
controlreply(np, "Error in expression.");
return CMD_ERROR;
} else if (count < 0) {
realexpiry = expiry + time(NULL);
- rg_sqlescape_string(eemask, cargv[0], strlen(cargv[0]));
- rg_sqlescape_string(eesetby, np->nick, strlen(np->nick));
- rg_sqlescape_string(eereason, cargv[3], strlen(cargv[3]));
+ dbescapestring(eemask, regex, strlen(regex));
+ dbescapestring(eesetby, np->nick, strlen(np->nick));
+ dbescapestring(eeclass, class, strlen(class));
+ dbescapestring(eereason, reason, strlen(reason));
- rg_sqlquery("INSERT INTO regexglines (gline, setby, reason, expires, type) VALUES ('%s', '%s', '%s', %d, %s)", eemask, eesetby, eereason, realexpiry, cargv[2]);
- if (!rg_sqlquery("SELECT id FROM regexglines WHERE gline = '%s' AND setby = '%s' AND reason = '%s' AND expires = %d AND type = %s ORDER BY ID DESC LIMIT 1", eemask, eesetby, eereason, realexpiry, cargv[2])) {
- rg_sqlresult res;
- if((res = rg_sqlstoreresult())) {
- rg_sqlrow row;
- row = rg_sqlgetrow(res);
- if (row) {
- rp = rg_newsstruct(row[0], cargv[0], np->nick, cargv[3], "", cargv[2], realexpiry, 0);
- rg_sqlfree(res);
- if(!rp) {
- rg_sqlquery("DELETE FROM regexglines WHERE gline = '%s' AND setby = '%s' AND reason = '%s' AND expires = %d AND type = %s ORDER BY ID DESC LIMIT 1", eemask, eesetby, eereason, realexpiry, cargv[2]);
- controlreply(np, "Error allocating - regexgline NOT ADDED.");
- return CMD_ERROR;
- }
- } else {
- rg_sqlfree(res);
- rg_sqlquery("DELETE FROM regexglines WHERE gline = '%s' AND setby = '%s' AND reason = '%s' AND expires = %d AND type = %s ORDER BY ID DESC LIMIT 1", eemask, eesetby, eereason, realexpiry, cargv[2]);
- controlreply(np, "Error selecting ID from database - regexgline NOT ADDED.");
- return CMD_ERROR;
- }
- } else {
- rg_sqlquery("DELETE FROM regexglines WHERE gline = '%s' AND setby = '%s' AND reason = '%s' AND expires = %d AND type = %s ORDER BY ID DESC LIMIT 1", eemask, eesetby, eereason, realexpiry, cargv[2]);
- controlreply(np, "Error fetching ID from database - regexgline NOT ADDED.");
- return CMD_ERROR;
- }
- } else {
- rg_sqlquery("DELETE FROM regexglines WHERE gline = '%s' AND setby = '%s' AND reason = '%s' AND expires = %d AND type = %s ORDER BY ID DESC LIMIT 1", eemask, eesetby, eereason, realexpiry, cargv[2]);
- controlreply(np, "Error executing query - regexgline NOT ADDED.");
- return CMD_ERROR;
- }
+ highestid = highestid + 1;
+ dbquery("INSERT INTO regexgline.glines (id, gline, setby, reason, expires, type, class) VALUES (%d, '%s', '%s', '%s', %d, %c, '%s')", highestid, eemask, eesetby, eereason, realexpiry, type, eeclass);
+ rp = rg_newsstruct(highestid, regex, np->nick, reason, "", cargv[2], realexpiry, class);
rg_initglinelist(&gll);
expirybuf = longtoduration(expiry, 0);
- rg_logevent(np, "regexgline", "%s %d %d %s", cargv[0], expiry, count, cargv[3]);
- controlreply(np, "Added regexgline: %s (expires in: %s, hit %d user%s): %s", cargv[0], expirybuf, count, (count!=1)?"s":"", cargv[3]);
+ rg_logevent(np, "regexgline", "%s %d %d %s %s", regex, expiry, count, class, reason);
+ controlreply(np, "Added regexgline: %s (class: %s, expires in: %s, hit %d user%s): %s", regex, class, expirybuf, count, (count!=1)?"s":"", reason);
/* If we are using NO, can we safely assume the user is authed here and use ->authname? */
- controlwall(NO_OPER, NL_GLINES, "%s!%s@%s/%s added regexgline: %s (expires in: %s, hit %d user%s): %s", np->nick, np->ident, np->host->name->content, np->authname, cargv[0], expirybuf, count, (count!=1)?"s":"", cargv[3]);
+ controlwall(NO_OPER, NL_GLINES, "%s!%s@%s/%s added regexgline: %s (class: %s, expires in: %s, hit %d user%s): %s", np->nick, np->ident, np->host->name->content, np->authname, regex, class, expirybuf, count, (count!=1)?"s":"", reason);
return CMD_OK;
}
if(delay->reason==rp)
delay->reason = NULL;
- rg_sqlquery("DELETE FROM regexglines WHERE id = %d", rp->id);
+ dbquery("DELETE FROM regexgline.glines WHERE id = %d", rp->id);
if(last) {
last->next = rp->next;
rg_freestruct(rp);
}
rg_logevent(np, "regexglist", "%s", cargv[0]);
- controlreply(np, "Mask Expires Set by Type Reason");
+ controlreply(np, "Mask Expires Set by Class Type Hits Reason");
for(rp=rg_list;rp;rp=rp->next)
if(pcre_exec(regex, hint, rp->mask->content, rp->mask->length, 0, 0, NULL, 0) >= 0)
rg_displaygline(np, rp);
} else {
rg_logevent(np, "regexglist", "");
- controlreply(np, "Mask Expires Set by Type Reason");
+ controlreply(np, "Mask Expires Set by Class Type Hits Reason");
for(rp=rg_list;rp;rp=rp->next)
rg_displaygline(np, rp);
}
return CMD_OK;
}
+char *displaytype(int type) {
+ char *ctype;
+ static char ctypebuf[10];
+
+ switch(type) {
+ case 1:
+ ctype = "igu";
+ break;
+ case 2:
+ ctype = "igh";
+ break;
+ case 3:
+ ctype = "ik";
+ break;
+ case 4:
+ ctype = "dgu";
+ break;
+ case 5:
+ ctype = "dgh";
+ break;
+ case 6:
+ ctype = "dk";
+ break;
+ default:
+ ctype = "??";
+ }
+
+ snprintf(ctypebuf, sizeof(ctype), "%1d:%s", type, ctype);
+ return ctypebuf;
+}
+
void rg_displaygline(nick *np, struct rg_struct *rp) { /* could be a macro? I'll assume the C compiler inlines it */
- controlreply(np, "%-25s %-20s %-15s %-4d %s", rp->mask->content, longtoduration(rp->expires - time(NULL), 0), rp->setby->content, rp->type, rp->reason->content);
+ controlreply(np, " %-25s %-20s %-15s %-8s %-5s %-5lu %s", rp->mask->content, longtoduration(rp->expires - time(NULL), 0), rp->setby->content, rp->class, displaytype(rp->type), rp->hits, rp->reason->content);
}
int rg_spew(void *source, int cargc, char **cargv) {
return CMD_OK;
}
-int rg_sqlconnect(char *dbhost, char *dbuser, char *dbpass, char *db, unsigned int port) {
- mysql_init(&rg_sql);
- if(!mysql_real_connect(&rg_sql, dbhost, dbuser, dbpass, db, port, NULL, 0))
- return -1;
- return 0;
-}
-
-void rg_sqldisconnect(void) {
- mysql_close(&rg_sql);
-}
-
-void rg_sqlescape_string(char *dest, char *source, size_t length) {
- if(length >= RG_QUERY_BUF_SIZE)
- length = RG_QUERY_BUF_SIZE - 1;
-
- mysql_escape_string(dest, source, length);
-}
-
-int rg_sqlquery(char *format, ...) {
- char rg_sqlquery[RG_QUERY_BUF_SIZE];
- va_list va;
-
- va_start(va, format);
- vsnprintf(rg_sqlquery, sizeof(rg_sqlquery), format, va);
- va_end(va);
-
- return mysql_query(&rg_sql, rg_sqlquery);
-}
-
-rg_sqlresult rg_sqlstoreresult(void) {
- return mysql_store_result(&rg_sql);
-}
-
-rg_sqlrow rg_sqlgetrow(rg_sqlresult res) {
- return mysql_fetch_row(res);
-}
-
-void rg_sqlfree(rg_sqlresult res) {
- mysql_free_result(res);
-}
-
void rg_startup(void) {
int j, hostlen;
nick *np;
rp = (struct rg_struct*)malloc(sizeof(struct rg_struct));
if(rp) {
struct rg_struct *tp, *lp;
- rp->id = 0;
- rp->mask = NULL;
- rp->setby = NULL;
- rp->reason = NULL;
+
+ memset(rp, 0, sizeof(rp));
rp->expires = expires;
- rp->type = 0;
- rp->regex = NULL;
- rp->hint = NULL;
for(lp=NULL,tp=rg_list;tp;lp=tp,tp=tp->next) {
if (expires <= tp->expires) { /* <= possible, slight speed increase */
return rp;
}
-struct rg_struct *rg_newsstruct(char *id, char *mask, char *setby, char *reason, char *expires, char *type, time_t iexpires, int iid) {
+struct rg_struct *rg_newsstruct(unsigned long id, char *mask, char *setby, char *reason, char *expires, char *type, time_t iexpires, char *class) {
struct rg_struct *newrow, *lp, *cp;
time_t rexpires;
char glineiddata[1024];
+ const char **p;
+
if (iexpires == 0) {
int qexpires;
if(!protectedatoi(expires, &qexpires))
const char *error;
int erroroffset;
+ for(p=classes;*p;p++) {
+ if(!strcasecmp(class, *p)) {
+ newrow->class = *p;
+ break;
+ }
+ }
+
+ if(!*p)
+ newrow->class = "unknown";
+
if(!(newrow->regex = pcre_compile(mask, RG_PCREFLAGS, &error, &erroroffset, NULL))) {
Error("regexgline", ERR_WARNING, "Error compiling expression %s at offset %d: %s", mask, erroroffset, error);
goto dispose;
}
}
- if (!iid) {
- if(!protectedatoi(id, &newrow->id))
- goto dispose2;
- } else {
- newrow->id = iid;
- }
-
+ newrow->id = id;
+
newrow->mask = getsstring(mask, RG_REGEXGLINE_MAX);
if(!newrow->mask) {
Error("regexgline", ERR_WARNING, "Error allocating memory for mask!");
int __rg_dogline(struct rg_glinelist *gll, nick *np, struct rg_struct *rp, char *matched) { /* PPA: if multiple users match the same user@host or *@host it'll send multiple glines?! */
char hostname[RG_MASKLEN];
int usercount = 0;
+ int validdelay;
rg_loggline(rp, np);
- if (rp->type == 2) {
+ if (rp->type == INSTANT_HOST_GLINE) {
usercount = np->host->clonecount;
snprintf(hostname, sizeof(hostname), "*@%s", IPtostr(np->p_ipaddr));
}
- if ((rp->type == 1) || (usercount > rg_max_per_gline)) {
+ if ((rp->type == INSTANT_IDENT_GLINE) || (usercount > rg_max_per_gline)) {
nick *tnp;
for(usercount=0,tnp=np->host->nicks;tnp;tnp=tnp->nextbyhost)
snprintf(hostname, sizeof(hostname), "%s@%s", np->ident, IPtostr(np->p_ipaddr));
}
- if ((rp->type >= 3) || (usercount > rg_max_per_gline)) {
+ validdelay = (rp->type == INSTANT_KILL) || (rp->type == DELAYED_IDENT_GLINE) || (rp->type == DELAYED_HOST_GLINE) || (rp->type == DELAYED_KILL);
+ if (validdelay || (usercount > rg_max_per_gline)) {
struct rg_glinenode *nn = (struct rg_glinenode *)malloc(sizeof(struct rg_glinenode));
if(nn) {
nn->next = NULL;
gll->start = nn;
gll->end = nn;
}
+
nn->np = np;
nn->reason = rp;
-
- if (rp->type <= 3) {
- nn->punish = 3;
+ if(!validdelay) {
+ nn->punish = INSTANT_KILL;
} else {
nn->punish = rp->type;
}
return usercount;
}
- if ((rp->type <= 0) || (rp->type >= 3))
- return 0;
-
- if (rp->type == 1) {
+ if (rp->type == INSTANT_IDENT_GLINE) {
if (IsAccount(np)) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched user@host gline regex %08lx (hit %d user%s)", np->nick, np->ident, np->host->name->content, np->authname, rp->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched user@host gline regex %08lx (class: %s, hit %d user%s)", np->nick, np->ident, np->host->name->content, np->authname, rp->glineid, rp->class, usercount, (usercount!=1)?"s":"");
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched user@host gline regex %08lx (hit %d user%s)", np->nick, np->ident, np->host->name->content, rp->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched user@host gline regex %08lx (class: %s, hit %d user%s)", np->nick, np->ident, np->host->name->content, rp->glineid, rp->class, usercount, (usercount!=1)?"s":"");
}
- } else {
+ } else if(rp->type == INSTANT_HOST_GLINE) {
if (IsAccount(np)) {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched *@host gline regex %08lx (hit %d user%s)", np->nick, np->ident, np->host->name->content, np->authname, rp->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s/%s matched *@host gline regex %08lx (class: %s, hit %d user%s)", np->nick, np->ident, np->host->name->content, np->authname, rp->glineid, rp->class, usercount, (usercount!=1)?"s":"");
} else {
- controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched *@host gline regex %08lx (hit %d user%s)", np->nick, np->ident, np->host->name->content, rp->glineid, usercount, (usercount!=1)?"s":"");
+ controlwall(NO_OPER, NL_HITS, "%s!%s@%s matched *@host gline regex %08lx (class: %s, hit %d user%s)", np->nick, np->ident, np->host->name->content, rp->glineid, rp->class, usercount, (usercount!=1)?"s":"");
}
+ } else {
+ return 0;
}
- irc_send("%s GL * +%s %d :AUTO: %s (ID: %08lx)\r\n", mynumeric->content, hostname, rg_expiry_time, rp->reason->content, rp->glineid);
+ rg_shadowserver(np, rp, rp->type);
+ irc_send("%s GL * +%s %d %d :AUTO: %s (ID: %08lx)\r\n", mynumeric->content, hostname, rg_expiry_time, time(NULL), rp->reason->content, rp->glineid);
return usercount;
}
-int floodprotection = 0;
+static int floodprotection = 0;
+static int lastfloodspam = 0;
void rg_dogline(struct rg_glinelist *gll, nick *np, struct rg_struct *rp, char *matched) {
int t = time(NULL);
if(t > floodprotection) {
floodprotection = t;
} else if((floodprotection - t) / 8 > RG_NETWORK_WIDE_MAX_GLINES_PER_8_SEC) {
- channel *cp = findchannel("#twilightzone");
- if(cp)
- controlchanmsg(cp, "WARNING! REGEXGLINE DISABLED FOR AN HOUR DUE TO NETWORK WIDE LOOKING GLINE!");
- controlwall(NO_OPER, NL_MANAGEMENT, "WARNING! REGEXGLINE DISABLED FOR AN HOUR DUE TO NETWORK WIDE LOOKING GLINE!");
- floodprotection = t + RG_NETWORK_WIDE_MAX_GLINES_PER_8_SEC * 3600 * 8;
+ if(t > lastfloodspam + 3600) {
+ channel *cp = findchannel("#twilightzone");
+ if(cp)
+ controlchanmsg(cp, "WARNING! REGEXGLINE DISABLED FOR AN HOUR DUE TO NETWORK WIDE LOOKING GLINE!: %d exceeded %d", (floodprotection - t) / 8, RG_NETWORK_WIDE_MAX_GLINES_PER_8_SEC);
+ controlwall(NO_OPER, NL_MANAGEMENT, "WARNING! REGEXGLINE DISABLED FOR AN HOUR DUE TO NETWORK WIDE LOOKING GLINE!");
+ lastfloodspam = t;
+ floodprotection = t + RG_NETWORK_WIDE_MAX_GLINES_PER_8_SEC * 3600 * 8;
+ }
+ return;
}
floodprotection+=__rg_dogline(gll, np, rp, matched);
char buf[513], account[ACCOUNTLEN + 1], mask[RG_MASKLEN];
int masklen;
- return;
va_list va;
va_start(va, details);
masklen = 0;
}
- rg_sqlescape_string(eeevent, event, strlen(event));
- rg_sqlescape_string(eedetails, buf, strlen(buf));
- rg_sqlescape_string(eeaccount, event, strlen(account));
- rg_sqlescape_string(eemask, mask, masklen);
+ dbescapestring(eeevent, event, strlen(event));
+ dbescapestring(eedetails, buf, strlen(buf));
+ dbescapestring(eeaccount, account, strlen(account));
+ dbescapestring(eemask, mask, masklen);
- rg_sqlquery("INSERT INTO regexlogs (host, account, event, arg) VALUES ('%s', '%s', '%s', '%s')", eemask, eeaccount, eeevent, eedetails);
+ dbquery("INSERT INTO regexgline.clog (host, account, event, arg, ts) VALUES ('%s', '%s', '%s', '%s', NOW())", eemask, eeaccount, eeevent, eedetails);
}
void rg_loggline(struct rg_struct *rg, nick *np) {
char eenick[RG_QUERY_BUF_SIZE], eeuser[RG_QUERY_BUF_SIZE], eehost[RG_QUERY_BUF_SIZE], eereal[RG_QUERY_BUF_SIZE];
+ rg->hits++;
+
+ /* @paul: disabled */
+
return;
- rg_sqlescape_string(eenick, np->nick, strlen(np->nick));
- rg_sqlescape_string(eeuser, np->ident, strlen(np->ident));
- rg_sqlescape_string(eehost, np->host->name->content, strlen(np->host->name->content));
- rg_sqlescape_string(eereal, np->realname->name->content, strlen(np->realname->name->content));
+ dbescapestring(eenick, np->nick, strlen(np->nick));
+ dbescapestring(eeuser, np->ident, strlen(np->ident));
+ dbescapestring(eehost, np->host->name->content, strlen(np->host->name->content));
+ dbescapestring(eereal, np->realname->name->content, strlen(np->realname->name->content));
- rg_sqlquery("INSERT INTO regexglinelog (glineid, nickname, username, hostname, realname) VALUES (%d, '%s', '%s', '%s', '%s')", rg->id, eenick, eeuser, eehost, eereal);
+ dbquery("INSERT INTO regexgline.glog (glineid, nickname, username, hostname, realname, ts) VALUES (%d, '%s', '%s', '%s', '%s', NOW())", rg->id, eenick, eeuser, eehost, eereal);
}
projects / irc / quakenet / newserv.git / blobdiff