pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-04 12:33:12 +02:00
Code Activity

Bounce links that have their clock too far out of sync (#4214). Currently set at 1 minute. TODO: make configurable.

Browse Source 
This only works with newer servers as it relies on PROTOCTL TS=xyz very early in the synch.
This commit is contained in:
Bram Matthys
2015-05-24 16:16:31 +02:00
parent c2ca896dea
commit 0a42cedf77
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/technical/protoctl.txt
+5
View File
@@ -126,3 +126,8 @@ SID This token indicates that the peer server supports UIDs and SIDs i
ESVID This token indicates that the traditional services stamp value may take any
arbitrary value for the SVID field, such as an account name or other unique
identifier, including a traditional timestamp value.
TS Upon linking newer servers send TS=<ts> where <ts> is the current unix
timestamp. This way a link can be rejected if the difference between the
clock of two servers is too large (since such a difference would lead to
serious issues).
src/modules/m_protoctl.c
+31
View File
@@ -348,6 +348,37 @@ CMD_FUNC(m_protoctl)
if (!IsHandshake(cptr) && aconf && !BadPtr(aconf->connpwd)) /* Send PASS early... */
sendto_one(sptr, "PASS :%s", aconf->connpwd);
}
else if ((strncmp(s, "TS=",3) == 0) && (IsServer(sptr) || IsEAuth(sptr)))
{
long t = atol(s+3);
char msg[512], linkerr[512];
if (t < 10000)
continue; /* ignore */
*msg = *linkerr = '\0';
#define MAX_SERVER_TIME_OFFSET 60
if ((TStime() - t) > MAX_SERVER_TIME_OFFSET)
{
snprintf(linkerr, sizeof(linkerr), "Your clock is %ld seconds behind my clock. Please verify both your clock and mine, fix it and try linking again.", TStime() - t);
snprintf(msg, sizeof(msg), "Rejecting link %s: our clock is %ld seconds ahead. Correct time is very important in IRC. Please verify the clock on both %s (them) and %s (us), fix it and then try linking again",
get_client_name(cptr, TRUE), TStime() - t, sptr->name, me.name);
} else
if ((t - TStime()) > MAX_SERVER_TIME_OFFSET)
{
snprintf(linkerr, sizeof(linkerr), "Your clock is %ld seconds ahead of my clock. Please verify both your clock and mine, fix it, and try linking again.", t - TStime());
snprintf(msg, sizeof(msg), "Rejecting link %s: our clock is %ld seconds behind. Correct time is very important in IRC. Please verify the clock on both %s (them) and %s (us), fix it and then try linking again",
get_client_name(cptr, TRUE), t - TStime(), sptr->name, me.name);
}
if (*msg)
{
sendto_realops("%s", msg);
ircd_log(LOG_ERROR, "%s", msg);
return exit_client(sptr, sptr, sptr, linkerr);
}
}
else if ((strcmp(s, "MLOCK")) == 0)
{
#ifdef PROTOCTL_MADNESS
src/s_serv.c
+2 -2
View File
@@ -222,8 +222,8 @@ char buf[1024];
sendto_one(cptr, "PROTOCTL %s", PROTOCTL_SERVER);
/* Second line */
snprintf(buf, sizeof(buf), "CHANMODES=%s%s,%s%s,%s%s,%s%s NICKCHARS=%s SID=%s MLOCK",
CHPAR1, EXPAR1, CHPAR2, EXPAR2, CHPAR3, EXPAR3, CHPAR4, EXPAR4, langsinuse, me.id);
snprintf(buf, sizeof(buf), "CHANMODES=%s%s,%s%s,%s%s,%s%s NICKCHARS=%s SID=%s MLOCK TS=%ld",
CHPAR1, EXPAR1, CHPAR2, EXPAR2, CHPAR3, EXPAR3, CHPAR4, EXPAR4, langsinuse, me.id, (long)TStime());
sendto_one(cptr, "PROTOCTL %s", buf);
}