X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/abe28bfec317bb8260f9e9e20eee87a60265e83e..5891b0a8916232a54a4856e186b1d21a44b38a48:/lib/test.c

diff --git a/lib/test.c b/lib/test.c
index cca9bb3..0f38fc3 100644
--- a/lib/test.c
+++ b/lib/test.c
@@ -34,8 +34,10 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <stddef.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
 
-#include "utf8.h"
 #include "mem.h"
 #include "log.h"
 #include "vector.h"
@@ -56,6 +58,10 @@
 #include "sink.h"
 #include "printf.h"
 #include "basen.h"
+#include "split.h"
+#include "configuration.h"
+#include "addr.h"
+#include "base64.h"
 
 static int tests, errors;
 static int fail_first;
@@ -453,24 +459,93 @@ static void test_mime(void) {
 " to the aid of their country."),
 	       "Now's the time for all folk to come to the aid of their country.");
 
-  check_string(mime_base64(""),  "");
-  check_string(mime_base64("BBBB"), "\x04\x10\x41");
-  check_string(mime_base64("////"), "\xFF\xFF\xFF");
-  check_string(mime_base64("//BB"), "\xFF\xF0\x41");
-  check_string(mime_base64("BBBB//BB////"),
-	       "\x04\x10\x41" "\xFF\xF0\x41" "\xFF\xFF\xFF");
-  check_string(mime_base64("B B B B  / / B B / / / /"),
-	       "\x04\x10\x41" "\xFF\xF0\x41" "\xFF\xFF\xFF");
-  check_string(mime_base64("B\r\nBBB.// B-B//~//"),
+#define check_base64(encoded, decoded) do {                     \
+    check_string(mime_base64(encoded, 0), decoded);             \
+    check_string(mime_to_base64((const uint8_t *)decoded,       \
+                                         (sizeof decoded) - 1), \
+                 encoded);                                      \
+  } while(0)
+    
+  
+  check_base64("",  "");
+  check_base64("BBBB", "\x04\x10\x41");
+  check_base64("////", "\xFF\xFF\xFF");
+  check_base64("//BB", "\xFF\xF0\x41");
+  check_base64("BBBB//BB////",
+             "\x04\x10\x41" "\xFF\xF0\x41" "\xFF\xFF\xFF");
+  check_base64("BBBBBA==",
+	       "\x04\x10\x41" "\x04");
+  check_base64("BBBBBBA=",
+	       "\x04\x10\x41" "\x04\x10");
+
+  /* Check that decoding handles various kinds of rubbish OK */
+  check_string(mime_base64("B B B B  / / B B / / / /", 0),
+             "\x04\x10\x41" "\xFF\xF0\x41" "\xFF\xFF\xFF");
+  check_string(mime_base64("B\r\nBBB.// B-B//~//", 0),
 	       "\x04\x10\x41" "\xFF\xF0\x41" "\xFF\xFF\xFF");
-  check_string(mime_base64("BBBB="),
-	       "\x04\x10\x41");
-  check_string(mime_base64("BBBBx="),	/* not actually valid base64 */
+  check_string(mime_base64("BBBB BB==", 0),
+	       "\x04\x10\x41" "\x04");
+  check_string(mime_base64("BBBB BB = =", 0),
+	       "\x04\x10\x41" "\x04");
+  check_string(mime_base64("BBBB BBB=", 0),
+	       "\x04\x10\x41" "\x04\x10");
+  check_string(mime_base64("BBBB BBB = ", 0),
+	       "\x04\x10\x41" "\x04\x10");
+  check_string(mime_base64("BBBB=", 0),
 	       "\x04\x10\x41");
-  check_string(mime_base64("BBBB BB=="),
+  check_string(mime_base64("BBBBBB==", 0),
 	       "\x04\x10\x41" "\x04");
-  check_string(mime_base64("BBBB BBB="),
+  check_string(mime_base64("BBBBBBB=", 0),
 	       "\x04\x10\x41" "\x04\x10");
+  /* Not actually valid base64 */
+  check_string(mime_base64("BBBBx=", 0),
+	       "\x04\x10\x41");
+}
+
+static void test_cookies(void) {
+  struct cookiedata cd[1];
+
+  fprintf(stderr, "test_cookies\n");
+
+  /* These are the examples from RFC2109 */
+  insist(!parse_cookie("$Version=\"1\"; Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\"", cd));
+  insist(!strcmp(cd->version, "1"));
+  insist(cd->ncookies = 1);
+  insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+  check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+  check_string(cd->cookies[0].path, "/acme");
+  insist(cd->cookies[0].domain == 0);
+  insist(!parse_cookie("$Version=\"1\";\n"
+                       "Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\";\n"
+                       "Part_Number=\"Rocket_Launcher_0001\"; $Path=\"/acme\"",
+                       cd));
+  insist(cd->ncookies = 2);
+  insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+  insist(find_cookie(cd, "Part_Number") == &cd->cookies[1]);
+  check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+  check_string(cd->cookies[0].path, "/acme");
+  insist(cd->cookies[0].domain == 0);
+  check_string(cd->cookies[1].value, "Rocket_Launcher_0001");
+  check_string(cd->cookies[1].path, "/acme");
+  insist(cd->cookies[1].domain == 0);
+  insist(!parse_cookie("$Version=\"1\";\n"
+                       "Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\";\n"
+                       "Part_Number=\"Rocket_Launcher_0001\"; $Path=\"/acme\";\n"
+                       "Shipping=\"FedEx\"; $Path=\"/acme\"",
+                       cd));
+  insist(cd->ncookies = 3);
+  insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+  insist(find_cookie(cd, "Part_Number") == &cd->cookies[1]);
+  insist(find_cookie(cd, "Shipping") == &cd->cookies[2]);
+  check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+  check_string(cd->cookies[0].path, "/acme");
+  insist(cd->cookies[0].domain == 0);
+  check_string(cd->cookies[1].value, "Rocket_Launcher_0001");
+  check_string(cd->cookies[1].path, "/acme");
+  insist(cd->cookies[1].domain == 0);
+  check_string(cd->cookies[2].value, "FedEx");
+  check_string(cd->cookies[2].path, "/acme");
+  insist(cd->cookies[2].domain == 0);
 }
 
 static void test_hex(void) {
@@ -882,12 +957,17 @@ static void test_cache(void) {
 static void test_filepart(void) {
   fprintf(stderr, "test_filepart\n");
   check_string(d_dirname("/"), "/");
+  check_string(d_dirname("////"), "/");
   check_string(d_dirname("/spong"), "/");
+  check_string(d_dirname("////spong"), "/");
   check_string(d_dirname("/foo/bar"), "/foo");
+  check_string(d_dirname("////foo/////bar"), "////foo");
   check_string(d_dirname("./bar"), ".");
+  check_string(d_dirname(".//bar"), ".");
   check_string(d_dirname("."), ".");
   check_string(d_dirname(".."), ".");
   check_string(d_dirname("../blat"), "..");
+  check_string(d_dirname("..//blat"), "..");
   check_string(d_dirname("wibble"), ".");
   check_string(extension("foo.c"), ".c");
   check_string(extension(".c"), ".c");
@@ -895,6 +975,11 @@ static void test_filepart(void) {
   check_string(extension("foo"), "");
   check_string(extension("./foo"), "");
   check_string(extension("./foo.c"), ".c");
+  check_string(strip_extension("foo.c"), "foo");
+  check_string(strip_extension("foo.mp3"), "foo");
+  check_string(strip_extension("foo.---"), "foo.---");
+  check_string(strip_extension("foo.---xyz"), "foo.---xyz");
+  check_string(strip_extension("foo.bar/wibble.spong"), "foo.bar/wibble");
 }
 
 static void test_selection(void) {
@@ -1044,6 +1129,8 @@ static void test_printf(void) {
   intmax_t m;
   ssize_t ssz;
   ptrdiff_t p;
+  char *cp;
+  char buffer[16];
   
   fprintf(stderr, "test_printf\n");
   check_string(do_printf("%d", 999), "999");
@@ -1121,6 +1208,21 @@ static void test_printf(void) {
   check_string(do_printf("wibble"), "wibble");
   insist(do_printf("%") == 0);
   insist(do_printf("%=") == 0);
+  i = byte_asprintf(&cp, "xyzzy %d", 999);
+  insist(i == 9);
+  check_string(cp, "xyzzy 999");
+  i = byte_snprintf(buffer, sizeof buffer, "xyzzy %d", 999);
+  insist(i == 9);
+  check_string(buffer, "xyzzy 999");
+  i = byte_snprintf(buffer, sizeof buffer, "%*d", 32, 99);
+  insist(i == 32);
+  check_string(buffer, "               ");
+  {
+    /* bizarre workaround for compiler checking of format strings */
+    char f[] = "xyzzy %";
+    i = byte_asprintf(&cp, f);
+    insist(i == -1);
+  }
 }
 
 static void test_basen(void) {
@@ -1157,7 +1259,151 @@ static void test_basen(void) {
   insist(basen(v, 4, buffer, 10, 16) == -1);
 }
 
+static void test_split(void) {
+  char **v;
+  int nv;
+
+  fprintf(stderr, "test_split\n");
+  insist(split("\"misquoted", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0) == 0);
+  insist(split("\'misquoted", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0) == 0);
+  insist(split("\'misquoted\\", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0) == 0);
+  insist(split("\'misquoted\\\"", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0) == 0);
+  insist(split("\'mis\\escaped\'", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0) == 0);
+
+  insist((v = split("", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 0);
+  insist(*v == 0);
+
+  insist((v = split("wibble", &nv, SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 1);
+  check_string(v[0], "wibble");
+  insist(v[1] == 0);
+
+  insist((v = split("   wibble \t\r\n wobble   ", &nv,
+                    SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 2);
+  check_string(v[0], "wibble");
+  check_string(v[1], "wobble");
+  insist(v[2] == 0);
+
+  insist((v = split("wibble wobble #splat", &nv,
+                    SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 2);
+  check_string(v[0], "wibble");
+  check_string(v[1], "wobble");
+  insist(v[2] == 0);
+
+  insist((v = split("\"wibble wobble\" #splat", &nv,
+                    SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 1);
+  check_string(v[0], "wibble wobble");
+  insist(v[1] == 0);
+
+  insist((v = split("\"wibble \\\"\\nwobble\"", &nv,
+                    SPLIT_COMMENTS|SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 1);
+  check_string(v[0], "wibble \"\nwobble");
+  insist(v[1] == 0);
+
+  insist((v = split("\"wibble wobble\" #splat", &nv,
+                    SPLIT_QUOTES, 0, 0)));
+  check_integer(nv, 2);
+  check_string(v[0], "wibble wobble");
+  check_string(v[1], "#splat");
+  insist(v[2] == 0);
+
+  insist((v = split("\"wibble wobble\" #splat", &nv,
+                    SPLIT_COMMENTS, 0, 0)));
+  check_integer(nv, 2);
+  check_string(v[0], "\"wibble");
+  check_string(v[1], "wobble\"");
+  insist(v[2] == 0);
+
+  check_string(quoteutf8("wibble"), "wibble");
+  check_string(quoteutf8("  wibble  "), "\"  wibble  \"");
+  check_string(quoteutf8("wibble wobble"), "\"wibble wobble\"");
+  check_string(quoteutf8("wibble\"wobble"), "\"wibble\\\"wobble\"");
+  check_string(quoteutf8("wibble\nwobble"), "\"wibble\\nwobble\"");
+  check_string(quoteutf8("wibble\\wobble"), "\"wibble\\\\wobble\"");
+  check_string(quoteutf8("wibble'wobble"), "\"wibble'wobble\"");
+}
+
+static void test_hash(void) {
+  hash *h;
+  int i, *ip;
+  char **keys;
+
+  fprintf(stderr, "test_hash\n");
+  h = hash_new(sizeof(int));
+  for(i = 0; i < 10000; ++i)
+    insist(hash_add(h, do_printf("%d", i), &i, HASH_INSERT) == 0);
+  check_integer(hash_count(h), 10000);
+  for(i = 0; i < 10000; ++i) {
+    insist((ip = hash_find(h, do_printf("%d", i))) != 0);
+    check_integer(*ip, i);
+    insist(hash_add(h, do_printf("%d", i), &i, HASH_REPLACE) == 0);
+  }
+  check_integer(hash_count(h), 10000);
+  keys = hash_keys(h);
+  for(i = 0; i < 10000; ++i)
+    insist(keys[i] != 0);
+  insist(keys[10000] == 0);
+  for(i = 0; i < 10000; ++i)
+    insist(hash_remove(h, do_printf("%d", i)) == 0);
+  check_integer(hash_count(h), 0);
+}
+
+static void test_addr(void) {
+  struct stringlist a;
+  const char *s[2];
+  struct addrinfo *ai;
+  char *name;
+  const struct sockaddr_in *sin;
+
+  static const struct addrinfo pref = {
+    AI_PASSIVE,
+    PF_INET,
+    SOCK_STREAM,
+    0,
+    0,
+    0,
+    0,
+    0
+  };
+
+  a.n = 1;
+  a.s = (char **)s;
+  s[0] = "smtp";
+  ai = get_address(&a, &pref, &name);
+  insist(ai != 0);
+  check_integer(ai->ai_family, PF_INET);
+  check_integer(ai->ai_socktype, SOCK_STREAM);
+  check_integer(ai->ai_protocol, IPPROTO_TCP);
+  check_integer(ai->ai_addrlen, sizeof(struct sockaddr_in));
+  sin = (const struct sockaddr_in *)ai->ai_addr;
+  check_integer(sin->sin_family, AF_INET);
+  check_integer(sin->sin_addr.s_addr, 0);
+  check_integer(ntohs(sin->sin_port), 25);
+  check_string(name, "host * service smtp");
+
+  a.n = 2;
+  s[0] = "localhost";
+  s[1] = "nntp";
+  ai = get_address(&a, &pref, &name);
+  insist(ai != 0);
+  check_integer(ai->ai_family, PF_INET);
+  check_integer(ai->ai_socktype, SOCK_STREAM);
+  check_integer(ai->ai_protocol, IPPROTO_TCP);
+  check_integer(ai->ai_addrlen, sizeof(struct sockaddr_in));
+  sin = (const struct sockaddr_in *)ai->ai_addr;
+  check_integer(sin->sin_family, AF_INET);
+  check_integer(ntohl(sin->sin_addr.s_addr), 0x7F000001);
+  check_integer(ntohs(sin->sin_port), 119);
+  check_string(name, "host localhost service nntp");
+}
+
 int main(void) {
+  mem_init();
   fail_first = !!getenv("FAIL_FIRST");
   insist('\n' == 0x0A);
   insist('\r' == 0x0D);
@@ -1169,6 +1415,7 @@ int main(void) {
   insist('a' == 0x61);
   insist('z' == 0x7A);
   /* addr.c */
+  test_addr();
   /* asprintf.c */
   /* authhash.c */
   /* basen.c */
@@ -1191,6 +1438,7 @@ int main(void) {
   /* mem.c */
   /* mime.c */
   test_mime();
+  test_cookies();
   /* mixer.c */
   /* plugin.c */
   /* printf.c */
@@ -1200,6 +1448,7 @@ int main(void) {
   test_sink();
   /* snprintf.c */
   /* split.c */
+  test_split();
   /* syscalls.c */
   /* table.c */
   /* unicode.c */
@@ -1218,6 +1467,7 @@ int main(void) {
   test_cache();
   /* selection.c */
   test_selection();
+  test_hash();
   fprintf(stderr,  "%d errors out of %d tests\n", errors, tests);
   return !!errors;
 }