Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-05-16 02:33:56 UTC
Modified files:
ChangeLog include/gline.h ircd/gline.c ircd/s_err.c
Log message:
Forward port gline fixes from 2.10.11.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.413 ircu2.10/ChangeLog:1.414
--- ircu2.10/ChangeLog:1.413 Sat May 15 15:11:45 2004
+++ ircu2.10/ChangeLog Sat May 15 19:33:46 2004
@@ -1,3 +1,10 @@
+2004-05-15 Michael Poole <[EMAIL PROTECTED]>
+
+ * include/gline.h, ircd/gline.c, ircd/s_err.c: Forward port a lot
+ of gline-related fixes from 2.10.11. Things that work are due to
+ Kev, Isomer, Spike, hikari, and probably others; CVS makes it hard
+ to figure out who did what. Any mistakes are mine.
+
2004-05-15 Isomer <[EMAIL PROTECTED]>
[Original ChangeLog date: 2003-11-05 -MDP]
Index: ircu2.10/include/gline.h
diff -u ircu2.10/include/gline.h:1.12 ircu2.10/include/gline.h:1.13
--- ircu2.10/include/gline.h:1.12 Tue Jan 7 02:06:44 2003
+++ ircu2.10/include/gline.h Sat May 15 19:33:46 2004
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: gline.h,v 1.12 2003/01/07 10:06:44 a1kmm Exp $
+ * $Id: gline.h,v 1.13 2004/05/16 02:33:46 entrope Exp $
*/
#ifndef INCLUDED_sys_types_h
#include <sys/types.h>
@@ -58,14 +58,16 @@
#define GLINE_GLOBAL 0x0100 /* find only global glines */
#define GLINE_LASTMOD 0x0200 /* find only glines with non-zero lastmod */
#define GLINE_OPERFORCE 0x0400 /* oper forcing gline to be set */
+#define GLINE_REALNAME 0x0800 /* gline matches only the realname field */
-#define GLINE_MASK (GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL)
+#define GLINE_MASK (GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL | GLINE_REALNAME)
#define GLINE_ACTMASK (GLINE_ACTIVE | GLINE_LDEACT)
#define GlineIsActive(g) (((g)->gl_flags & GLINE_ACTMASK) == \
GLINE_ACTIVE)
#define GlineIsRemActive(g) ((g)->gl_flags & GLINE_ACTIVE)
#define GlineIsIpMask(g) ((g)->gl_flags & GLINE_IPMASK)
+#define GlineIsRealName(g) ((g)->gl_flags & GLINE_REALNAME)
#define GlineIsBadChan(g) ((g)->gl_flags & GLINE_BADCHAN)
#define GlineIsLocal(g) ((g)->gl_flags & GLINE_LOCAL)
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.44 ircu2.10/ircd/gline.c:1.45
--- ircu2.10/ircd/gline.c:1.44 Fri May 14 05:50:32 2004
+++ ircu2.10/ircd/gline.c Sat May 15 19:33:46 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: gline.c,v 1.44 2004/05/14 12:50:32 entrope Exp $
+ * $Id: gline.c,v 1.45 2004/05/16 02:33:46 entrope Exp $
*/
#include "config.h"
@@ -72,6 +72,12 @@
{
char *tmp;
+ if (*userhost == '$') {
+ *user_p = userhost;
+ *host_p = NULL;
+ return;
+ }
+
if (!(tmp = strchr(userhost, '@'))) {
*user_p = def_user;
*host_p = userhost;
@@ -95,17 +101,18 @@
if (gline->gl_expire <= CurrentTime)
gline_free(gline);
- else if ((gline->gl_flags & GLINE_LOCAL) != (flags & GLINE_LOCAL))
+ else if (((gline->gl_flags & GLINE_LOCAL) != (flags & GLINE_LOCAL)) ||
+ (gline->gl_host && !host) || (!gline->gl_host && host))
continue;
- else if (!mmatch(gline->gl_user, user) && /* gline contains new mask */
- !mmatch(gline->gl_host, host)) {
+ else if (!mmatch(gline->gl_user, user) /* gline contains new mask */
+ && (gline->gl_host == NULL || !mmatch(gline->gl_host, host))) {
if (expire <= gline->gl_expire) /* will expire before wider gline */
return 0;
else
after = gline; /* stick new gline after this one */
- } else if (!mmatch(user, gline->gl_user) && /* new mask contains gline */
- !mmatch(host, gline->gl_host) &&
- gline->gl_expire <= expire) /* gline expires before new one */
+ } else if (!mmatch(user, gline->gl_user) /* new mask contains gline */
+ && (gline->gl_host==NULL || !mmatch(host, gline->gl_host))
+ && gline->gl_expire <= expire) /* old expires before new */
gline_free(gline); /* save some memory */
}
}
@@ -129,25 +136,47 @@
BadChanGlineList = gline;
} else {
DupString(gline->gl_user, user); /* remember them... */
- DupString(gline->gl_host, host);
+ if (*user != '$')
+ DupString(gline->gl_host, host);
+ else
+ gline->gl_host = NULL;
- if (check_if_ipmask(host)) { /* mark if it's an IP mask */
+ if (*user != '$' && check_if_ipmask(host)) { /* mark if it's an IP mask */
int c_class;
char ipname[16];
int ad[4] = { 0 };
int bits2 = 0;
-
- c_class = sscanf(host,"%d.%d.%d.%d/%d",
- &ad[0],&ad[1],&ad[2],&ad[3], &bits2);
- if (c_class!=5) {
- gline->bits=c_class*8;
+ char *ch;
+ int seenwild;
+ int badmask=0;
+
+ /* Sanity check for dodgy IP masks
+ * Any mask featuring a digit after a wildcard will
+ * not behave as expected. */
+ for (seenwild=0,ch=host;*ch;ch++) {
+ if (*ch=='*' || *ch=='?')
+ seenwild=1;
+ if (IsDigit(*ch) && seenwild) {
+ badmask=1;
+ break;
+ }
}
- else {
- gline->bits=bits2;
+
+ if (badmask) {
+ /* It's bad - let's make it match 0.0.0.0/32 */
+ gline->bits=32;
+ gline->ipnum.s_addr=0;
+ } else {
+ c_class = sscanf(host,"%d.%d.%d.%d/%d",
+ &ad[0],&ad[1],&ad[2],&ad[3], &bits2);
+ if (c_class!=5)
+ gline->bits=c_class*8;
+ else
+ gline->bits=bits2;
+ ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1],
+ ad[2], ad[3]);
+ gline->ipnum.s_addr = inet_addr(ipname);
}
- ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1],
- ad[2], ad[3]);
- gline->ipnum.s_addr = inet_addr(ipname);
Debug((DEBUG_DEBUG,"IP gline: %08x/%i",gline->ipnum.s_addr,gline->bits));
gline->gl_flags |= GLINE_IPMASK;
}
@@ -187,18 +216,26 @@
if (!cli_user(acptr))
continue;
- if (cli_user(acptr)->username &&
- match (gline->gl_user, (cli_user(acptr))->username) != 0)
- continue;
+ if (GlineIsRealName(gline)) { /* Realname Gline */
+ Debug((DEBUG_DEBUG,"Realname Gline: %s %s",(cli_info(acptr)),
+ gline->gl_user+2));
+ if (match(gline->gl_user+2, cli_info(acptr)) != 0)
+ continue;
+ Debug((DEBUG_DEBUG,"Matched!"));
+ } else { /* Host/IP gline */
+ if (cli_user(acptr)->username &&
+ match(gline->gl_user, (cli_user(acptr))->username) != 0)
+ continue;
- if (GlineIsIpMask(gline)) {
- Debug((DEBUG_DEBUG,"IP gline: %08x
%08x/%i",(cli_ip(cptr)).s_addr,gline->ipnum.s_addr,gline->bits));
- if (((cli_ip(acptr)).s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
- continue;
- }
- else {
- if (match(gline->gl_host, cli_sockhost(acptr)) != 0)
- continue;
+ if (GlineIsIpMask(gline)) {
+ Debug((DEBUG_DEBUG,"IP gline: %08x
%08x/%i",(cli_ip(cptr)).s_addr,gline->ipnum.s_addr,gline->bits));
+ if (((cli_ip(acptr)).s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
+ continue;
+ }
+ else {
+ if (match(gline->gl_host, cli_sockhost(acptr)) != 0)
+ continue;
+ }
}
/* ok, here's one that got G-lined */
@@ -290,16 +327,17 @@
if (gline->gl_lastmod)
sendcmdto_serv_butone(sptr, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
- GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_lastmod,
gline->gl_reason);
else
sendcmdto_serv_butone(sptr, CMD_GLINE, cptr,
(GlineIsRemActive(gline) ?
"* +%s%s%s %Tu :%s" : "* -%s%s%s"),
- gline->gl_user, GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_user,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_reason);
return 0;
@@ -320,7 +358,7 @@
/* NO_OLD_GLINE allows [EMAIL PROTECTED] to work correctly */
if (*userhost == '#' || *userhost == '&'
# ifndef NO_OLD_GLINE
- || userhost[2] == '#' || userhost[2] == '&'
+ || ((userhost[2] == '#' || userhost[2] == '&') && (userhost[1] == '@'))
# endif /* OLD_GLINE */
) {
if ((flags & GLINE_LOCAL) && !HasPriv(sptr, PRIV_LOCAL_BADCHAN))
@@ -328,12 +366,28 @@
flags |= GLINE_BADCHAN;
# ifndef NO_OLD_GLINE
- if (userhost[2] == '#' || userhost[2] == '&')
+ if ((userhost[2] == '#' || userhost[2] == '&') && (userhost[1] == '@'))
user = userhost + 2;
else
# endif /* OLD_GLINE */
user = userhost;
host = 0;
+ } else if (*userhost == '$'
+# ifndef NO_OLD_GLINE
+ || userhost[2] == '$'
+# endif /* OLD_GLINE */
+ ) {
+ switch (*userhost == '$' ? userhost[1] : userhost[3]) {
+ case 'R': flags |= GLINE_REALNAME; break;
+ default:
+ /* uh, what to do here? */
+ /* The answer, my dear Watson, is we throw a protocol_violation()
+ -- hikari */
+ return protocol_violation(sptr,"%s has been smoking the sweet leaf and sent
me a whacky gline",cli_name(sptr));
+ break;
+ }
+ user = (*userhost =='$' ? userhost : userhost+2);
+ host = 0;
} else {
canon_userhost(userhost, &user, &host, "*");
if (sizeof(uhmask) <
@@ -377,8 +431,8 @@
cli_name((cli_user(sptr))->server),
(flags & GLINE_LOCAL) ? "local" : "global",
(flags & GLINE_BADCHAN) ? "BADCHAN" : "GLINE", user,
- (flags & GLINE_BADCHAN) ? "" : "@",
- (flags & GLINE_BADCHAN) ? "" : host,
+ (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : "@",
+ (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : host,
expire + TSoffset, reason);
/* and log it */
@@ -435,15 +489,15 @@
cli_name(sptr) :
cli_name((cli_user(sptr))->server),
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
- gline->gl_user, GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_user, gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
"%#C activating global %s for %s%s%s, expiring at %Tu: %s", sptr,
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
- GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
@@ -495,15 +549,15 @@
cli_name(sptr) :
cli_name((cli_user(sptr))->server),
msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
- gline->gl_user, GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_user, gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
"%#C %s %s for %s%s%s, expiring at %Tu: %s", sptr, msg,
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
- GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
@@ -561,12 +615,14 @@
(flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
else if (flags & GLINE_EXACT) {
- if (ircd_strcmp(gline->gl_host, host) == 0 &&
- ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
+ if (((gline->gl_host && host && ircd_strcmp(gline->gl_host, host) == 0)
+ || (!gline->gl_host && !host)) &&
+ ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
ircd_strcmp(gline->gl_user, user) == 0))
break;
} else {
- if (match(gline->gl_host, host) == 0 &&
+ if (((gline->gl_host && host && ircd_strcmp(gline->gl_host, host) == 0)
+ || (!gline->gl_host && !host)) &&
((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
match(gline->gl_user, user) == 0))
break;
@@ -593,20 +649,29 @@
}
if ((flags & GLINE_GLOBAL && gline->gl_flags & GLINE_LOCAL) ||
- (flags & GLINE_LASTMOD && !gline->gl_lastmod))
+ (flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
-
- if (match(gline->gl_user, (cli_user(cptr))->username) != 0)
- continue;
-
- if (GlineIsIpMask(gline)) {
- Debug((DEBUG_DEBUG,"IP gline: %08x
%08x/%i",(cli_ip(cptr)).s_addr,gline->ipnum.s_addr,gline->bits));
- if (((cli_ip(cptr)).s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
+
+ if (GlineIsRealName(gline)) {
+ Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
+ if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
+
+ return gline;
}
else {
- if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0)
+ if (match(gline->gl_user, (cli_user(cptr))->username) != 0)
continue;
+
+ if (GlineIsIpMask(gline)) {
+ Debug((DEBUG_DEBUG,"IP gline: %08x
%08x/%i",(cli_ip(cptr)).s_addr,gline->ipnum.s_addr,gline->bits));
+ if (((cli_ip(cptr)).s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
+ continue;
+ }
+ else {
+ if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0)
+ continue;
+ }
}
return gline;
}
@@ -644,10 +709,12 @@
if (gline->gl_expire <= CurrentTime) /* expire any that need expiring */
gline_free(gline);
else if (!GlineIsLocal(gline) && gline->gl_lastmod)
- sendcmdto_one(&me, CMD_GLINE, cptr, "* [EMAIL PROTECTED] %Tu %Tu :%s",
+ sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
- gline->gl_host, gline->gl_expire - CurrentTime,
- gline->gl_lastmod, gline->gl_reason);
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
+ gline->gl_expire - CurrentTime, gline->gl_lastmod,
+ gline->gl_reason);
}
for (gline = BadChanGlineList; gline; gline = sgline) { /* all glines */
@@ -671,8 +738,8 @@
sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
- GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_lastmod,
gline->gl_reason);
@@ -691,8 +758,8 @@
/* send gline information along */
send_reply(sptr, RPL_GLIST, gline->gl_user,
- GlineIsBadChan(gline) ? "" : "@",
- GlineIsBadChan(gline) ? "" : gline->gl_host,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset,
GlineIsLocal(gline) ? cli_name(&me) : "*",
GlineIsActive(gline) ? '+' : '-', gline->gl_reason);
@@ -703,7 +770,9 @@
if (gline->gl_expire <= CurrentTime)
gline_free(gline);
else
- send_reply(sptr, RPL_GLIST, gline->gl_user, "@", gline->gl_host,
+ send_reply(sptr, RPL_GLIST, gline->gl_user,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset,
GlineIsLocal(gline) ? cli_name(&me) : "*",
GlineIsActive(gline) ? '+' : '-', gline->gl_reason);
@@ -739,7 +808,9 @@
if (gline->gl_expire <= CurrentTime)
gline_free(gline);
else
- send_reply(sptr, RPL_STATSGLINE, 'G', gline->gl_user, gline->gl_host,
+ send_reply(sptr, RPL_STATSGLINE, 'G', gline->gl_user,
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
}
}
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.46 ircu2.10/ircd/s_err.c:1.47
--- ircu2.10/ircd/s_err.c:1.46 Sat May 15 15:11:44 2004
+++ ircu2.10/ircd/s_err.c Sat May 15 19:33:46 2004
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_err.c,v 1.46 2004/05/15 22:11:44 entrope Exp $
+ * $Id: s_err.c,v 1.47 2004/05/16 02:33:46 entrope Exp $
*/
#include "config.h"
@@ -526,7 +526,7 @@
/* 246 */
{ RPL_STATSTLINE, "%c %s %s", "246" },
/* 247 */
- { RPL_STATSGLINE, "%c [EMAIL PROTECTED] %Tu :%s", "247" },
+ { RPL_STATSGLINE, "%c %s%s%s %Tu :%s", "247" },
/* 248 */
{ RPL_STATSULINE, "%c %s %s %s %d %d", "248" },
/* 249 */
----------------------- End of diff -----------------------
