Revision: 1905
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1905&view=rev
Author: entrope
Date: 2009-02-09 01:30:13 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Author: Michael Poole <[email protected]>
Description:
Clean up key cleaning: Do not reject non-ASCII characters, and allow
':' after the first character in the key. Add a regression test
script to go along with these changes.
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/include/numeric.h
ircu2/branches/u2_10_12_branch/ircd/channel.c
ircu2/branches/u2_10_12_branch/ircd/s_err.c
Added Paths:
-----------
ircu2/branches/u2_10_12_branch/tests/channel-keys.cmd
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2009-02-09 00:03:34 UTC (rev
1904)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2009-02-09 01:30:13 UTC (rev
1905)
@@ -1,5 +1,20 @@
2009-02-08 Michael Poole <[email protected]>
+ * include/numeric.h (ERR_INVALIDKEY): Define new numeric.
+
+ * ircd/s_err.c (ERR_INVALIDKEY): Give it a text string.
+
+ * ircd/channel.c (is_clean_key): Rename from clean_key(), and make
+ this function responsible for sending error messages to the client
+ when necessary.
+ (mode_parse_key): Update to match the new is_clean_key() behavior.
+ (mode_parse_upass): Likewise.
+ (mode_parse_apass): Likewise.
+
+ * tests/channel-keys.cmd: New file for regression testing.
+
+2009-02-08 Michael Poole <[email protected]>
+
* include/gline.h (gline_forward_deactivation): Undeclare.
* ircd/m_gline.c (mo_gline): Remove the special case to call
Modified: ircu2/branches/u2_10_12_branch/include/numeric.h
===================================================================
--- ircu2/branches/u2_10_12_branch/include/numeric.h 2009-02-09 00:03:34 UTC
(rev 1904)
+++ ircu2/branches/u2_10_12_branch/include/numeric.h 2009-02-09 01:30:13 UTC
(rev 1905)
@@ -456,6 +456,7 @@
ERR_WHOSYNTAX 522 dalnet
ERR_WHOLIMEXCEED 523 dalnet */
#define ERR_QUARANTINED 524 /* Undernet extension -Vampire */
+#define ERR_INVALIDKEY 525 /* Undernet extension */
#define ERR_NOTLOWEROPLEVEL 560 /* Undernet extension */
#define ERR_NOTMANAGER 561 /* Undernet extension */
Modified: ircu2/branches/u2_10_12_branch/ircd/channel.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/channel.c 2009-02-09 00:03:34 UTC
(rev 1904)
+++ ircu2/branches/u2_10_12_branch/ircd/channel.c 2009-02-09 01:30:13 UTC
(rev 1905)
@@ -2330,15 +2330,41 @@
}
}
-/** Helper function to clean key-like parameters. */
-static void
-clean_key(char *s)
+/** Helper function to validate key-like parameters.
+ *
+ * @param[in] state Parse state for feedback to user.
+ * @param[in] s Key to validate.
+ * @param[in] command String to pass for need_more_params() command.
+ * @return Zero on an invalid key, non-zero if the key was okay.
+ */
+static int
+is_clean_key(struct ParseState *state, char *s, char *command)
{
- int t_len = KEYLEN;
+ int ii;
- while (*s > ' ' && *s != ':' && *s != ',' && t_len--)
- s++;
- *s = '\0';
+ if (s[0] == '\0') {
+ if (MyUser(state->sptr))
+ need_more_params(state->sptr, command);
+ return 0;
+ }
+ else if (s[0] == ':') {
+ if (MyUser(state->sptr))
+ send_reply(state->sptr, ERR_INVALIDKEY, state->chptr->chname);
+ return 0;
+ }
+ for (ii = 0; (ii <= KEYLEN) && (s[ii] != '\0'); ++ii) {
+ if ((unsigned char)s[ii] <= ' ' || s[ii] == ',') {
+ if (MyUser(state->sptr))
+ send_reply(state->sptr, ERR_INVALIDKEY, state->chptr->chname);
+ return 0;
+ }
+ }
+ if (ii > KEYLEN) {
+ if (MyUser(state->sptr))
+ send_reply(state->sptr, ERR_INVALIDKEY, state->chptr->chname);
+ return 0;
+ }
+ return 1;
}
/*
@@ -2383,14 +2409,10 @@
state->done |= DONE_KEY_DEL;
}
- /* clean up the key string */
- clean_key(t_str);
- if (!*t_str || *t_str == ':') { /* warn if empty */
- if (MyUser(state->sptr))
- need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +k" :
- "MODE -k");
+ /* If the key is invalid, tell the user and bail. */
+ if (!is_clean_key(state, t_str, state->dir == MODE_ADD ? "MODE +k" :
+ "MODE -k"))
return;
- }
if (!state->mbuf)
return;
@@ -2495,14 +2517,10 @@
state->done |= DONE_UPASS_DEL;
}
- /* clean up the upass string */
- clean_key(t_str);
- if (!*t_str || *t_str == ':') { /* warn if empty */
- if (MyUser(state->sptr))
- need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +U" :
- "MODE -U");
+ /* If the Upass is invalid, tell the user and bail. */
+ if (!is_clean_key(state, t_str, state->dir == MODE_ADD ? "MODE +U" :
+ "MODE -U"))
return;
- }
if (!state->mbuf)
return;
@@ -2642,14 +2660,10 @@
state->done |= DONE_APASS_DEL;
}
- /* clean up the apass string */
- clean_key(t_str);
- if (!*t_str || *t_str == ':') { /* warn if empty */
- if (MyUser(state->sptr))
- need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +A" :
- "MODE -A");
+ /* If the Apass is invalid, tell the user and bail. */
+ if (!is_clean_key(state, t_str, state->dir == MODE_ADD ? "MODE +A" :
+ "MODE -A"))
return;
- }
if (!state->mbuf)
return;
Modified: ircu2/branches/u2_10_12_branch/ircd/s_err.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/s_err.c 2009-02-09 00:03:34 UTC (rev
1904)
+++ ircu2/branches/u2_10_12_branch/ircd/s_err.c 2009-02-09 01:30:13 UTC (rev
1905)
@@ -1082,7 +1082,7 @@
/* 524 */
{ ERR_QUARANTINED, "%s :Channel is quarantined : %s", "524" },
/* 525 */
- { 0 },
+ { ERR_INVALIDKEY, "%s :Key is not well-formed", "525" },
/* 526 */
{ 0 },
/* 527 */
Added: ircu2/branches/u2_10_12_branch/tests/channel-keys.cmd
===================================================================
--- ircu2/branches/u2_10_12_branch/tests/channel-keys.cmd
(rev 0)
+++ ircu2/branches/u2_10_12_branch/tests/channel-keys.cmd 2009-02-09
01:30:13 UTC (rev 1905)
@@ -0,0 +1,45 @@
+define srv1 localhost:7601
+define srv1-name irc.example.net
+define srv2 localhost:7611
+define srv2-name irc-2.example.net
+define cl1-nick Op3rm4n
+define cl2-nick Monitor
+define channel #keytest
+
+# Connect a client to each server, and join them to the same channel.
+connect cl1 %cl1-nick% oper %srv1% :Some Channel Operator
+connect cl2 %cl2-nick% oper %srv2% :Snoopy
+:cl1 join %channel%
+sync cl1,cl2
+:cl2 join %channel%
+sync cl1,cl2
+
+# Set a plain and simple key initially.
+:cl1 mode %channel% +k foo
+:cl2 expect %cl1-nick% mode %channel% \\+k foo
+
+# Slighly funny quoting here: one : for test-driver.pl and one for quoting.
+# The final : makes the key invalid.
+:cl1 mode %channel% -k+k foo :::badkey
+:cl1 expect %srv1-name% 525 %channel% :Key is not well-formed
+:cl2 expect %cl1-nick% mode %channel% -k foo
+
+# Non-ASCII characters should be accepted in the key, and colons after the
first character.
+:cl1 mode %channel% +k mötör:head
+:cl2 expect %cl1-nick% mode %channel% \\+k mötör:head
+
+# We need to have a key, too.
+:cl1 mode %channel% -k+k mötör:head
+:cl1 expect %srv1-name% 461 MODE \\+k :Not enough parameters
+
+# Are spaces accepted anywhere in the key?
+:cl1 mode %channel% +k :: spaced key
+:cl1 expect %srv1-name% 525 %channel% :Key is not well-formed
+
+# What about commas?
+:cl1 mode %channel% +k foo,bar
+:cl1 expect %srv1-name% 525 %channel% :Key is not well-formed
+
+# Is the key too long?
+:cl1 mode %channel% +k 123456789012345678901234567890
+:cl1 expect %srv1-name% 525 %channel% :Key is not well-formed
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
