X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/a1bedb6db8934e6788075a1e1cda001356cf1d8b..7489d3af05a4394e9621e14a196a9f6c4f788a26:/lib/mime.c
diff --git a/lib/mime.c b/lib/mime.c
index d79cc2a..48354b3 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -1,34 +1,28 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2005, 2007 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ *
+ * 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-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file lib/mime.c
* @brief Support for MIME and allied protocols
*/
-#include
-#include "types.h"
+#include "common.h"
-#include
#include
-#include
-
#include "mem.h"
#include "mime.h"
#include "vector.h"
@@ -116,7 +110,7 @@ static const char *skipwhite(const char *s, int rfc822_comments) {
int c, depth;
for(;;) {
- switch(c = *s) {
+ switch(*s) {
case ' ':
case '\t':
case '\r':
@@ -334,7 +328,7 @@ const char *mime_parse(const char *s,
return mime_qp(s);
if(!strcmp(cte, "7bit") || !strcmp(cte, "8bit"))
return s;
- error(0, "unknown content-transfer-encoding '%s'", cte);
+ disorder_error(0, "unknown content-transfer-encoding '%s'", cte);
return 0;
}
return s;
@@ -381,15 +375,19 @@ int mime_multipart(const char *s,
int ret;
/* We must start with a boundary string */
- if(!isboundary(s, boundary, bl))
+ if(!isboundary(s, boundary, bl)) {
+ disorder_error(0, "mime_multipart: first line is not the boundary string");
return -1;
+ }
/* Keep going until we hit a final boundary */
while(!isfinal(s, boundary, bl)) {
s = strstr(s, "\r\n") + 2;
start = s;
while(!isboundary(s, boundary, bl)) {
- if(!(e = strstr(s, "\r\n")))
+ if(!(e = strstr(s, "\r\n"))) {
+ disorder_error(0, "mime_multipart: line does not end CRLF");
return -1;
+ }
s = e + 2;
}
if((ret = callback(xstrndup(start,
@@ -404,7 +402,7 @@ int mime_multipart(const char *s,
* @param s Start of field
* @param dispositionp Where to store disposition
* @param parameternamep Where to store parameter name
- * @param parametervaluep Wher to store parameter value
+ * @param parametervaluep Where to store parameter value
* @return 0 on success, non-0 on error
*
* See RFC 2388 s3
@@ -503,6 +501,50 @@ char *mime_qp(const char *s) {
return d.vec;
}
+/** @brief Match cookie separator characters
+ *
+ * This is a subset of the RFC2616 specials, and technically is in breach of
+ * the specification. However rejecting (in particular) slashes is
+ * unreasonably strict and has broken at least one (admittedly somewhat
+ * obscure) browser, so we're more forgiving.
+ */
+static int cookie_separator(int c) {
+ switch(c) {
+ case '(':
+ case ')':
+ case ',':
+ case ';':
+ case '=':
+ case ' ':
+ case '"':
+ case '\t':
+ return 1;
+
+ default:
+ return 0;
+ }
+}
+
+/** @brief Match cookie value separator characters
+ *
+ * Same as cookie_separator() but allows for @c = in cookie values.
+ */
+static int cookie_value_separator(int c) {
+ switch(c) {
+ case '(':
+ case ')':
+ case ',':
+ case ';':
+ case ' ':
+ case '"':
+ case '\t':
+ return 1;
+
+ default:
+ return 0;
+ }
+}
+
/** @brief Parse a RFC2109 Cookie: header
* @param s Header field value
* @param cd Where to store result
@@ -523,14 +565,20 @@ int parse_cookie(const char *s,
s = skipwhite(s, 0);
continue;
}
- if(!(s = parsetoken(s, &n, mime_http_separator)))
+ if(!(s = parsetoken(s, &n, cookie_separator))) {
+ disorder_error(0, "parse_cookie: cannot parse attribute name");
return -1;
+ }
s = skipwhite(s, 0);
- if(*s++ != '=')
+ if(*s++ != '=') {
+ disorder_error(0, "parse_cookie: did not find expected '='");
return -1;
+ }
s = skipwhite(s, 0);
- if(!(s = mime_parse_word(s, &v, mime_http_separator)))
+ if(!(s = mime_parse_word(s, &v, cookie_value_separator))) {
+ disorder_error(0, "parse_cookie: cannot parse value for '%s'", n);
return -1;
+ }
if(n[0] == '$') {
/* Some bit of meta-information */
if(!strcmp(n, "$Version"))
@@ -539,14 +587,14 @@ int parse_cookie(const char *s,
if(cd->ncookies > 0 && cd->cookies[cd->ncookies-1].path == 0)
cd->cookies[cd->ncookies-1].path = v;
else {
- error(0, "redundant $Path in Cookie: header");
+ disorder_error(0, "redundant $Path in Cookie: header");
return -1;
}
} else if(!strcmp(n, "$Domain")) {
if(cd->ncookies > 0 && cd->cookies[cd->ncookies-1].domain == 0)
cd->cookies[cd->ncookies-1].domain = v;
else {
- error(0, "redundant $Domain in Cookie: header");
+ disorder_error(0, "redundant $Domain in Cookie: header");
return -1;
}
}
@@ -562,7 +610,7 @@ int parse_cookie(const char *s,
}
s = skipwhite(s, 0);
if(*s && (*s != ',' && *s != ';')) {
- error(0, "missing separator in Cookie: header");
+ disorder_error(0, "missing separator in Cookie: header");
return -1;
}
}
@@ -688,7 +736,7 @@ char *mime_to_qp(const char *text) {
* @param text Underlying UTF-8 text
* @param charsetp Where to store charset string
* @param encodingp Where to store encoding string
- * @return Encoded text (might be @ref text)
+ * @return Encoded text (might be @p text)
*/
const char *mime_encode_text(const char *text,
const char **charsetp,