X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=encode.c;h=3ce4cc5646a13ecf26e5be33d999a3a38053b0ef;hp=283ab1d7a50a416fae00efa023b9a30888c66793;hb=3249adeb7a93de58f324aa46db8e19ed4124fde6;hpb=0bc1dfee8666ff0de39c6f76c2266768d171447f diff --git a/encode.c b/encode.c index 283ab1d7..3ce4cc56 100644 --- a/encode.c +++ b/encode.c @@ -1,4 +1,4 @@ -const char encode_rcs[] = "$Id: encode.c,v 1.18 2011/09/04 11:10:56 fabiankeil Exp $"; +const char encode_rcs[] = "$Id: encode.c,v 1.28 2012/12/27 15:48:53 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/encode.c,v $ @@ -47,20 +47,20 @@ const char encode_rcs[] = "$Id: encode.c,v 1.18 2011/09/04 11:10:56 fabiankeil E const char encode_h_rcs[] = ENCODE_H_VERSION; /* Maps special characters in a URL to their equivalent % codes. */ -static const char * const url_code_map[256] = { - NULL, "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", +static const char url_code_map[256][4] = { + "", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", - "%1E", "%1F", "+", "%21", "%22", "%23", "%24", "%25", "%26", "%27", - "%28", "%29", NULL, "%2B", "%2C", NULL, NULL, "%2F", NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "%3A", "%3B", - "%3C", "%3D", "%3E", "%3F", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, "%5B", "%5C", "%5D", "%5E", NULL, "%60", NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", + "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", + "%28", "%29", "", "%2B", "%2C", "", "", "%2F", "", "", + "", "", "", "", "", "", "", "", "%3A", "%3B", + "%3C", "%3D", "%3E", "%3F", "", "", "", "", "", "", + "", "", "", "", "", "", "", "", "", "", + "", "", "", "", "", "", "", "", "", "", + "", "%5B", "%5C", "%5D", "%5E", "", "%60", "", "", "", + "", "", "", "", "", "", "", "", "", "", + "", "", "", "", "", "", "", "", "", "", + "", "", "", "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", @@ -76,7 +76,7 @@ static const char * const url_code_map[256] = { "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" }; -/* Maps special characters in HTML to their equivalent entites. */ +/* Maps special characters in HTML to their equivalent entities. */ static const char * const html_code_map[256] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -142,10 +142,10 @@ char * html_encode(const char *s) { char c; char * p = buf; - while ( (c = *s++) != '\0') + while ((c = *s++) != '\0') { const char * replace_with = html_code_map[(unsigned char) c]; - if(replace_with != NULL) + if (replace_with != NULL) { const size_t bytes_written = (size_t)(p - buf); assert(bytes_written < buf_size); @@ -158,9 +158,10 @@ char * html_encode(const char *s) } *p = '\0'; + + assert(strlen(buf) < buf_size); } - assert(strlen(buf) < buf_size); return(buf); } @@ -207,6 +208,9 @@ char * html_encode_and_free_original(char *s) * query string. Replaces special characters with * the appropriate %xx codes. * + * XXX: url_query_encode() would be a more fitting + * name. + * * Parameters : * 1 : s = String to encode. Null-terminated. * @@ -233,10 +237,10 @@ char * url_encode(const char *s) { char c; char * p = buf; - while( (c = *s++) != '\0') + while((c = *s++) != '\0') { - const char * replace_with = url_code_map[(unsigned char) c]; - if (replace_with != NULL) + const char *replace_with = url_code_map[(unsigned char) c]; + if (*replace_with != '\0') { const size_t bytes_written = (size_t)(p - buf); assert(bytes_written < buf_size); @@ -250,9 +254,9 @@ char * url_encode(const char *s) *p = '\0'; + assert(strlen(buf) < buf_size); } - assert(strlen(buf) < buf_size); return(buf); } @@ -308,10 +312,10 @@ int xtoi(const char *s) int d1; d1 = xdtoi(*s); - if(d1 >= 0) + if (d1 >= 0) { int d2 = xdtoi(*(s+1)); - if(d2 >= 0) + if (d2 >= 0) { return (d1 << 4) + d2; } @@ -377,6 +381,83 @@ char *url_decode(const char * s) } +/********************************************************************* + * + * Function : percent_encode_url + * + * Description : Percent-encodes a string so it no longer contains + * any characters that aren't valid in an URL according + * to RFC 3986. + * + * XXX: Do not confuse with encode_url() + * + * Parameters : + * 1 : s = String to encode. Null-terminated. + * + * Returns : Encoded string, newly allocated on the heap. + * Caller is responsible for freeing it with free(). + * If s is NULL, or on out-of memory, returns NULL. + * + *********************************************************************/ +char *percent_encode_url(const char *s) +{ + static const char allowed_characters[128] = { + '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', + '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', + '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', + '\0', '\0', '\0', '!', '\0', '#', '$', '%', '&', '\'', + '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', + '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', + '\0', '=', '\0', '?', '@', 'A', 'B', 'C', 'D', 'E', + 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', + 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', + 'Z', '[', '\0', ']', '\0', '_', '\0', 'a', 'b', 'c', + 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', + 'x', 'y', 'z', '\0', '\0', '\0', '~', '\0' + }; + char *buf; + size_t buf_size; + + assert(s != NULL); + + /* Each input char can expand to at most 3 chars. */ + buf_size = (strlen(s) * 3) + 1; + buf = (char *)malloc(buf_size); + + if (buf != NULL) + { + char c; + char *p = buf; + while ((c = *s++) != '\0') + { + const unsigned int i = (unsigned char)c; + if (i >= sizeof(allowed_characters) || '\0' == allowed_characters[i]) + { + const char *replace_with = url_code_map[i]; + assert(*replace_with != '\0'); + if (*replace_with != '\0') + { + const size_t bytes_written = (size_t)(p - buf); + assert(bytes_written < buf_size); + p += strlcpy(p, replace_with, buf_size - bytes_written); + } + } + else + { + *p++ = c; + } + } + *p = '\0'; + + assert(strlen(buf) < buf_size); + } + + return(buf); + +} + + /* Local Variables: tab-width: 3