keep cookie more private to disorder.cgi

[disorder] / lib / mime.c

diff --git a/lib/mime.c b/lib/mime.c
index 7575b7bbf324ab23a20b690ff389e74261736ab2..9883a3c5d41e95d086f1774028a3a1b301a2decb 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -107,7 +107,9 @@ static int iscrlf(const char *ptr) {
 }
 
 /** @brief Skip whitespace
+ * @param s Pointer into string
  * @param rfc822_comments If true, skip RFC822 nested comments
+ * @return Pointer into string after whitespace
  */
 static const char *skipwhite(const char *s, int rfc822_comments) {
   int c, depth;
@@ -207,8 +209,10 @@ static const char *parsetoken(const char *s, char **valuep,
  * @param s Start of field
  * @param typep Where to store type
  * @param parameternamep Where to store parameter name
- * @param parameternvaluep Wher to store parameter value
+ * @param parametervaluep Wher to store parameter value
  * @return 0 on success, non-0 on error
+ *
+ * See <a href="http://tools.ietf.org/html/rfc2045#section-5">RFC 2045 s5</a>.
  */
 int mime_content_type(const char *s,
                      char **typep,
@@ -254,7 +258,12 @@ int mime_content_type(const char *s,
  * @param s Start of message
  * @param callback Called for each header field
  * @param u Passed to callback
- * @return Pointer to decoded body (might be in original string)
+ * @return Pointer to decoded body (might be in original string), or NULL on error
+ *
+ * This does an RFC 822-style parse and honors Content-Transfer-Encoding as
+ * described in <a href="http://tools.ietf.org/html/rfc2045#section-6">RFC 2045
+ * s6</a>.  @p callback is called for each header field encountered, in order,
+ * with ASCII characters in the header name forced to lower case.
  */
 const char *mime_parse(const char *s,
                       int (*callback)(const char *name, const char *value,
@@ -291,6 +300,7 @@ const char *mime_parse(const char *s,
   return s;
 }
 
+/** @brief Match the boundary string */
 static int isboundary(const char *ptr, const char *boundary, size_t bl) {
   return (ptr[0] == '-'
          && ptr[1] == '-'
@@ -301,6 +311,7 @@ static int isboundary(const char *ptr, const char *boundary, size_t bl) {
                  && (iscrlf(ptr + bl + 4) || *(ptr + bl + 4) == 0))));
 }
 
+/** @brief Match the final boundary string */
 static int isfinal(const char *ptr, const char *boundary, size_t bl) {
   return (ptr[0] == '-'
          && ptr[1] == '-'
@@ -312,10 +323,14 @@ static int isfinal(const char *ptr, const char *boundary, size_t bl) {
 
 /** @brief Parse a multipart MIME body
  * @param s Start of message
- * @param callback CAllback for each part
+ * @param callback Callback for each part
  * @param boundary Boundary string
  * @param u Passed to callback
  * @return 0 on success, non-0 on error
+ * 
+ * See <a href="http://tools.ietf.org/html/rfc2046#section-5.1">RFC 2046
+ * s5.1</a>.  @p callback is called for each part (not yet decoded in any way)
+ * in succession; you should probably call mime_parse() for each part.
  */
 int mime_multipart(const char *s,
                   int (*callback)(const char *s, void *u),
@@ -347,10 +362,13 @@ int mime_multipart(const char *s,
 
 /** @brief Parse an RFC2388-style content-disposition field
  * @param s Start of field
- * @param typep Where to store type
+ * @param dispositionp Where to store disposition
  * @param parameternamep Where to store parameter name
- * @param parameternvaluep Wher to store parameter value
+ * @param parametervaluep Wher to store parameter value
  * @return 0 on success, non-0 on error
+ *
+ * See <a href="http://tools.ietf.org/html/rfc2388#section-3">RFC 2388 s3</a>
+ * and <a href="http://tools.ietf.org/html/rfc2183">RFC 2183</a>.
  */
 int mime_rfc2388_content_disposition(const char *s,
                                     char **dispositionp,
@@ -389,6 +407,9 @@ int mime_rfc2388_content_disposition(const char *s,
 /** @brief Convert MIME quoted-printable
  * @param s Quoted-printable data
  * @return Decoded data
+ *
+ * See <a href="http://tools.ietf.org/html/rfc2045#section-6.7">RFC 2045
+ * s6.7</a>.
  */
 char *mime_qp(const char *s) {
   struct dynstr d;
@@ -436,6 +457,8 @@ char *mime_qp(const char *s) {
  * @param s Header field value
  * @param cd Where to store result
  * @return 0 on success, non-0 on error
+ *
+ * See <a href="http://tools.ietf.org/html/rfc2109">RFC 2109</a>.
  */
 int parse_cookie(const char *s,
                 struct cookiedata *cd) {
@@ -508,6 +531,41 @@ const struct cookie *find_cookie(const struct cookiedata *cd,
   return 0;
 }
 
+/** @brief RFC822 quoting
+ * @param s String to quote
+ * @param force If non-0, always quote
+ * @return Possibly quoted string
+ */
+char *quote822(const char *s, int force) {
+  const char *t;
+  struct dynstr d[1];
+  int c;
+
+  if(!force) {
+    /* See if we need to quote */
+    for(t = s; (c = (unsigned char)*t); ++t) {
+      if(tspecial(c) || http_separator(c) || whitespace(c))
+       break;
+    }
+    if(*t)
+      force = 1;
+  }
+
+  if(!force)
+    return xstrdup(s);
+
+  dynstr_init(d);
+  dynstr_append(d, '"');
+  for(t = s; (c = (unsigned char)*t); ++t) {
+    if(c == '"' || c == '\\')
+      dynstr_append(d, '\\');
+    dynstr_append(d, c);
+  }
+  dynstr_append(d, '"');
+  dynstr_terminate(d);
+  return d->vec;
+}
+
 /*
 Local Variables:
 c-basic-offset:2