Polish rfc1738 library code. Add cppunit tests.

 * Adds API header file for this library.
 * Reveals the do_escape API and creates meaningful flags for its API.
 * Adds documentation.
 * Convert original unit tests by Robert Collins to cppunit code
 * Add new tests based on work for Samba by Andrew Bartlett

diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.c b/helpers/basic_auth/LDAP/squid_ldap_auth.c
index 2e36ca66b985af50ac8bb2095e20473b6d89f3fd..aefccc327520e6ee95801d5b967594a006d1819f 100644 (file)
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.c
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.c
@@ -84,6 +84,7 @@
 
 #define LDAP_DEPRECATED 1
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/helpers/basic_auth/MSNT/msntauth.c b/helpers/basic_auth/MSNT/msntauth.c
index a877089fe79d65995c6a5f6b371f9e6f22f913f4..ab9f04dc72b69a1933104ababa26973e8158382e 100644 (file)
--- a/helpers/basic_auth/MSNT/msntauth.c
+++ b/helpers/basic_auth/MSNT/msntauth.c
@@ -31,6 +31,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/helpers/basic_auth/NCSA/ncsa_auth.c b/helpers/basic_auth/NCSA/ncsa_auth.c
index 12aa83f23739568da834f7d8f69a27f6bd70c857..27bf3918f462fc2626b25b7663f0db1478387f9f 100644 (file)
--- a/helpers/basic_auth/NCSA/ncsa_auth.c
+++ b/helpers/basic_auth/NCSA/ncsa_auth.c
@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+#include "rfc1738.h"
 
 #if HAVE_STDIO_H
 #include <stdio.h>

diff --git a/helpers/basic_auth/PAM/pam_auth.c b/helpers/basic_auth/PAM/pam_auth.c
index 90174b8942f8aa049439cf060efa6c955ff4bf4b..a80ac1d5138fd4b277a7acd8e1491972a7588685 100644 (file)
--- a/helpers/basic_auth/PAM/pam_auth.c
+++ b/helpers/basic_auth/PAM/pam_auth.c
@@ -63,6 +63,7 @@
  * Compile this program with: gcc -o pam_auth pam_auth.c -lpam -ldl
  */
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/helpers/basic_auth/SASL/sasl_auth.c b/helpers/basic_auth/SASL/sasl_auth.c
index f1ff3c4e394ba47ca173572c95d9b5186863a208..6efa30dfeaf0bd6522099f69fe43f6855247cbcd 100644 (file)
--- a/helpers/basic_auth/SASL/sasl_auth.c
+++ b/helpers/basic_auth/SASL/sasl_auth.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "rfc1738.h"
 #include "util.h"
 
 #ifdef HAVE_SASL_SASL_H

diff --git a/helpers/basic_auth/SMB/smb_auth.c b/helpers/basic_auth/SMB/smb_auth.c
index ef866df618f1e9b1eb78af18226d9b3dd8401f6f..e81eb2f1205ca33372176cdf658e45be13ecbbc3 100644 (file)
--- a/helpers/basic_auth/SMB/smb_auth.c
+++ b/helpers/basic_auth/SMB/smb_auth.c
@@ -46,6 +46,7 @@
 #include <string.h>
 
 #include "util.h"
+#include "rfc1738.h"
 
 #define BUFSIZE                        256
 #define NMB_UNICAST            1

diff --git a/helpers/basic_auth/YP/yp_auth.c b/helpers/basic_auth/YP/yp_auth.c
index 4f6d23634fffcb09d8fd62dfc9b4383c0c2f00d3..379adabe04129caf7a3800f7b0b4d16c4325f134 100644 (file)
--- a/helpers/basic_auth/YP/yp_auth.c
+++ b/helpers/basic_auth/YP/yp_auth.c
@@ -4,6 +4,8 @@
  */
 
 #include "config.h"
+#include "rfc1738.h"
+
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif

diff --git a/helpers/basic_auth/getpwnam/getpwnam_auth.c b/helpers/basic_auth/getpwnam/getpwnam_auth.c
index 1d0c1dfc6b45c2dd131a47ba29753f920525a622..b511a9dc6880b6df5c35e09e92b933663090f577 100644 (file)
--- a/helpers/basic_auth/getpwnam/getpwnam_auth.c
+++ b/helpers/basic_auth/getpwnam/getpwnam_auth.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "rfc1738.h"
 
 #if HAVE_STDIO_H
 #include <stdio.h>

diff --git a/helpers/external_acl/ip_user/main.c b/helpers/external_acl/ip_user/main.c
index 5b03b56595f0a7fe905fd2316c52f3477e370f01..f9537572ef1b8898d9f2b52596e6b61d25ee37a6 100644 (file)
--- a/helpers/external_acl/ip_user/main.c
+++ b/helpers/external_acl/ip_user/main.c
@@ -19,6 +19,7 @@
 *
 */
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.c b/helpers/external_acl/ldap_group/squid_ldap_group.c
index afdb8d491a3b5d6a9c6df479013dfd768eca4bcc..a89c3f43aafde7e1e073f5977064c77fa1b80a7c 100644 (file)
--- a/helpers/external_acl/ldap_group/squid_ldap_group.c
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.c
@@ -35,6 +35,7 @@
 
 #define LDAP_DEPRECATED 1
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/helpers/external_acl/unix_group/check_group.c b/helpers/external_acl/unix_group/check_group.c
index eb277ad4e0c277110b5e7e065905915f2fa5be15..f7d1c4bd36e0afef5527501bab2db06a519814c7 100644 (file)
--- a/helpers/external_acl/unix_group/check_group.c
+++ b/helpers/external_acl/unix_group/check_group.c
@@ -52,6 +52,7 @@
  *
  */
 
+#include "rfc1738.h"
 #include "util.h"
 
 #include <stdio.h>

diff --git a/include/rfc1738.h b/include/rfc1738.h
new file mode 100644 (file)
index 0000000..b3538ec
--- /dev/null
+++ b/include/rfc1738.h
@@ -0,0 +1,45 @@
+#ifndef _SQUID_INCLUDE_RFC1738_H
+#define _SQUID_INCLUDE_RFC1738_H
+
+/* for SQUIDCEXTERN */
+#include "config.h"
+
+
+/* Encoder rfc1738_do_escape flag values. */
+#define RFC1738_ESCAPE_UNSAFE     0
+#define RFC1738_ESCAPE_RESERVED   1
+#define RFC1738_ESCAPE_UNESCAPED -1
+
+
+/**
+ * \group rfc1738 RFC 1738 URL-escaping library
+ *
+ * Public API is formed of a triplet of encode functions mapping to the rfc1738_do_encode() engine.
+ *
+ * ASCII characters are split into three groups:
+ * \item SAFE     Characters which are safe to occur in any URL. For example A,B,C
+ * \item UNSAFE   Characters which are completely usafe to occur in any URL. For example; backspace, tab, space, newline
+ * \item RESERVED Characters which are reserved for special meaning and may only occur in certain parts of a URL.
+ *
+ * Returns a static buffer containing the RFC 1738 compliant, escaped version of the given url.
+ *
+ * \param flags  RFC1738_ESCAPE_UNSAFE    Only encode unsafe characters. Ignore reserved.
+ * \param flags  RFC1738_ESCAPE_RESERVED  Encode all unsafe and reserved characters.
+ * \param flags  RFC1738_ESCAPE_UNESCAPED Encode all unsafe characters which have not already been encoded.
+ */
+SQUIDCEXTERN char *rfc1738_do_escape(const char *url, int flags);
+
+/* Old API functions */
+#define rfc1738_escape(x)  rfc1738_do_escape(x, RFC1738_ESCAPE_UNSAFE)
+#define rfc1738_escape_part(x)  rfc1738_do_escape(x, RFC1738_ESCAPE_RESERVED)
+#define rfc1738_escape_unescaped(x)  rfc1738_do_escape(x, RFC1738_ESCAPE_UNESCAPED)
+
+
+/**
+ * Unescape a URL string according to RFC 1738 specification.
+ * String is unescaped in-place
+ */
+SQUIDCEXTERN void rfc1738_unescape(char *url);
+
+
+#endif /* _SQUID_INCLUDE_RFC1738_H */

diff --git a/include/util.h b/include/util.h
index 28f56d29bfef02b19e074a3a837317a8cb953248..0bf570b4c272bc99b2a012f74441aeb1f315c56e 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -90,12 +90,6 @@ SQUIDCEXTERN void xxfree(const void *);
 #include "SquidNew.h"
 #endif
 
-/* rfc1738.c */
-SQUIDCEXTERN char *rfc1738_escape(const char *);
-SQUIDCEXTERN char *rfc1738_escape_unescaped(const char *);
-SQUIDCEXTERN char *rfc1738_escape_part(const char *);
-SQUIDCEXTERN void rfc1738_unescape(char *);
-
 /* charset.c */
 SQUIDCEXTERN char *latin1_to_utf8(char *out, size_t size, const char *in);
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 02bee1739acaf08de0ada3ec6aeccf52d381b4d0..444b10dd35bb8f42f85b265cd1723d005d9078d2 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -99,6 +99,8 @@ tests_testAll_SOURCES= \
        tests/testArray.cc \
        tests/testRFC1035.h \
        tests/testRFC1035.cc \
+       tests/testRFC1738.h \
+       tests/testRFC1738.cc \
        tests/testMain.cc \
        $(XPROF_STATS_SOURCE) \
        $(WIN32SRC) \

diff --git a/lib/rfc1738.c b/lib/rfc1738.c
index bba0a5d6a7d9046d724f354089e0e307d3c10cd3..a0edaf75761553e0287f17e60577d87bb9ee0038 100644 (file)
--- a/lib/rfc1738.c
+++ b/lib/rfc1738.c
@@ -33,6 +33,8 @@
  */
 
 #include "config.h"
+#include "rfc1738.h"
+#include "util.h"
 
 #if HAVE_STDIO_H
 #include <stdio.h>
@@ -41,8 +43,6 @@
 #include <string.h>
 #endif
 
-#include "util.h"
-
 /*
  *  RFC 1738 defines that these characters should be escaped, as well
  *  any non-US-ASCII character or anything between 0x00 - 0x1F.
@@ -82,8 +82,8 @@ static char rfc1738_reserved_chars[] = {
  *  rfc1738_escape - Returns a static buffer contains the RFC 1738
  *  compliant, escaped version of the given url.
  */
-static char *
-rfc1738_do_escape(const char *url, int encode_reserved)
+char *
+rfc1738_do_escape(const char *url, int flags)
 {
     static char *buf;
     static size_t bufsize = 0;
@@ -94,7 +94,7 @@ rfc1738_do_escape(const char *url, int encode_reserved)
     if (buf == NULL || strlen(url) * 3 > bufsize) {
         xfree(buf);
         bufsize = strlen(url) * 3 + 1;
-        buf = xcalloc(bufsize, 1);
+        buf = (char*)xcalloc(bufsize, 1);
     }
     for (p = url, q = buf; *p != '\0' && q < (buf + bufsize - 1); p++, q++) {
         do_escape = 0;
@@ -107,10 +107,10 @@ rfc1738_do_escape(const char *url, int encode_reserved)
             }
         }
         /* Handle % separately */
-        if (encode_reserved >= 0 && *p == '%')
+        if (flags != RFC1738_ESCAPE_UNESCAPED && *p == '%')
             do_escape = 1;
         /* RFC 1738 defines these chars as reserved */
-        for (i = 0; i < sizeof(rfc1738_reserved_chars) && encode_reserved > 0; i++) {
+        for (i = 0; i < sizeof(rfc1738_reserved_chars) && flags == RFC1738_ESCAPE_RESERVED; i++) {
             if (*p == rfc1738_reserved_chars[i]) {
                 do_escape = 1;
                 break;
@@ -143,6 +143,7 @@ rfc1738_do_escape(const char *url, int encode_reserved)
     return (buf);
 }
 
+#if 0 /* legacy API */
 /*
  * rfc1738_escape - Returns a static buffer that contains the RFC
  * 1738 compliant, escaped version of the given url.
@@ -172,6 +173,7 @@ rfc1738_escape_part(const char *url)
 {
     return rfc1738_do_escape(url, 1);
 }
+#endif /* 0 */
 
 /*
  *  rfc1738_unescape() - Converts escaped characters (%xy numbers) in

diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc
new file mode 100644 (file)
index 0000000..e58fc18
--- /dev/null
+++ b/lib/tests/testRFC1738.cc
@@ -0,0 +1,155 @@
+#include "config.h"
+
+#if HAVE_ASSERT_H
+#include <assert.h>
+#endif
+
+#include "testRFC1738.h"
+
+/* Being a C library code it is best bodily included and tested with C++ type-safe techniques. */
+#include "lib/rfc1738.c"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( testRFC1738 );
+
+/* Regular Format de-coding tests */
+void testRFC1738::testUrlDecode()
+{
+    char *unescaped_str;
+
+    /* regular URL-path */
+    unescaped_str = xstrdup("%2Fdata%2Fsource%2Fpath");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "/data/source/path",18)==0);
+    xfree(unescaped_str);
+
+    /* path in full URL */
+    unescaped_str = xstrdup("http://foo.invalid%2Fdata%2Fsource%2Fpath");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "http://foo.invalid/data/source/path",36)==0);
+    xfree(unescaped_str);
+
+// TODO query string...
+
+    /* Newline %0A encoded */
+    unescaped_str = xstrdup("w%0Ard");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w\nrd",5)==0);
+    xfree(unescaped_str);
+
+    /* Handle Un-encoded % */
+    unescaped_str = xstrdup("w%rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%rd",5)==0);
+    xfree(unescaped_str);
+
+    /* Handle encoded % */
+    unescaped_str = xstrdup("w%%rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%rd",5)==0);
+    xfree(unescaped_str);
+
+    /* Handle mixed-encoded % */
+    unescaped_str = xstrdup("w%%%rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%%rd",6)==0);
+    xfree(unescaped_str);
+
+    /* A corrupt string */
+    unescaped_str = xstrdup("Bad String %1");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "Bad String %1",14)==0);
+    xfree(unescaped_str);
+
+
+    /* A partly corrupt string */
+    unescaped_str = xstrdup("Bad String %1A%3");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "Bad String \032%3",15)==0);
+    xfree(unescaped_str);
+
+    /* A non corrupt string */
+    unescaped_str = xstrdup("Good String %1A");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "Good String \032",14)==0);
+    xfree(unescaped_str);
+}
+
+/**
+ * Public API is formed of a triplet of encode functions mapping to the rfc1738_do_encode() engine.
+ *
+ * Flags:
+ * rfc1738_escape == 0
+ * rfc1738_escape_unescaped == -1
+ * rfc1738_escape_part == 1
+ */
+void testRFC1738::testUrlEncode()
+{
+    char *result;
+
+#define RFC1738_ESCAPE_UNSAFE     0
+#define RFC1738_ESCAPE_RESERVED   1
+#define RFC1738_ESCAPE_UNESCAPED -1
+
+    /* TEST: Escaping only unsafe characters */
+
+    /* regular URL (no encoding needed) */
+    result = rfc1738_do_escape("http://foo.invalid/data/source/path", RFC1738_ESCAPE_UNSAFE);
+    CPPUNIT_ASSERT(memcmp(result, "http://foo.invalid/data/source/path",36)==0);
+
+    /* long string of unsafe # characters */
+    result = rfc1738_do_escape("################ ################ ################ ################ ################ ################ ################ ################", RFC1738_ESCAPE_UNSAFE);
+    CPPUNIT_ASSERT(memcmp(result, "%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23",406)==0);
+
+
+    /* TEST: escaping only reserved characters */
+
+    /* regular URL (full encoding requested) */
+    result = rfc1738_do_escape("http://foo.invalid/data/source/path", RFC1738_ESCAPE_RESERVED);
+    CPPUNIT_ASSERT(memcmp(result, "http%3A%2F%2Ffoo.invalid%2Fdata%2Fsource%2Fpath",48)==0);
+
+    /* regular path (encoding wanted for ALL special chars) */
+    result = rfc1738_do_escape("/data/source/path", RFC1738_ESCAPE_RESERVED);
+    CPPUNIT_ASSERT(memcmp(result, "%2Fdata%2Fsource%2Fpath",24)==0);
+
+
+    /* TEST: safety-escaping a string already partially escaped */
+
+    /* escaping of dangerous characters in a partially escaped string */
+    result = rfc1738_do_escape("http://foo.invalid/data%2Fsource[]", RFC1738_ESCAPE_UNESCAPED);
+    CPPUNIT_ASSERT(memcmp(result, "http://foo.invalid/data%2Fsource%5B%5D",39)==0);
+
+    /* escaping of hexadecimal 0xFF characters in a partially escaped string */
+    result = rfc1738_do_escape("http://foo.invalid/data%2Fsource\xFF\xFF", RFC1738_ESCAPE_UNESCAPED);
+    CPPUNIT_ASSERT(memcmp(result, "http://foo.invalid/data%2Fsource%FF%FF",39)==0);
+
+}
+
+/** SECURITY BUG TESTS: avoid null truncation attacks by skipping %00 bytes */
+void testRFC1738::PercentZeroNullDecoding()
+{
+    char *unescaped_str;
+
+    /* Attack with %00 encoded NULL */
+    unescaped_str = xstrdup("w%00rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%00rd",7)==0);
+    xfree(unescaped_str);
+
+    /* Attack with %0 encoded NULL */
+    unescaped_str = xstrdup("w%0rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%0rd",6)==0);
+    xfree(unescaped_str);
+
+    /* Handle '0' bytes embeded in encoded % */
+    unescaped_str = xstrdup("w%%00%rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%00%rd",8)==0);
+    xfree(unescaped_str);
+
+    /* Handle NULL bytes with encoded % */
+    unescaped_str = xstrdup("w%%%00%rd");
+    rfc1738_unescape(unescaped_str);
+    CPPUNIT_ASSERT(memcmp(unescaped_str, "w%%00%rd",9)==0);
+    xfree(unescaped_str);
+}

diff --git a/lib/tests/testRFC1738.h b/lib/tests/testRFC1738.h
new file mode 100644 (file)
index 0000000..3099029
--- /dev/null
+++ b/lib/tests/testRFC1738.h
@@ -0,0 +1,28 @@
+#ifndef SQUID_LIB_TEST_RFC1738_H
+#define SQUID_LIB_TEST_RFC1738_H
+
+#include <cppunit/extensions/HelperMacros.h>
+
+/**
+ * Test the URL coder RFC 1738 Engine
+ */
+class testRFC1738 : public CPPUNIT_NS::TestFixture
+{
+    CPPUNIT_TEST_SUITE( testRFC1738 );
+    CPPUNIT_TEST( testUrlDecode );
+    CPPUNIT_TEST( testUrlEncode );
+
+    CPPUNIT_TEST( PercentZeroNullDecoding );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+
+protected:
+    void testUrlDecode();
+    void testUrlEncode();
+
+    // bugs.
+    void PercentZeroNullDecoding();
+};
+
+#endif /* SQUID_LIB_TEST_RFC1738_H */

diff --git a/src/access_log.cc b/src/access_log.cc
index bf31a424c50949ccdb1dbed5ab4277a71348c707..d10a80ffbc8bb72f553e63e7c3161811f60d0f94 100644 (file)
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -44,6 +44,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
+#include "rfc1738.h"
 #include "SquidTime.h"
 #include "CacheManager.h"
 

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index bd26c081138874c08042fc18131f90a4882ca9ea..a7366b6a5512204e80e72c6d6138c5d911d73d0f 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -38,7 +38,7 @@
 #include "acl/Url.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
-
+#include "rfc1738.h"
 
 int
 ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)

diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc
index c36d170c86044d62f6de94446741873841655a7e..cd1a8bae52ee9077df375b1ed039ab0584aa06e0 100644 (file)
--- a/src/acl/UrlPath.cc
+++ b/src/acl/UrlPath.cc
@@ -39,7 +39,7 @@
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
 #include "HttpRequest.h"
-
+#include "rfc1738.h"
 
 int
 ACLUrlPathStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 9aa07bb53a7126a8902e400123bdb88e8f50c6b6..aae8d6a2b69276cf8a52fb52ebed07178ffaadb7 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -44,6 +44,7 @@
 #include "Store.h"
 #include "HttpReply.h"
 #include "basicScheme.h"
+#include "rfc1738.h"
 #include "wordlist.h"
 #include "SquidTime.h"
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 474ee15b2926138959f32cd5cfadb0af4fcb028a..04603a921f8258472bb2096bf18c5610235297a9 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -46,6 +46,7 @@
 #include "acl/Gadgets.h"
 #include "StoreFileSystem.h"
 #include "Parsing.h"
+#include "rfc1738.h"
 #include "MemBuf.h"
 #include "wordlist.h"
 #include "ident/Config.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 5377c8ee06849b8bf36b468c2d38456efd8196b1..4d3b9a0b30196e802374fbd13ae5cb14e0bd01ee 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -104,6 +104,7 @@
 #include "MemBuf.h"
 #include "SquidTime.h"
 #include "ChunkedCodingParser.h"
+#include "rfc1738.h"
 
 #if LINGERING_CLOSE
 #define comm_close comm_lingering_close

diff --git a/src/errorpage.cc b/src/errorpage.cc
index b5d039d33ed8b5f39aaae0b2c146bb0b5d3bea96..da68d6c12e2ac6da278a65504efc0aea28fb7688 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -43,6 +43,7 @@
 #include "MemObject.h"
 #include "fde.h"
 #include "MemBuf.h"
+#include "rfc1738.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 9097ebdbd78b4119d6f4953626868e519a0ecffb..bcacf821390e389b18eb0312000b5c0703db98d8 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -60,6 +60,7 @@
 #include "auth/Gadgets.h"
 #include "helper.h"
 #include "MemBuf.h"
+#include "rfc1738.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 

diff --git a/src/ftp.cc b/src/ftp.cc
index 8541d7ab4cb51b14d73fec09d59d75ec290c7df4..f1e2fb4a17250da9e4383fa301434ab70e2e0122 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -53,6 +53,7 @@
 #include "wordlist.h"
 #include "SquidTime.h"
 #include "URLScheme.h"
+#include "rfc1738.h"
 
 /**
  \defgroup ServerProtocolFTPInternal Server-Side FTP Internals

diff --git a/src/gopher.cc b/src/gopher.cc
index 532151917ab7347213c35b034e1e7677378f0a52..4003b705436119ddcb71bfbb2f72f9e9bd635136 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -45,6 +45,7 @@
 #endif
 #include "MemBuf.h"
 #include "forward.h"
+#include "rfc1738.h"
 #include "SquidTime.h"
 
 /**

diff --git a/src/http.cc b/src/http.cc
index acc9bed00b1e53af83748defec28420d5ed4f3b0..c97d572f4bfc5198c78166544f0fff36c12a8fbf 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -55,6 +55,7 @@
 #if DELAY_POOLS
 #include "DelayPools.h"
 #endif
+#include "rfc1738.h"
 #include "SquidTime.h"
 #include "TextException.h"
 

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 32b2e72f33df80cfdef28f637a6bda33f42208f8..cbfed7a3597e09aefb9cecd58949e6d3a5f2d2cd 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -48,6 +48,7 @@
 #include "SwapDir.h"
 #include "icmp/net_db.h"
 #include "ip/IpAddress.h"
+#include "rfc1738.h"
 
 /// \ingroup ServerProtocolICPInternal2
 static void icpLogIcp(const IpAddress &, log_type, int, const char *, int);

diff --git a/src/ipc.cc b/src/ipc.cc
index e886e9571070e638a9da9ece20d25c17adad7964..9e7968d80a9ed6a99c793306b221b236d54386d9 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -34,6 +34,7 @@
 #include "comm.h"
 #include "fde.h"
 #include "ip/IpAddress.h"
+#include "rfc1738.h"
 
 static const char *hello_string = "hi there\n";
 #define HELLO_BUF_SZ 32

diff --git a/src/redirect.cc b/src/redirect.cc
index 93fe7d43c89a47d299359e18be5031502c909ca6..04bbe8a08a2140a5549899953e6be5f0276bd4fe 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -43,6 +43,7 @@
 #include "HttpRequest.h"
 #include "client_side.h"
 #include "helper.h"
+#include "rfc1738.h"
 
 typedef struct {
     void *data;

diff --git a/src/url.cc b/src/url.cc
index 8e105266bc3f57c1187f6c53e6f62a10ae11a801..d9ac26f6d782e5a8eb59aef7a5b7b6e80d7a443e 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -36,6 +36,7 @@
 #include "URL.h"
 #include "HttpRequest.h"
 #include "URLScheme.h"
+#include "rfc1738.h"
 
 static HttpRequest *urnParse(const HttpRequestMethod& method, char *urn);
 static const char valid_hostname_chars_u[] =

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 469bf7d22a8b497c166faf31e745b9f16dea99f2..513aea4c4f49ffca0644c2f9ff4878a44db3380b 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -17,7 +17,7 @@ LDADD = \
        $(top_builddir)/src/globals.o \
        $(top_builddir)/src/time.o
 
-EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2 rfc1738
+EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2
 
 EXTRA_DIST = testheaders.sh
 
@@ -35,7 +35,6 @@ TESTS += debug \
        syntheticoperators \
        VirtualDeleteOperator \
        StackTest \
-       rfc1738 \
        refcount\
        splay\
        MemPoolTest\
@@ -50,7 +49,6 @@ check_PROGRAMS += debug \
                mem_node_test\
                mem_hdr_test \
                refcount\
-               rfc1738\
                splay \
                StackTest \
                syntheticoperators \
@@ -77,8 +75,6 @@ StackTest_SOURCES = StackTest.cc $(DEBUG_SOURCE)
 syntheticoperators_SOURCES = syntheticoperators.cc $(DEBUG_SOURCE)
 VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
 
-rfc1738_SOURCES = rfc1738.cc
-
 ## membanger won't link today. Bitrot..
 ##CC   = gcc
 ##CFLAGS       = -g -Wall -I../include -I../src

diff --git a/test-suite/rfc1738.cc b/test-suite/rfc1738.cc
deleted file mode 100644 (file)
index 1c4218c..0000000
--- a/test-suite/rfc1738.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-
-/*
- * $Id$
- *
- * DEBUG: section xx    RFC 1738 string [un]escaping
- * AUTHOR:  Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
- */
-
-#include "squid.h"
-#include "util.h"
-/* testing:
-SQUIDCEXTERN char *rfc1738_escape(const char *);
-SQUIDCEXTERN char *rfc1738_escape_unescaped(const char *);
-SQUIDCEXTERN char *rfc1738_escape_part(const char *);
-SQUIDCEXTERN void rfc1738_unescape(char *);
-*/
-
-/* A corrupt string */
-#define BADSTRING "An Escaped %1"
-/* A partly corrupt string */
-#define CASE1 "An escaped %1A%3"
-#define RESULT1 "An escaped \032%3"
-/* A non corrupt string */
-#define GOODSTRING "An Escaped %1A"
-#define GOODUSTRING "An Escaped \032"
-
-void
-testAString(char const *aString, char const *aResult)
-{
-    char *escapedString;
-    escapedString = xstrdup (aString);
-    rfc1738_unescape(escapedString);
-    if (strcmp(escapedString, aResult))
-        exit (1);
-    safe_free (escapedString);
-}
-
-void
-testUnescaping()
-{
-    testAString(BADSTRING,BADSTRING);
-    testAString(GOODSTRING, GOODUSTRING);
-    testAString(CASE1, RESULT1);
-}
-
-int
-main (int argc, char **argv)
-{
-    testUnescaping();
-    return 0;
-}

diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc
index d36e9935c7e73c9b517417e9c5761f925beb3129..fd93d25efa53bac603ef44f7813f4af50fb25178 100644 (file)
--- a/tools/cachemgr.cc
+++ b/tools/cachemgr.cc
@@ -31,6 +31,7 @@
  */
 
 #include "config.h"
+#include "rfc1738.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>