pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-30 15:26:37 +02:00
Code Activity

Update hunt_server() so command is really the command (eg "LUSERS") and

Browse Source 
not a format string (eg ":%s LUSERS %s"). It now simply concats all parv[]'s.
That is, up to parc count. And it automatically does the :stuff for the
last parameter if it contains spaces or starts with a : etc.

This gets rid of a bit sketchy code with an arbitrary maximum etc.

Now it's just:
if (hunt_server(client, NULL, "REHASH", 1, parc, parv) != HUNTED_ISME)
	return;

This has one side effect, though:
Previously we used the format string, so it may be possible for S2S
traffic to now have more arguments then before here and there.
Eg:
* It could be that the caller was using a format string to
  intentionally cut off an extra parameter at the end.
  You can still do that if you call with eg parc-1 instead of parc.
  I don't think there were any such cases though, but hard to rule out.
* Extranous parameters may show up in S2S traffic where it was
  previously unexpected.
This commit is contained in:
Bram Matthys
2021-09-25 14:49:19 +02:00
parent b5375de52d
commit 8603c2eb71
20 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/h.h
+1 -1
View File
@@ -326,7 +326,7 @@ extern char *make_nick_user_host(const char *, const char *, const char *);
extern char *make_nick_user_host_r(char *namebuf, size_t namebuflen, const char *nick, const char *name, const char *host);
extern char *make_user_host(const char *, const char *);
extern void parse(Client *cptr, char *buffer, int length);
extern int hunt_server(Client *, MessageTag *, char *, int, int, const char **);
extern int hunt_server(Client *, MessageTag *, const char *, int, int, const char **);
extern int cmd_server_estab(Client *);
extern void umode_init(void);
#define UMODE_GLOBAL 1
src/modules.c
+2 -2
View File
@@ -793,10 +793,10 @@ CMD_FUNC(cmd_module)
if (MyUser(client) && !IsOper(client) && all)
add_fake_lag(client, 7000); /* Lag them up. Big list. */
if ((parc > 2) && (hunt_server(client, recv_mtags, ":%s MODULE %s :%s", 2, parc, parv) != HUNTED_ISME))
if ((parc > 2) && (hunt_server(client, recv_mtags, "MODULE", 2, parc, parv) != HUNTED_ISME))
return;
if ((parc == 2) && (parv[1][0] != '-') && (hunt_server(client, recv_mtags, ":%s MODULE :%s", 1, parc, parv) != HUNTED_ISME))
if ((parc == 2) && (parv[1][0] != '-') && (hunt_server(client, recv_mtags, "MODULE", 1, parc, parv) != HUNTED_ISME))
return;
if (all)
src/modules/admin.c
+1 -1
View File
@@ -61,7 +61,7 @@ CMD_FUNC(cmd_admin)
if (IsUser(client))
{
if (hunt_server(client, recv_mtags, ":%s ADMIN :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "ADMIN", 1, parc, parv) != HUNTED_ISME)
return;
}
src/modules/botmotd.c
+1 -1
View File
@@ -60,7 +60,7 @@ CMD_FUNC(cmd_botmotd)
MOTDLine *motdline;
ConfigItem_tld *tld;
if (hunt_server(client, recv_mtags, ":%s BOTMOTD :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "BOTMOTD", 1, parc, parv) != HUNTED_ISME)
return;
if (!IsUser(client))
src/modules/connect.c
+1 -1
View File
@@ -76,7 +76,7 @@ CMD_FUNC(cmd_connect)
sendnumeric(client, ERR_NOPRIVILEGES);
return;
}
if (hunt_server(client, recv_mtags, ":%s CONNECT %s %s :%s", 3, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "CONNECT", 3, parc, parv) != HUNTED_ISME)
return;
if (parc < 2 || *parv[1] == '\0')
src/modules/lag.c
+1 -1
View File
@@ -78,7 +78,7 @@ CMD_FUNC(cmd_lag)
return;
}
if (hunt_server(client, recv_mtags, ":%s LAG :%s", 1, parc, parv) == HUNTED_NOSUCH)
if (hunt_server(client, recv_mtags, "LAG", 1, parc, parv) == HUNTED_NOSUCH)
return;
sendnotice(client, "Lag reply -- %s %s %lld", me.name, parv[1], (long long)TStime());
src/modules/lusers.c
+1 -1
View File
@@ -59,7 +59,7 @@ CMD_FUNC(cmd_lusers)
{
char flatmap;
if (hunt_server(client, recv_mtags, ":%s LUSERS :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "LUSERS", 1, parc, parv) != HUNTED_ISME)
return;
flatmap = (FLAT_MAP && !ValidatePermissionsForPath("server:info:lusers",client,NULL,NULL,NULL)) ? 1 : 0;
src/modules/motd.c
+1 -1
View File
@@ -66,7 +66,7 @@ CMD_FUNC(cmd_motd)
if (IsServer(client))
return;
if (hunt_server(client, recv_mtags, ":%s MOTD :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "MOTD", 1, parc, parv) != HUNTED_ISME)
{
if (MyUser(client))
add_fake_lag(client, 15000);
src/modules/rules.c
+1 -1
View File
@@ -63,7 +63,7 @@ CMD_FUNC(cmd_rules)
temp = NULL;
if (hunt_server(client, recv_mtags, ":%s RULES :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "RULES", 1, parc, parv) != HUNTED_ISME)
return;
ptr = find_tld(client);
src/modules/staff.c
+1 -1
View File
@@ -158,7 +158,7 @@ CMD_FUNC(cmd_staff)
if (!IsUser(client))
return;
if (hunt_server(client, recv_mtags, ":%s STAFF", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "STAFF", 1, parc, parv) != HUNTED_ISME)
return;
if (!staff.lines)
src/modules/stats.c
+2 -2
View File
@@ -294,12 +294,12 @@ CMD_FUNC(cmd_stats)
if (parc == 3 && parv[2][0] != '+' && parv[2][0] != '-')
{
if (hunt_server(client, recv_mtags, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "STATS", 2, parc, parv) != HUNTED_ISME)
return;
}
else if (parc == 4 && parv[2][0] != '+' && parv[2][0] != '-')
{
if (hunt_server(client, recv_mtags, ":%s STATS %s %s %s", 2, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "STATS", 2, parc, parv) != HUNTED_ISME)
return;
}
if (parc < 2 || !*parv[1])
src/modules/svslusers.c
+1 -1
View File
@@ -66,7 +66,7 @@ CMD_FUNC(cmd_svslusers)
{
if (!IsULine(client) || parc < 4)
return;
if (hunt_server(client, NULL, ":%s SVSLUSERS %s %s :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, NULL, "SVSLUSERS", 1, parc, parv) == HUNTED_ISME)
{
int temp;
temp = atoi(parv[2]);
src/modules/svsnick.c
+1 -1
View File
@@ -69,7 +69,7 @@ CMD_FUNC(cmd_svsnick)
if (!IsULine(client) || parc < 4 || (strlen(parv[2]) > NICKLEN))
return; /* This looks like an error anyway -Studded */
if (hunt_server(client, NULL, ":%s SVSNICK %s %s :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, NULL, "SVSNICK", 1, parc, parv) != HUNTED_ISME)
return; /* Forwarded, done */
strlcpy(nickname, parv[2], sizeof(nickname));
src/modules/svsnoop.c
+1 -1
View File
@@ -62,7 +62,7 @@ CMD_FUNC(cmd_svsnoop)
if (!(IsULine(client) && parc > 2))
return;
if (hunt_server(client, NULL, ":%s SVSNOOP %s :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, NULL, "SVSNOOP", 1, parc, parv) == HUNTED_ISME)
{
if (parv[2][0] == '+')
{
src/modules/svssno.c
+1 -1
View File
@@ -79,7 +79,7 @@ void do_svssno(Client *client, int parc, const char *parv[], int show_change)
if (!(target = find_person(parv[1], NULL)))
return;
if (hunt_server(client, NULL, show_change ? ":%s SVS2SNO %s %s" : ":%s SVSSNO %s %s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, NULL, show_change ? "SVS2SNO" : "SVSSNO", 1, parc, parv) != HUNTED_ISME)
return;
if (MyUser(target))
src/modules/time.c
+1 -1
View File
@@ -61,6 +61,6 @@ MOD_UNLOAD()
*/
CMD_FUNC(cmd_time)
{
if (hunt_server(client, recv_mtags, ":%s TIME :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, recv_mtags, "TIME", 1, parc, parv) == HUNTED_ISME)
sendnumeric(client, RPL_TIME, me.name, long_date(0));
}
src/modules/trace.c
+2 -2
View File
@@ -73,7 +73,7 @@ CMD_FUNC(cmd_trace)
labeled_response_inhibit = 1;
if (parc > 2)
if (hunt_server(client, NULL, ":%s TRACE %s :%s", 2, parc, parv))
if (hunt_server(client, NULL, "TRACE", 2, parc, parv))
return;
if (parc > 1)
@@ -98,7 +98,7 @@ CMD_FUNC(cmd_trace)
}
}
switch (hunt_server(client, NULL, ":%s TRACE :%s", 1, parc, parv))
switch (hunt_server(client, NULL, "TRACE", 1, parc, parv))
{
case HUNTED_PASS: /* note: gets here only if parv[1] exists */
{
src/modules/whois.c
+1 -1
View File
@@ -80,7 +80,7 @@ CMD_FUNC(cmd_whois)
if (parc > 2)
{
if (hunt_server(client, recv_mtags, ":%s WHOIS %s :%s", 1, parc, parv) != HUNTED_ISME)
if (hunt_server(client, recv_mtags, "WHOIS", 1, parc, parv) != HUNTED_ISME)
return;
parv[1] = parv[2];
}
src/modules/whowas.c
+1 -1
View File
@@ -76,7 +76,7 @@ CMD_FUNC(cmd_whowas)
if (parc > 2)
max = atoi(parv[2]);
if (parc > 3)
if (hunt_server(client, recv_mtags, ":%s WHOWAS %s %s :%s", 3, parc, parv))
if (hunt_server(client, recv_mtags, "WHOWAS", 3, parc, parv))
return;
if (!MyConnect(client) && (max > 20))
src/serv.c
+49 -17
View File
@@ -71,13 +71,24 @@ void reread_motdsandrules();
* @param server This indicates parv[server] contains the destination
* @param parc Parameter count (MAX 8!!)
* @param parv Parameter values (MAX 8!!)
* @note Command can have only max 8 parameters (parv[8])
* @note parv[server] is replaced with the name of the matched client.
* @note While sending parv[server] is replaced with the name of the matched client
* (virtually, as parv[] is not actually written to)
*/
int hunt_server(Client *client, MessageTag *mtags, char *command, int server, int parc, const char *parv[])
int hunt_server(Client *client, MessageTag *mtags, const char *command, int server, int parc, const char *parv[])
{
Client *acptr;
const char *saved;
int i;
char buf[1024];
if (strchr(command, '%') || strchr(command, ' '))
{
unreal_log(ULOG_ERROR, "main", "BUG_HUNT_SERVER", client,
"[BUG] hunt_server called with command '$command' but it may not contain "
"spaces or percentage signs nowadays, it must be ONLY the command.",
log_data_string("command", command));
abort();
}
/* This would be strange and bad. Previous version assumed "it's for me". Hmm.. okay. */
if (parc <= server || BadPtr(parv[server]))
@@ -105,17 +116,38 @@ int hunt_server(Client *client, MessageTag *mtags, char *command, int server, in
return HUNTED_NOSUCH;
}
/* Replace "server" part with actual servername (eg: 'User' -> 'x.y.net')
* Ugly. Previous version didn't even restore the state, now we do.
/* This puts all parv[] arguments in 'buf'
* Taken from concat_params() but this one is
* with parv[server] magic replacement.
*/
saved = parv[server];
parv[server] = acptr->id;
*buf = '\0';
for (i = 1; i < parc; i++)
{
const char *param = parv[i];
sendto_one(acptr, mtags, command, client->id,
parv[1], parv[2], parv[3], parv[4],
parv[5], parv[6], parv[7], parv[8]);
if (!param)
break;
parv[server] = saved;
/* The magic parv[server] replacement:
* this replaces eg 'User' with '001' in S2S traffic.
*/
if (i == server)
param = acptr->id;
if (*buf)
strlcat(buf, " ", sizeof(buf));
if (strchr(param, ' ') || (*param == ':'))
{
/* Last parameter, with : */
strlcat(buf, ":", sizeof(buf));
strlcat(buf, parv[i], sizeof(buf));
break;
}
strlcat(buf, parv[i], sizeof(buf));
}
sendto_one(acptr, mtags, ":%s %s %s", client->id, command, buf);
return HUNTED_PASS;
}
@@ -178,7 +210,7 @@ CMD_FUNC(cmd_version)
return;
}
if (hunt_server(client, recv_mtags, ":%s VERSION :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, recv_mtags, "VERSION", 1, parc, parv) == HUNTED_ISME)
{
sendnumeric(client, RPL_VERSION, version, debugmode, me.name,
(ValidatePermissionsForPath("server:info",client,NULL,NULL,NULL) ? serveropts : "0"),
@@ -312,7 +344,7 @@ CMD_FUNC(cmd_info)
if (remotecmdfilter(client, parc, parv))
return;
if (hunt_server(client, recv_mtags, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, recv_mtags, "INFO", 1, parc, parv) == HUNTED_ISME)
cmd_info_send(client);
}
@@ -326,7 +358,7 @@ CMD_FUNC(cmd_license)
if (remotecmdfilter(client, parc, parv))
return;
if (hunt_server(client, recv_mtags, ":%s LICENSE :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, recv_mtags, "LICENSE", 1, parc, parv) == HUNTED_ISME)
{
while (*text)
sendnumeric(client, RPL_INFO, *text++);
@@ -346,7 +378,7 @@ CMD_FUNC(cmd_credits)
if (remotecmdfilter(client, parc, parv))
return;
if (hunt_server(client, recv_mtags, ":%s CREDITS :%s", 1, parc, parv) == HUNTED_ISME)
if (hunt_server(client, recv_mtags, "CREDITS", 1, parc, parv) == HUNTED_ISME)
{
while (*text)
sendnumeric(client, RPL_INFO, *text++);
@@ -509,13 +541,13 @@ CMD_FUNC(cmd_rehash)
if (parv[1] && (parv[1][0] == '-'))
x = HUNTED_ISME;
else
x = hunt_server(client, recv_mtags, ":%s REHASH :%s", 1, parc, parv);
x = hunt_server(client, recv_mtags, "REHASH", 1, parc, parv);
} else {
if (match_simple("-glob*", parv[1])) /* This is really ugly... hack to make /rehash -global -something work */
{
x = HUNTED_ISME;
} else {
x = hunt_server(client, NULL, ":%s REHASH %s :%s", 1, parc, parv);
x = hunt_server(client, NULL, "REHASH", 1, parc, parv);
}
}
if (x != HUNTED_ISME)