tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed base64 decoding of email parts: str[x] = ch does not adjust length! and be more lenient with encoding errors

Browse Source
This commit is contained in:
dockes 2005-10-31 08:59:05 +00:00
parent de87503ba6
commit f0f98312cd
2 changed files with 80 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/internfile/mh_mail.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.6 2005-10-15 12:18:04 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.7 2005-10-31 08:59:05 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -330,15 +330,27 @@ static void walkmime(RclConfig *cnf, string &out, Binc::MimePart& doc,
// Decode content transfer encoding // Decode content transfer encoding
if (!stringlowercmp("quoted-printable", cte)) { if (!stringlowercmp("quoted-printable", cte)) {
string decoded; string decoded;
qp_decode(body, decoded); if (!qp_decode(body, decoded)) {
LOGERR(("walkmime: quoted-printable decoding failed !\n"));
return;
}
body = decoded; body = decoded;
} else if (!stringlowercmp("base64", cte)) { } else if (!stringlowercmp("base64", cte)) {
string decoded; string decoded;
base64_decode(body, decoded); if (!base64_decode(body, decoded)) {
LOGERR(("walkmime: base64 decoding failed !\n"));
#if 0
FILE *fp = fopen("/tmp/recoll_decodefail", "w");
if (fp) {
fprintf(fp, "%s", body.c_str());
fclose(fp);
}
#endif
return;
}
body = decoded; body = decoded;
} }
string transcoded; string transcoded;
if (!stringlowercmp("text/html", content_type.value)) { if (!stringlowercmp("text/html", content_type.value)) {
MimeHandlerHtml mh; MimeHandlerHtml mh;

82
src/utils/mimeparse.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.4 2005-10-15 12:18:04 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.5 2005-10-31 08:59:05 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
#ifndef TEST_MIMEPARSE #ifndef TEST_MIMEPARSE
@ -11,6 +11,13 @@ static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.4 2005-10-15 12:18:04 dockes Ex
#include "mimeparse.h" #include "mimeparse.h"
//#define DEBUG_MIMEPARSE
#ifdef DEBUG_MIMEPARSE
#define DPRINT(X) fprintf X
#else
#define DPRINT(X)
#endif
using namespace std; using namespace std;
// Parsing a header value. Only content-type has parameters, but // Parsing a header value. Only content-type has parameters, but
@ -264,23 +271,27 @@ bool base64_decode(const string& in, string& out)
break; break;
pos = strchr(Base64, ch); pos = strchr(Base64, ch);
if (pos == 0) /* A non-base64 character. */ if (pos == 0) {
/* A non-base64 character. */
DPRINT((stderr, "base64_dec: non-base64 char at pos %d\n", ii));
return false; return false;
}
switch (state) { switch (state) {
case 0: case 0:
out[io] = (pos - Base64) << 2; out += (pos - Base64) << 2;
state = 1; state = 1;
break; break;
case 1: case 1:
out[io] |= (pos - Base64) >> 4; out[io] |= (pos - Base64) >> 4;
out[io+1] = ((pos - Base64) & 0x0f) << 4 ; out += ((pos - Base64) & 0x0f) << 4 ;
io++; io++;
state = 2; state = 2;
break; break;
case 2: case 2:
out[io] |= (pos - Base64) >> 2; out[io] |= (pos - Base64) >> 2;
out[io+1] = ((pos - Base64) & 0x03) << 6; out += ((pos - Base64) & 0x03) << 6;
io++; io++;
state = 3; state = 3;
break; break;
@ -290,6 +301,7 @@ bool base64_decode(const string& in, string& out)
state = 0; state = 0;
break; break;
default: default:
DPRINT((stderr, "base64_dec: internal!bad state!\n"));
return false; return false;
} }
} }
@ -304,6 +316,7 @@ bool base64_decode(const string& in, string& out)
switch (state) { switch (state) {
case 0: /* Invalid = in first position */ case 0: /* Invalid = in first position */
case 1: /* Invalid = in second position */ case 1: /* Invalid = in second position */
DPRINT((stderr, "base64_dec: pad char in state 0/1\n"));
return false; return false;
case 2: /* Valid, means one byte of info */ case 2: /* Valid, means one byte of info */
@ -312,20 +325,27 @@ bool base64_decode(const string& in, string& out)
if (!isspace((unsigned char)ch)) if (!isspace((unsigned char)ch))
break; break;
/* Make sure there is another trailing = sign. */ /* Make sure there is another trailing = sign. */
if (ch != Pad64) if (ch != Pad64) {
return false; DPRINT((stderr, "base64_dec: missing pad char!\n"));
// Well, there are bad encoders out there. Let it pass
// return false;
}
ch = in[ii++]; /* Skip the = */ ch = in[ii++]; /* Skip the = */
/* Fall through to "single trailing =" case. */ /* Fall through to "single trailing =" case. */
/* FALLTHROUGH */ /* FALLTHROUGH */
case 3: /* Valid, means two bytes of info */ case 3: /* Valid, means two bytes of info */
/* /*
* We know this char is an =. Is there anything but * We know this char is an =. Is there anything but
* whitespace after it? * whitespace after it?
*/ */
for ((void)NULL; ii < in.length(); ch = in[ii++]) for ((void)NULL; ii < in.length(); ch = in[ii++])
if (!isspace((unsigned char)ch)) if (!isspace((unsigned char)ch)) {
return false; DPRINT((stderr, "base64_dec: non-white at eod: 0x%x\n",
(unsigned int)ch));
// Well, there are bad encoders out there. Let it pass
//return false;
}
/* /*
* Now make sure for cases 2 and 3 that the "extra" * Now make sure for cases 2 and 3 that the "extra"
@ -333,18 +353,26 @@ bool base64_decode(const string& in, string& out)
* zeros. If we don't check them, they become a * zeros. If we don't check them, they become a
* subliminal channel. * subliminal channel.
*/ */
if (out[io] != 0) if (out[io] != 0) {
return false; DPRINT((stderr, "base64_dec: bad extra bits!\n"));
// Well, there are bad encoders out there. Let it pass
out[io] = 0;
// return false;
}
} }
} else { } else {
/* /*
* We ended by seeing the end of the string. Make sure we * We ended by seeing the end of the string. Make sure we
* have no partial bytes lying around. * have no partial bytes lying around.
*/ */
if (state != 0) if (state != 0) {
DPRINT((stderr, "base64_dec: bad final state\n"));
return false; return false;
}
} }
DPRINT((stderr, "base64_dec: ret ok, io %d sz %d len %d value [%s]\n",
io, out.size(), out.length(), out.c_str()));
return true; return true;
} }
@ -494,6 +522,9 @@ bool rfc2047_decode(const std::string& in, std::string &out)
#include <string> #include <string>
#include "mimeparse.h" #include "mimeparse.h"
#include "readfile.h"
using namespace std; using namespace std;
int int
main(int argc, const char **argv) main(int argc, const char **argv)
@ -536,9 +567,10 @@ main(int argc, const char **argv)
string out; string out;
if (!base64_decode(string(b64), out)) { if (!base64_decode(string(b64), out)) {
fprintf(stderr, "base64_decode returned error\n"); fprintf(stderr, "base64_decode returned error\n");
exit(1);
} }
printf("Decoded: '%s'\n", out.c_str()); printf("Decoded: '%s'\n", out.c_str());
#elif 1 #elif 0
char line [1024]; char line [1024];
string out; string out;
while (fgets(line, 1023, stdin)) { while (fgets(line, 1023, stdin)) {
@ -550,6 +582,20 @@ main(int argc, const char **argv)
rfc2047_decode(line, out); rfc2047_decode(line, out);
fprintf(stderr, "Out: [%s]\n", out.c_str()); fprintf(stderr, "Out: [%s]\n", out.c_str());
} }
#elif 1
string coded, decoded;
const char *fname = "/tmp/recoll_decodefail";
if (!file_to_string(fname, coded)) {
fprintf(stderr, "Cant read %s\n", fname);
exit(1);
}
if (!base64_decode(coded, decoded)) {
fprintf(stderr, "base64_decode returned error\n");
exit(1);
}
printf("Decoded: [%s]\n", decoded.c_str());
#endif #endif
} }