#include <assert.h>
#include "../lib/irc_string.h"
#include "../lib/version.h"
+#include "../core/schedule.h"
#include "../irc/irc.h"
#include "../trusts/trusts.h"
#include "../control/control.h"
/* If we're connected to IRC, force a disconnect. */
if (connected) {
irc_send("%s SQ %s 0 :Resync [adding gline support]", mynumeric->content, myserver->content);
- irc_disconnected();
+ irc_disconnected(0);
}
registerserverhandler("GL", handleglinemsg, 6);
return 0;
if (gl->flags & GLINE_IPMASK) {
- if (!ipmask_check(&gl->ip, &np->p_ipaddr, gl->bits))
+ if (!ipmask_check(&gl->ip, &np->ipaddress, gl->bits))
return 0;
} else {
if (gl->host && match(gl->host->content, np->host->name->content) != 0)
return 1;
}
-int gline_count_hits(gline *gl) {
- int i, count;
- chanindex *cip;
- channel *cp;
- nick *np;
-
- count = 0;
-
- if (gl->flags & GLINE_BADCHAN) {
- for (i = 0; i<CHANNELHASHSIZE; i++) {
- for (cip = chantable[i]; cip; cip = cip->next) {
- cp = cip->channel;
-
- if (!cp)
- continue;
-
- if (gline_match_channel(gl, cp))
- count++;
- }
- }
- } else {
- for (i = 0; i < NICKHASHSIZE; i++) {
- for (np = nicktable[i]; np; np = np->next) {
- if (gline_match_nick(gl, np))
- count++;
- }
- }
- }
-
- return count;
-}
-
-int glinesetmask(const char *mask, int duration, const char *reason, const char *creator) {
- gline *gl;
- time_t now = getnettime();
-
- gl = findgline(mask);
-
- if (!gl) {
- /* new gline */
- gl = gline_add(creator, mask, reason, now + duration, now, now + duration);
-
- if (gl)
- gline_propagate(gl);
- } else {
- /* existing gline
- * in 1.4, can update expire, reason etc
- * in 1.3 can only activate an existing inactive gline */
- if (!(gl->flags & GLINE_ACTIVE))
- gline_activate(gl, 0, 1);
- }
-
- return 1;
-}
-
-int glineunsetmask(const char *mask) {
- gline *gl = findgline(mask);
-
- if (gl && (gl->flags & GLINE_ACTIVE)) {
- controlwall(NO_OPER, NL_GLINES, "Deactivating G-Lline on '%s'.", mask);
- gline_deactivate(gl, 0, 1);
- return 1;
- }
-
- return 0;
-}
-
-static void glinesetmask_cb(const char *mask, int hits, void *arg) {
- gline_params *gp = arg;
- glinesetmask(mask, gp->duration, gp->reason, gp->creator);
-}
-
-int glinesuggestbyip(const char *user, struct irc_in_addr *ip, unsigned char bits, int flags, gline_callback callback, void *uarg) {
- trusthost *th, *oth;
- char mask[512];
- int hits;
- unsigned char nodebits;
- gline *gl;
-
- nodebits = getnodebits(ip);
-
- if (!(flags & GLINE_IGNORE_TRUST)) {
- th = th_getbyhost(ip);
-
- if (th && (th->group->flags & TRUST_RELIABLE_USERNAME)) { /* Trust with reliable usernames */
- hits = 0;
-
- for(oth = th->group->hosts; oth; oth = oth->next)
- hits += glinesuggestbyip(user, &oth->ip, oth->bits, flags | GLINE_ALWAYS_USER | GLINE_IGNORE_TRUST, callback, uarg);
-
- return hits;
- }
- }
-
- if (!(flags & GLINE_ALWAYS_USER))
- user = "*";
-
- /* Widen gline to match the node mask. */
- if (nodebits < bits)
- bits = nodebits;
-
- snprintf(mask, sizeof(mask), "%s@%s", user, trusts_cidr2str(ip, bits));
-
- gl = makegline(mask);
-
- hits = 0;
-
- if (gl) {
- hits = gline_count_hits(gl);
-
- if (!(flags & GLINE_SIMULATE))
- callback(mask, hits, uarg);
-
- freegline(gl);
- }
-
- return hits;
-}
-
-int glinebyip(const char *user, struct irc_in_addr *ip, unsigned char bits, int duration, const char *reason, int flags, const char *creator) {
- gline_params gp;
-
- if (!(flags & GLINE_SIMULATE)) {
- int hits = glinesuggestbyip(user, ip, bits, flags | GLINE_SIMULATE, NULL, NULL);
- if (hits > MAXGLINEUSERS) {
- controlwall(NO_OPER, NL_GLINES, "Suggested G-Line(s) for '%s@%s' lasting %s with reason '%s' would hit %d users (limit: %d) - NOT SET.",
- user, trusts_cidr2str(ip, bits), longtoduration(duration, 0), reason, hits, MAXGLINEUSERS);
- return 0;
- }
- }
-
- gp.duration = duration;
- gp.reason = reason;
- gp.creator = creator;
- return glinesuggestbyip(user, ip, bits, flags, glinesetmask_cb, &gp);
-}
-
-int glinesuggestbynick(nick *np, int flags, void (*callback)(const char *, int, void *), void *uarg) {
- if (flags & GLINE_ALWAYS_NICK) {
- if (!(flags & GLINE_SIMULATE)) {
- char mask[512];
- snprintf(mask, sizeof(mask), "%s!*@*", np->nick);
- callback(mask, 1, uarg);
- }
-
- return 1;
- } else {
- return glinesuggestbyip(np->ident, &np->p_ipaddr, 128, flags, callback, uarg);
- }
-}
-
-int glinebynick(nick *np, int duration, const char *reason, int flags, const char *creator) {
- gline_params gp;
-
- if (!(flags & GLINE_SIMULATE)) {
- int hits = glinesuggestbyip(np->ident, &np->p_ipaddr, 128, flags | GLINE_SIMULATE, NULL, NULL);
- if (hits > MAXGLINEUSERS) {
- controlwall(NO_OPER, NL_GLINES, "Suggested G-Line(s) for nick '%s!%s@%s' lasting %s with reason '%s' would hit %d users (limit: %d) - NOT SET.",
- np->nick, np->ident, IPtostr(np->p_ipaddr), longtoduration(duration, 0), reason, hits, MAXGLINEUSERS);
- return 0;
- }
- }
-
- gp.duration = duration;
- gp.reason = reason;
- gp.creator = creator;
- return glinesuggestbynick(np, flags, glinesetmask_cb, &gp);
-}
-
-gline *gline_add(const char *creator, const char *mask, const char *reason, time_t expire, time_t lastmod, time_t lifetime) {
- gline *gl;
-
- gl = makegline(mask); /* sets up nick,user,host,node and flags */
-
- if (!gl) {
- /* couldn't process gline mask */
- Error("gline", ERR_WARNING, "Tried to add malformed G-Line %s!", mask);
- return 0;
- }
-
- gl->creator = getsstring(creator, 255);
-
- /* it's not unreasonable to assume gline is active, if we're adding a deactivated gline, we can remove this later */
- gl->flags |= GLINE_ACTIVE;
-
- gl->reason = getsstring(reason, 255);
- gl->expire = expire;
- gl->lastmod = lastmod;
- gl->lifetime = lifetime;
-
- gl->next = glinelist;
- glinelist = gl;
-
- return gl;
-}
-
-gline *makegline(const char *mask) {
- /* populate gl-> user,host,node,nick and set appropriate flags */
- gline *gl;
- char nick[512], user[512], host[512];
- const char *pnick = NULL, *puser = NULL, *phost = NULL;
-
- Error("gline", ERR_FATAL, "processing: %s", mask);
-
- gl = newgline();
-
- if (!gl) {
- Error("gline", ERR_ERROR, "Failed to allocate new gline");
- return NULL;
- }
-
- if (*mask == '#' || *mask == '&') {
- gl->flags |= GLINE_BADCHAN;
- gl->user = getsstring(mask, CHANNELLEN);
- return gl;
- }
-
- if (*mask == '$') {
- if (mask[1] != 'R') {
- freegline(gl);
- return NULL;
- }
-
- gl->flags |= GLINE_REALNAME;
- gl->user = getsstring(mask + 2, REALLEN);
- return gl;
- }
-
- if (sscanf(mask, "%[^!]!%[^@]@%s", nick, user, host) == 3) {
- pnick = nick;
- puser = user;
- phost = host;
- } else if (sscanf(mask, "%[^@]@%s", user, host) == 2) {
- puser = user;
- phost = host;
- } else {
- phost = mask;
- }
-
- /* validate length of the mask components */
- if ((pnick && (pnick[0] == '\0' || strlen(pnick) > NICKLEN)) ||
- (puser && (puser[0] == '\0' || strlen(puser) > USERLEN)) ||
- (phost && (phost[0] == '\0' || strlen(phost) > HOSTLEN))) {
- freegline(gl);
- return NULL;
- }
-
- /* ! and @ are not allowed in the mask components */
- if ((pnick && (strchr(pnick, '!') || strchr(pnick, '@'))) ||
- (puser && (strchr(puser, '!') || strchr(puser, '@'))) ||
- (phost && (strchr(phost, '!') || strchr(phost, '@')))) {
- freegline(gl);
- return NULL;
- }
-
- if (phost && ipmask_parse(phost, &gl->ip, &gl->bits))
- gl->flags |= GLINE_IPMASK;
- else
- gl->flags |= GLINE_HOSTMASK;
-
- if (pnick && strcmp(pnick, "*") != 0)
- gl->nick = getsstring(pnick, NICKLEN);
-
- if (puser && strcmp(puser, "*") != 0)
- gl->user = getsstring(puser, USERLEN);
-
- if (phost && strcmp(phost, "*") != 0)
- gl->host = getsstring(phost, HOSTLEN);
-
- return gl;
-}
-
gline *findgline(const char *mask) {
gline *gl, *next;
gline *globalgline;
return 0;
}
-char *glinetostring(gline *gl) {
- static char mask[512]; /* check */
-
- if (gl->flags & GLINE_REALNAME) {
- if (gl->user)
- snprintf(mask, sizeof(mask), "$R%s", gl->user->content);
- else
- strncpy(mask, "$R*", sizeof(mask));
-
- return mask;
- }
-
- if (gl->flags & GLINE_BADCHAN) {
- assert(gl->user);
+void gline_activate(gline *agline, time_t lastmod, int propagate) {
+ time_t now = getnettime();
- strncpy(mask, gl->user->content, sizeof(mask));
- return mask;
- }
+ agline->flags |= GLINE_ACTIVE;
- snprintf(mask, sizeof(mask), "%s!%s@%s",
- gl->nick ? gl->nick->content : "*",
- gl->user ? gl->user->content : "*",
- gl->host ? gl->host->content : "*");
+ if (lastmod)
+ agline->lastmod = lastmod;
+ else if (now <= agline->lastmod)
+ agline->lastmod++;
+ else
+ agline->lastmod = now;
- return mask;
+ if (propagate)
+ gline_propagate(agline);
}
-gline *gline_activate(gline *agline, time_t lastmod, int propagate) {
+void gline_deactivate(gline *agline, time_t lastmod, int propagate) {
time_t now = getnettime();
- agline->flags |= GLINE_ACTIVE;
- if (lastmod) {
- agline->lastmod = lastmod;
- } else {
- if (now <= agline->lastmod)
- agline->lastmod++;
- else
- agline->lastmod = now;
+ if (agline->lastmod == 0) {
+ Error("gline", ERR_WARNING, "Tried to deactivate gline with lastmod == 0: %s", glinetostring(agline));
+ return;
}
+ agline->flags &= ~GLINE_ACTIVE;
+
+ if (lastmod)
+ agline->lastmod = lastmod;
+ else if (now <= agline->lastmod)
+ agline->lastmod++;
+ else
+ agline->lastmod = now;
+
if (propagate)
gline_propagate(agline);
-
- return agline;
}
-gline *gline_deactivate(gline *agline, time_t lastmod, int propagate) {
+void gline_destroy(gline *agline, time_t lastmod, int propagate) {
time_t now = getnettime();
+
agline->flags &= ~GLINE_ACTIVE;
+ agline->flags |= GLINE_DESTROYED;
- if (lastmod) {
- agline->lastmod = lastmod;
- } else {
- if (now <= agline->lastmod)
- agline->lastmod++;
- else
- agline->lastmod = now;
+ if (agline->lastmod == 0) {
+ Error("gline", ERR_WARNING, "Tried to destroy gline with lastmod == 0: %s", glinetostring(agline));
+ return;
}
+ if (lastmod)
+ agline->lastmod = lastmod;
+ else if (now <= agline->lastmod)
+ agline->lastmod++;
+ else
+ agline->lastmod = now;
+
if (propagate)
gline_propagate(agline);
- return agline;
+ removegline(agline);
}
void gline_propagate(gline *agline) {
- if (agline->flags & GLINE_ACTIVE) {
- controlwall(NO_OPER, NL_GLINES, "Activating G-Line on '%s' lasting %s with reason '%s', created by: %s",
+ /* Don't propagate Ulined glines. */
+ if (agline->lastmod == 0) {
+ Error("gline", ERR_WARNING, "Tried to propagate gline with lastmod == 0: %s", glinetostring(agline));
+ return;
+ }
+
+#if SNIRCD_VERSION >= 140
+#error TODO: implement 6 parameter glines for snircd >=1.4.0
+#endif /* SNIRCD_VERSION */
+
+ if (agline->flags & GLINE_DESTROYED) {
+#if SNIRCD_VERSION < 135
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Tried to destroy G-Line on '%s' however SNIRCD_VERSION is too old.", glinetostring(agline));
+#else
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Destroying G-Line on '%s' lasting %s with reason '%s', created by: %s",
glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
- agline->reason->content, agline->creator->content);
+ agline->reason ? agline->reason->content : "", agline->creator->content);
-#if 0
- irc_send("%s GL * +%s %lu %lu :%s\r\n", mynumeric->content,
+ irc_send("%s GL * %%-%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#endif
- controlwall(NO_OPER, NL_GLINES, "%s GL * +%s %lu %lu :%s\r\n", mynumeric->content,
+ agline->lastmod, agline->reason ? agline->reason->content : "");
+#endif /* SNIRCD_VERSION */
+ } else if (agline->flags & GLINE_ACTIVE) {
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Activating G-Line on '%s' lasting %s created by %s with reason '%s'",
+ glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
+ agline->creator->content, agline->reason ? agline->reason->content : "");
+
+ irc_send("%s GL * +%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
+ agline->lastmod, agline->reason ? agline->reason->content : "");
} else {
- controlwall(NO_OPER, NL_GLINES, "Deactivating G-Line on '%s'",
- glinetostring(agline));
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Deactivating G-Line on '%s' lasting %s created by %s with reason '%s'",
+ glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
+ agline->creator->content, agline->reason ? agline->reason->content : "");
-#if 0
irc_send("%s GL * -%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#endif
- controlwall(NO_OPER, NL_GLINES, "%s GL * -%s %lu %lu :%s\r\n", mynumeric->content,
- glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
+ agline->lastmod, agline->reason ? agline->reason->content : "");
}
}
if ((gla->flags & GLINE_REALNAME) != (glb->flags & GLINE_REALNAME))
return 0;
- if ((gla->flags & GLINE_IPMASK) != (glb->flags & GLINE_IPMASK))
- return 0;
-
if (gla->nick && !glb->nick)
return 0;
if (gla->user && glb->user && match(gla->user->content, glb->user->content) != 0)
return 0;
- if (gla->flags & GLINE_IPMASK) {
+ if (gla->flags & GLINE_IPMASK && glb->flags & GLINE_IPMASK) {
if (gla->bits > glb->bits)
return 0;
return 1;
}
+int isglinesane(gline *gl, const char **hint) {
+ int wildcard, nowildcardcount;
+ char *pos;
+ trusthost *th;
+
+ /* Reason is too short */
+ if (!gl->reason || strlen(gl->reason->content) < MINGLINEREASONLEN) {
+ *hint = "G-Line reason is too short.";
+ return 0;
+ }
+
+ /* Duration is too long */
+ if (gl->expire - getnettime() > MAXGLINEDURATION) {
+ *hint = "G-Line duration is too long.";
+ return 0;
+ }
+
+ /* Hits all realnames. */
+ if ((gl->flags & GLINE_REALNAME) && !gl->user) {
+ *hint = "Matches all realnames.";
+ return 0;
+ }
+
+ /* Hits all local/non-local channels. */
+ if ((gl->flags & GLINE_BADCHAN) && (strcmp(gl->user->content, "&*") == 0 || strcmp(gl->user->content, "#*") == 0)) {
+ *hint = "Matches all local/non-local channels.";
+ return 0;
+ }
+
+ /* Hostmask is too long. */
+ if (!(gl->flags & (GLINE_BADCHAN | GLINE_REALNAME)) &&
+ ((gl->nick && strlen(gl->nick->content) > NICKLEN) ||
+ (gl->user && strlen(gl->user->content) > USERLEN) ||
+ (gl->host && strlen(gl->host->content) > HOSTLEN))) {
+ *hint = "Hostmask components are too long.";
+ return 0;
+ }
+
+ /* Skip the other checks for nickname glines. */
+ if (gl->nick)
+ return 1;
+
+ /* Mask wider than /16 for IPv4 or /32 for IPv6. */
+ if ((gl->flags & GLINE_IPMASK) && gl->bits < (irc_in_addr_is_ipv4(&gl->ip) ? (96 + 16) : 32)) {
+ *hint = "CIDR mask too wide.";
+ return 0;
+ }
+
+ /* Doesn't have at least two non-wildcarded host components. */
+ if (gl->flags & GLINE_HOSTMASK) {
+ nowildcardcount = 0;
+
+ wildcard = 0;
+ pos = gl->host->content;
+
+ for (;;) {
+ switch (*pos) {
+ case '*':
+ /* fall through */
+ case '?':
+ wildcard = 1;
+ break;
+
+ case '.':
+ case '\0':
+ if (!wildcard)
+ nowildcardcount++;
+ else
+ wildcard = 0;
+
+ if (*pos == '\0')
+ pos = NULL; /* Leave the loop. */
+
+ break;
+ }
+
+ if (pos)
+ pos++;
+ else
+ break;
+ }
+
+ if (nowildcardcount < 2) {
+ *hint = "Needs at least 2 non-wildcarded host components.";
+ return 0;
+ }
+ }
+
+ /* Wildcard username match for trusted host with reliable usernames. */
+ if ((gl->flags & GLINE_IPMASK) && (!gl->user || strchr(gl->user->content, '*') || strchr(gl->user->content, '?'))) {
+ th = th_getbyhost(&gl->ip);
+
+ if (th && (th->group->flags & TRUST_RELIABLE_USERNAME)) {
+ *hint = "Wildcard username match for a trusted host that has reliable usernames.";
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+gline *glinedup(gline *gl) {
+ gline *sgl;
+
+ sgl = newgline();
+
+ if (!sgl)
+ return NULL;
+
+ if (gl->nick)
+ sgl->nick = getsstring(gl->nick->content, 512);
+
+ if (gl->user)
+ sgl->user = getsstring(gl->user->content, 512);
+
+ if (gl->host)
+ sgl->host = getsstring(gl->host->content, 512);
+
+ sgl->reason = gl->reason ? getsstring(gl->reason->content, 512) : NULL;
+ sgl->creator = getsstring(gl->creator->content, 512);
+
+ memcpy(&sgl->ip, &gl->ip, sizeof(gl->ip));
+ sgl->bits = gl->bits;
+
+ sgl->expire = gl->expire;
+ sgl->lastmod = gl->lastmod;
+ sgl->lifetime = gl->lifetime;
+
+ sgl->flags = gl->flags;
+
+ return sgl;
+}
projects / irc / quakenet / newserv.git / blobdiff