#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "tools.h"
void extract_key(char *target, char *source, char *key)
{
- int a, b;
-
- strcpy(target, source);
- for (a = 0; a < strlen(target); ++a) {
- if ((!strncasecmp(&target[a], key, strlen(key)))
- && (target[a + strlen(key)] == '=')) {
- strcpy(target, &target[a + strlen(key) + 1]);
- if (target[0] == 34)
- strcpy(target, &target[1]);
- for (b = 0; b < strlen(target); ++b)
- if (target[b] == 34)
- target[b] = 0;
- return;
+ char *ptr;
+ char looking_for[256];
+ int double_quotes = 0;
+
+ snprintf(looking_for, sizeof looking_for, "%s=", key);
+
+ ptr = bmstrcasestr(source, looking_for);
+ if (ptr == NULL) {
+ strcpy(target, "");
+ return;
+ }
+ strcpy(target, (ptr + strlen(looking_for)));
+
+ for (ptr=target; (*ptr != 0); ++ptr) {
+
+ /* A semicolon means we've hit the end of the key, unless we're inside double quotes */
+ if ( (double_quotes != 1) && (*ptr == ';')) {
+ *ptr = 0;
+ }
+
+ /* if we find double quotes, we've got a great set of string boundaries */
+ if (*ptr == '\"') {
+ ++double_quotes;
+ if (double_quotes == 1) {
+ strcpy(ptr, ptr+1);
+ }
+ else {
+ *ptr = 0;
+ }
}
}
- strcpy(target, "");
}
-/*
- * Convert "quoted-printable" to binary. Returns number of bytes decoded.
- * according to RFC2045 section 6.7
- */
-int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
- unsigned int ch;
- int destpos = 1;
- int sourcepos = 1;
- int ignore_last = 0;
- char *check;
-
- decoded[0] = 0;
- if (sourcelen >0)
- decoded[0] = encoded[0];
- while (sourcepos <= sourcelen){
- check = &decoded[destpos];
- decoded[destpos] = encoded[sourcepos];
- if ((ignore_last == 0) && (decoded[destpos-1] == '='))
- {
- if ((*check == '\0') ||
- (*check == '\n') ||
- (*check == '\r'))
- {
- decoded[destpos - 1] = '\0';
- destpos-=2;
- }
- else if (sourcelen - sourcepos > 2)
- {
- sscanf(&encoded[sourcepos], "%02x", &ch);
- decoded[destpos - 1] = ch;
- sourcepos++;
- destpos --;
- ignore_last = 1;
- }
- }
- else
- ignore_last = 0;
- destpos ++;
- sourcepos ++;
- }
-
- decoded[destpos] = 0;
- return(destpos - 1);
-}
-
-
/*
* Given a message or message-part body and a length, handle any necessary
* decoding and pass the request up the stack.
int part_seq = 0;
int i;
size_t length;
- char nested_partnum[SIZ];
+ char nested_partnum[256];
+ int crlf_in_use = 0;
+ char *evaluate_crlf_ptr = NULL;
+ int buflen = 0;
+ int headerlen = 0;
ptr = content_start;
content_length = 0;
/* Learn interesting things from the headers */
strcpy(header, "");
+ headerlen = 0;
do {
- ptr = memreadline(ptr, buf, SIZ);
+ ptr = memreadlinelen(ptr, buf, SIZ, &buflen);
if (ptr >= content_end) {
goto end_parser;
}
- for (i = 0; i < strlen(buf); ++i) {
+ for (i = 0; i < buflen; ++i) {
if (isspace(buf[i])) {
buf[i] = ' ';
}
}
if (!isspace(buf[0])) {
- if (!strncasecmp(header, "Content-type: ", 14)) {
- strcpy(content_type, &header[14]);
+ if (!strncasecmp(header, "Content-type:", 13)) {
+ strcpy(content_type, &header[13]);
+ striplt(content_type);
extract_key(content_type_name, content_type, "name");
extract_key(charset, content_type, "charset");
+ extract_key(boundary, header, "boundary");
/* Deal with weird headers */
if (strchr(content_type, ' '))
*(strchr(content_type, ' ')) = '\0';
if (strchr(content_type, ';'))
*(strchr(content_type, ';')) = '\0';
}
- if (!strncasecmp(header, "Content-Disposition: ", 21)) {
- strcpy(disposition, &header[21]);
+ if (!strncasecmp(header, "Content-Disposition:", 20)) {
+ strcpy(disposition, &header[20]);
+ striplt(disposition);
extract_key(content_disposition_name, disposition, "name");
extract_key(filename, disposition, "filename");
}
- if (!strncasecmp(header, "Content-length: ", 16)) {
- content_length = (size_t) atol(&header[16]);
+ if (!strncasecmp(header, "Content-length: ", 15)) {
+ char clbuf[10];
+ safestrncpy(clbuf, &header[15], sizeof clbuf);
+ striplt(clbuf);
+ content_length = (size_t) atol(clbuf);
+ }
+ if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
+ strcpy(encoding, &header[26]);
+ striplt(encoding);
}
- if (!strncasecmp(header,
- "Content-transfer-encoding: ", 27))
- strcpy(encoding, &header[27]);
- if (strlen(boundary) == 0)
- extract_key(boundary, header, "boundary");
strcpy(header, "");
+ headerlen = 0;
+ }
+ if ((headerlen + buflen + 2) < SIZ) {
+ memcpy(&header[headerlen], buf, buflen);
+ headerlen += buflen;
+ header[headerlen] = '\0';
}
- if ((strlen(header) + strlen(buf) + 2) < SIZ)
- strcat(header, buf);
- } while ((strlen(buf) > 0) && (*ptr != 0));
+ } while ((!IsEmptyStr(buf)) && (*ptr != 0));
if (strchr(disposition, ';'))
*(strchr(disposition, ';')) = '\0';
*(strchr(content_type, ';')) = '\0';
striplt(content_type);
- if (strlen(boundary) > 0) {
+ if (!IsEmptyStr(boundary)) {
is_multipart = 1;
} else {
is_multipart = 0;
if ( (part_start != NULL) && (next_boundary != NULL) ) {
part_end = next_boundary;
- --part_end;
+ --part_end; /* omit the trailing LF */
+ if (crlf_in_use) {
+ --part_end; /* omit the trailing CR */
+ }
- if (strlen(partnum) > 0) {
+ if (!IsEmptyStr(partnum)) {
snprintf(nested_partnum,
sizeof nested_partnum,
"%s.%d", partnum,
else {
/* Set up for the next part. */
part_start = strstr(next_boundary, "\n");
+
+ /* Determine whether newlines are LF or CRLF */
+ evaluate_crlf_ptr = part_start;
+ --evaluate_crlf_ptr;
+ if (!memcmp(evaluate_crlf_ptr, "\r\n", 2)) {
+ crlf_in_use = 1;
+ }
+ else {
+ crlf_in_use = 0;
+ }
+
+ /* Advance past the LF ... now we're in the next part */
++part_start;
ptr = part_start;
}
++length;
}
part_end = content_end;
- /* fix an off-by-one error */
+
+ /******
+ * I thought there was an off-by-one error here, but there isn't.
+ * This probably means that there's an off-by-one error somewhere
+ * else ... or maybe only in certain messages?
--part_end;
--length;
+ ******/
/* Truncate if the header told us to */
if ( (content_length > 0) && (length > content_length) ) {
projects / citadel.git / blobdiff