Changeset 0f47613

Timestamp:

2007-12-10T22:57:13Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d52111a

Parents:

71dc854

Message:

Don't allow nicks that start with a number.

Files:

• nick.c (modified) (3 diffs)
• tests/check_nick.c (modified) (4 diffs)

nick.c

@@ -154 +154 @@
    With one difference, we allow dashes. */
 
-static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^-_|";
-static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~-_\\";
-
-void nick_strip( char * nick )
+static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^`-_|";
+static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~`-_\\";
+
+void nick_strip( char *nick )
 {
         int i, j;
@@ -170 +170 @@
                 }
         }
+        if( isdigit( nick[0] ) )
+        {
+                char *orig;
+                
+                orig = g_strdup( nick );
+                g_snprintf( nick, MAX_NICK_LENGTH, "_%s", orig );
+                g_free( orig );
+                j ++;
+        }
         while( j <= MAX_NICK_LENGTH )
                 nick[j++] = '\0';
@@ -178 +187 @@
         const char *s;
         
-        /* Empty/long nicks are not allowed */
-        if( !*nick || strlen( nick ) > MAX_NICK_LENGTH )
+        /* Empty/long nicks are not allowed, nor numbers at [0] */
+        if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
                 return( 0 );
         

tests/check_nick.c

@@ -15 +15 @@
                 "thisisave:ryveryveryverylongnick",
                 "t::::est",
+                "test123",
+                "123test",
+                "123",
                 NULL };
         const char *expected[] = { "test", "test", "test", 
@@ -20 +23 @@
                 "thisisaveryveryveryveryl", 
                 "test",
+                "test123",
+                "_123test",
+                "_123",
                 NULL };
 
@@ -35 +41 @@
 START_TEST(test_nick_ok_ok)
 {
-        const char *nicks[] = { "foo", "bar", "bla[", "blie]", 
-                                    "BreEZaH", "\\od^~", NULL };
+        const char *nicks[] = { "foo", "bar123", "bla[", "blie]", "BreEZaH",
+                                "\\od^~", "_123", "_123test", NULL };
         int i;
 
@@ -49 +55 @@
 {
         const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnick",
-                                    "\nillegalchar", "", "nick%", NULL };
+                                    "\nillegalchar", "", "nick%", "123test", NULL };
         int i;