Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fully function email message decoder now in place. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d0ae0898ded03e032ed1df2447ce4b37 |
| User & Date: | drh 2018-07-12 23:03:57 |
Context
|
2018-07-13
| ||
| 05:46 | An alternative to removing FOSSIL_ENABLE_LEGACY_MV_RM that just makes it the default. (check-in: 9951fd7b user: mistachkin tags: trunk) | |
|
2018-07-12
| ||
| 23:03 | Fully function email message decoder now in place. (check-in: d0ae0898 user: drh tags: trunk) | |
| 22:16 | Another incremental check-in on the email format decoder. (check-in: ec3fccd3 user: drh tags: trunk) | |
Changes
Changes to src/encode.c.
490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 ... 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 ... 652 653 654 655 656 657 658 659 660 661 662 663 664 665 |
for(i=2; i<g.argc; i++){
z = encode64(g.argv[i], -1);
fossil_print("%s\n", z);
free(z);
}
}
/*
** This function treats its input as a base-64 string and returns the
** decoded value of that string. Characters of input that are not
** valid base-64 characters (such as spaces and newlines) are ignored.
**
** Space to hold the decoded string is obtained from malloc().
**
** The number of bytes decoded is returned in *pnByte
*/
char *decode64(const char *z64, int *pnByte){
char *zData;
int n64;
int i, j;
int a, b, c, d;
static int isInit = 0;
static int trans[128];
if( !isInit ){
for(i=0; i<128; i++){ trans[i] = 0; }
for(i=0; zBase[i]; i++){ trans[zBase[i] & 0x7f] = i; }
isInit = 1;
}
n64 = strlen(z64);
while( n64>0 && z64[n64-1]=='=' ) n64--;
zData = fossil_malloc( (n64*3)/4 + 4 );
for(i=j=0; i+3<n64; i+=4){
a = trans[z64[i] & 0x7f];
b = trans[z64[i+1] & 0x7f];
c = trans[z64[i+2] & 0x7f];
d = trans[z64[i+3] & 0x7f];
zData[j++] = ((a<<2) & 0xfc) | ((b>>4) & 0x03);
zData[j++] = ((b<<4) & 0xf0) | ((c>>2) & 0x0f);
zData[j++] = ((c<<6) & 0xc0) | (d & 0x3f);
}
if( i+2<n64 ){
a = trans[z64[i] & 0x7f];
b = trans[z64[i+1] & 0x7f];
c = trans[z64[i+2] & 0x7f];
zData[j++] = ((a<<2) & 0xfc) | ((b>>4) & 0x03);
zData[j++] = ((b<<4) & 0xf0) | ((c>>2) & 0x0f);
}else if( i+1<n64 ){
a = trans[z64[i] & 0x7f];
b = trans[z64[i+1] & 0x7f];
zData[j++] = ((a<<2) & 0xfc) | ((b>>4) & 0x03);
}
zData[j] = 0;
*pnByte = j;
return zData;
}
/*
** COMMAND: test-decode64
**
** Usage: %fossil test-decode64 STRING
................................................................................
*/
void test_decode64_cmd(void){
char *z;
int i, n;
for(i=2; i<g.argc; i++){
z = decode64(g.argv[i], &n);
fossil_print("%d: %s\n", n, z);
free(z);
}
}
/*
** The base-16 encoding using the following characters:
**
** 0123456789abcdef
................................................................................
*/
void canonical16(char *z, int n){
while( *z && n-- ){
*z = zEncode[zDecode[(*z)&0x7f]&0x1f];
z++;
}
}
/* Randomness used for XOR-ing by the obscure() and unobscure() routines */
static const unsigned char aObscurer[16] = {
0xa7, 0x21, 0x31, 0xe3, 0x2a, 0x50, 0x2c, 0x86,
0x4c, 0xa4, 0x52, 0x25, 0xff, 0x49, 0x35, 0x85
};
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < > | > > > > > > > > > > > > > > > > > > > > > > > > > |
490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 ... 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 ... 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 |
for(i=2; i<g.argc; i++){
z = encode64(g.argv[i], -1);
fossil_print("%s\n", z);
free(z);
}
}
/* Decode base64 text. Write the output into zData. The caller
** must ensure that zData is large enough. It is ok for z64 and
** zData to be the same buffer. In other words, it is ok to decode
** in-place. A zero terminator is always placed at the end of zData.
*/
void decodeBase64(const char *z64, int *pnByte, char *zData){
const unsigned char *zIn = (const unsigned char*)z64;
int i, j, k;
int x[4];
static int isInit = 0;
static signed char trans[256];
if( !isInit ){
for(i=0; i<256; i++){ trans[i] = -1; }
for(i=0; zBase[i]; i++){ trans[zBase[i] & 0x7f] = i; }
isInit = 1;
}
for(j=k=0; zIn[0]; zIn++){
int v = trans[zIn[0]];
if( v>=0 ){
x[k++] = v;
if( k==4 ){
zData[j++] = ((x[0]<<2) & 0xfc) | ((x[1]>>4) & 0x03);
zData[j++] = ((x[1]<<4) & 0xf0) | ((x[2]>>2) & 0x0f);
zData[j++] = ((x[2]<<6) & 0xc0) | (x[3] & 0x3f);
k = 0;
}
}
}
if( k>=2 ){
zData[j++] = ((x[0]<<2) & 0xfc) | ((x[1]>>4) & 0x03);
if( k==3 ){
zData[j++] = ((x[1]<<4) & 0xf0) | ((x[2]>>2) & 0x0f);
}
}
zData[j] = 0;
*pnByte = j;
}
/*
** This function treats its input as a base-64 string and returns the
** decoded value of that string. Characters of input that are not
** valid base-64 characters (such as spaces and newlines) are ignored.
**
** Space to hold the decoded string is obtained from malloc().
**
** The number of bytes decoded is returned in *pnByte
*/
char *decode64(const char *z64, int *pnByte){
char *zData;
int n64 = (int)strlen(z64);
while( n64>0 && z64[n64-1]=='=' ) n64--;
zData = fossil_malloc( (n64*3)/4 + 4 );
decodeBase64(z64, pnByte, zData);
return zData;
}
/*
** COMMAND: test-decode64
**
** Usage: %fossil test-decode64 STRING
................................................................................
*/
void test_decode64_cmd(void){
char *z;
int i, n;
for(i=2; i<g.argc; i++){
z = decode64(g.argv[i], &n);
fossil_print("%d: %s\n", n, z);
fossil_free(z);
}
}
/*
** The base-16 encoding using the following characters:
**
** 0123456789abcdef
................................................................................
*/
void canonical16(char *z, int n){
while( *z && n-- ){
*z = zEncode[zDecode[(*z)&0x7f]&0x1f];
z++;
}
}
/*
** Decode a string encoded using "quoted-printable".
**
** (1) "=" followed by two hex digits becomes a single
** byte specified by the two digits
**
** The decoding is done in-place.
*/
void decodeQuotedPrintable(char *z, int *pnByte){
int i, j, c;
for(i=j=0; (c = z[i])!=0; i++){
if( c=='=' ){
if( z[i+1]!='\r' ){
decode16((unsigned char*)&z[i+1], (unsigned char*)&z[j], 2);
j++;
}
i += 2;
}else{
z[j++] = c;
}
}
if( pnByte ) *pnByte = j;
z[j] = 0;
}
/* Randomness used for XOR-ing by the obscure() and unobscure() routines */
static const unsigned char aObscurer[16] = {
0xa7, 0x21, 0x31, 0xe3, 0x2a, 0x50, 0x2c, 0x86,
0x4c, 0xa4, 0x52, 0x25, 0xff, 0x49, 0x35, 0x85
};
|
Changes to src/webmail.c.
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 |
p->nHdr, p->nBody);
for(i=0; i<p->nHdr; i++){
fossil_print("%3d: %s\n", i, p->azHdr[i]);
}
for(i=0; i<p->nBody; i++){
fossil_print("\nBODY %d mime \"%s\" encoding %d:\n",
i, p->aBody[i].zMimetype, p->aBody[i].encoding);
fossil_print("%s\n", p->aBody[i].zContent);
}
emailtoc_free(p);
blob_reset(&email);
}
/*
** WEBPAGE: webmail
|
> > > > > > > > > > > > > > > > | > > > |
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 |
p->nHdr, p->nBody);
for(i=0; i<p->nHdr; i++){
fossil_print("%3d: %s\n", i, p->azHdr[i]);
}
for(i=0; i<p->nBody; i++){
fossil_print("\nBODY %d mime \"%s\" encoding %d:\n",
i, p->aBody[i].zMimetype, p->aBody[i].encoding);
switch( p->aBody[i].encoding ){
case EMAILENC_B64: {
int n = 0;
decodeBase64(p->aBody[i].zContent, &n, p->aBody[i].zContent);
fossil_print("%s", p->aBody[i].zContent);
if( n && p->aBody[i].zContent[n-1]!='\n' ) fossil_print("\n");
break;
}
case EMAILENC_QUOTED: {
int n = 0;
decodeQuotedPrintable(p->aBody[i].zContent, &n);
fossil_print("%s", p->aBody[i].zContent);
if( n && p->aBody[i].zContent[n-1]!='\n' ) fossil_print("\n");
break;
}
default: {
fossil_print("%s\n", p->aBody[i].zContent);
break;
}
}
}
emailtoc_free(p);
blob_reset(&email);
}
/*
** WEBPAGE: webmail
|