Permalink
Browse files

Message generation/parsing context. Charset conversion options. Preli…

…minary implementation of RFC-6532.
  • Loading branch information...
vincent-richard committed Feb 24, 2013
1 parent 86720eb commit 0c5d4a10e6f616f5a63787b8fbda86ec9fc487a9
Showing with 4,374 additions and 959 deletions.
  1. +8 −1 SConstruct
  2. +263 −0 contrib/punycode/punycode.c
  3. +84 −0 contrib/punycode/punycode.h
  4. +34 −0 contrib/utf8/utf8.h
  5. +327 −0 contrib/utf8/utf8/checked.h
  6. +326 −0 contrib/utf8/utf8/core.h
  7. +228 −0 contrib/utf8/utf8/unchecked.h
  8. +4 −3 src/address.cpp
  9. +11 −6 src/addressList.cpp
  10. +4 −2 src/base.cpp
  11. +11 −11 src/body.cpp
  12. +9 −7 src/bodyPart.cpp
  13. +20 −10 src/charset.cpp
  14. +10 −383 src/charsetConverter.cpp
  15. +37 −0 src/charsetConverterOptions.cpp
  16. +435 −0 src/charsetConverter_iconv.cpp
  17. +168 −0 src/charsetConverter_idna.cpp
  18. +51 −14 src/component.cpp
  19. +2 −0 src/constants.cpp
  20. +6 −4 src/contentDisposition.cpp
  21. +87 −0 src/context.cpp
  22. +6 −4 src/dateTime.cpp
  23. +7 −5 src/disposition.cpp
  24. +513 −0 src/emailAddress.cpp
  25. +6 −4 src/encoding.cpp
  26. +109 −0 src/generationContext.cpp
  27. +8 −6 src/header.cpp
  28. +12 −9 src/headerField.cpp
  29. +32 −45 src/mailbox.cpp
  30. +4 −3 src/mailboxField.cpp
  31. +13 −8 src/mailboxGroup.cpp
  32. +6 −5 src/mailboxList.cpp
  33. +1 −1 src/mdn/MDNHelper.cpp
  34. +7 −5 src/mediaType.cpp
  35. +1 −29 src/message.cpp
  36. +11 −8 src/messageId.cpp
  37. +11 −6 src/messageIdSequence.cpp
  38. +2 −2 src/net/sendmail/sendmailTransport.cpp
  39. +13 −2 src/net/smtp/SMTPCommand.cpp
  40. +17 −11 src/parameter.cpp
  41. +10 −8 src/parameterizedHeaderField.cpp
  42. +7 −28 src/{options.cpp → parsingContext.cpp}
  43. +6 −4 src/path.cpp
  44. +13 −7 src/relay.cpp
  45. +32 −13 src/text.cpp
  46. +33 −0 src/utility/stringUtils.cpp
  47. +64 −34 src/word.cpp
  48. +18 −10 src/wordEncoder.cpp
  49. +71 −17 tests/parser/charsetTest.cpp
  50. +224 −0 tests/parser/emailAddressTest.cpp
  51. +1 −1 tests/parser/mailboxTest.cpp
  52. +76 −3 tests/parser/textTest.cpp
  53. +16 −1 tests/testUtils.hpp
  54. +5 −1 vmime/address.hpp
  55. +4 −3 vmime/addressList.hpp
  56. +4 −3 vmime/body.hpp
  57. +4 −3 vmime/bodyPart.hpp
  58. +13 −5 vmime/charset.hpp
  59. +33 −70 vmime/charsetConverter.hpp
  60. +9 −53 vmime/{options.hpp → charsetConverterOptions.hpp}
  61. +124 −0 vmime/charsetConverter_iconv.hpp
  62. +70 −0 vmime/charsetConverter_idna.hpp
  63. +61 −12 vmime/component.hpp
  64. +2 −0 vmime/constants.hpp
  65. +4 −3 vmime/contentDisposition.hpp
  66. +122 −0 vmime/context.hpp
  67. +4 −3 vmime/dateTime.hpp
  68. +4 −3 vmime/disposition.hpp
  69. +121 −0 vmime/emailAddress.hpp
  70. +4 −3 vmime/encoding.hpp
  71. +106 −0 vmime/generationContext.hpp
  72. +4 −3 vmime/header.hpp
  73. +6 −4 vmime/headerField.hpp
  74. +10 −8 vmime/mailbox.hpp
  75. +3 −1 vmime/mailboxField.hpp
  76. +4 −3 vmime/mailboxGroup.hpp
  77. +4 −3 vmime/mailboxList.hpp
  78. +4 −3 vmime/mediaType.hpp
  79. +5 −15 vmime/message.hpp
  80. +6 −4 vmime/messageId.hpp
  81. +4 −3 vmime/messageIdSequence.hpp
  82. +5 −4 vmime/parameter.hpp
  83. +4 −3 vmime/parameterizedHeaderField.hpp
  84. +59 −0 vmime/parsingContext.hpp
  85. +4 −3 vmime/path.hpp
  86. +4 −3 vmime/relay.hpp
  87. +32 −7 vmime/text.hpp
  88. +27 −0 vmime/utility/stringUtils.hpp
  89. +4 −1 vmime/vmime.hpp
  90. +14 −8 vmime/word.hpp
  91. +2 −1 vmime/wordEncoder.hpp
View
@@ -56,20 +56,26 @@ libvmime_sources = [
'bodyPartAttachment.cpp', 'bodyPartAttachment.hpp',
'charset.cpp', 'charset.hpp',
'charsetConverter.cpp', 'charsetConverter.hpp',
'charsetConverter_iconv.cpp', 'charsetConverter_iconv.hpp',
'charsetConverter_idna.cpp', 'charsetConverter_idna.hpp',
'charsetConverterOptions.cpp', 'charsetConverterOptions.hpp',
'component.cpp', 'component.hpp',
'constants.cpp', 'constants.hpp',
'contentDisposition.cpp', 'contentDisposition.hpp',
'contentDispositionField.cpp', 'contentDispositionField.hpp',
'contentHandler.cpp', 'contentHandler.hpp',
'contentTypeField.cpp', 'contentTypeField.hpp',
'context.hpp', 'context.cpp',
'dateTime.cpp', 'dateTime.hpp',
'defaultAttachment.cpp', 'defaultAttachment.hpp',
'disposition.cpp', 'disposition.hpp',
'emailAddress.cpp', 'emailAddress.hpp',
'emptyContentHandler.cpp', 'emptyContentHandler.hpp',
'encoding.cpp', 'encoding.hpp',
'exception.cpp', 'exception.hpp',
'fileAttachment.cpp', 'fileAttachment.hpp',
'generatedMessageAttachment.hpp', 'generatedMessageAttachment.cpp',
'generationContext.hpp', 'generationContext.cpp',
'header.cpp', 'header.hpp',
'headerFieldFactory.cpp', 'headerFieldFactory.hpp',
'headerField.cpp', 'headerField.hpp',
@@ -87,12 +93,12 @@ libvmime_sources = [
'messageIdSequence.cpp', 'messageIdSequence.hpp',
'messageParser.cpp', 'messageParser.hpp',
'object.cpp', 'object.hpp',
'options.cpp', 'options.hpp',
'path.cpp', 'path.hpp',
'parameter.cpp', 'parameter.hpp',
'parameterizedHeaderField.cpp', 'parameterizedHeaderField.hpp',
'parsedMessageAttachment.cpp', 'parsedMessageAttachment.hpp',
'parserHelpers.hpp',
'parsingContext.hpp', 'parsingContext.cpp',
'plainTextPart.cpp', 'plainTextPart.hpp',
'platform.cpp', 'platform.hpp',
'propertySet.cpp', 'propertySet.hpp',
@@ -352,6 +358,7 @@ libvmimetest_sources = [
'tests/parser/charsetTest.cpp',
'tests/parser/datetimeTest.cpp',
'tests/parser/dispositionTest.cpp',
'tests/parser/emailAddressTest.cpp',
'tests/parser/headerTest.cpp',
'tests/parser/htmlTextPartTest.cpp',
'tests/parser/mailboxTest.cpp',
View
@@ -0,0 +1,263 @@
/*
punycode.c from RFC 3492
http://www.nicemice.net/idn/
Adam M. Costello
http://www.nicemice.net/amc/
This is ANSI C code (C89) implementing Punycode (RFC 3492).
*/
#include <string.h>
/*** Bootstring parameters for Punycode ***/
enum { base = 36, tmin = 1, tmax = 26, skew = 38, damp = 700,
initial_bias = 72, initial_n = 0x80, delimiter = 0x2D };
/* basic(cp) tests whether cp is a basic code point: */
#define basic(cp) ((punycode_uint)(cp) < 0x80)
/* delim(cp) tests whether cp is a delimiter: */
#define delim(cp) ((cp) == delimiter)
/* decode_digit(cp) returns the numeric value of a basic code */
/* point (for use in representing integers) in the range 0 to */
/* base-1, or base if cp is does not represent a value. */
static punycode_uint decode_digit(punycode_uint cp)
{
return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
cp - 97 < 26 ? cp - 97 : (punycode_uint) base;
}
/* encode_digit(d,flag) returns the basic code point whose value */
/* (when used for representing integers) is d, which needs to be in */
/* the range 0 to base-1. The lowercase form is used unless flag is */
/* nonzero, in which case the uppercase form is used. The behavior */
/* is undefined if flag is nonzero and digit d has no uppercase form. */
static char encode_digit(punycode_uint d, int flag)
{
return d + 22 + 75 * (d < 26) - ((flag != 0) << 5);
/* 0..25 map to ASCII a..z or A..Z */
/* 26..35 map to ASCII 0..9 */
}
/* flagged(bcp) tests whether a basic code point is flagged */
/* (uppercase). The behavior is undefined if bcp is not a */
/* basic code point. */
#define flagged(bcp) ((punycode_uint)(bcp) - 65 < 26)
/* encode_basic(bcp,flag) forces a basic code point to lowercase */
/* if flag is zero, uppercase if flag is nonzero, and returns */
/* the resulting code point. The code point is unchanged if it */
/* is caseless. The behavior is undefined if bcp is not a basic */
/* code point. */
static char encode_basic(punycode_uint bcp, int flag)
{
bcp -= (bcp - 97 < 26) << 5;
return bcp + ((!flag && (bcp - 65 < 26)) << 5);
}
/*** Platform-specific constants ***/
/* maxint is the maximum value of a punycode_uint variable: */
static const punycode_uint maxint = -1U;
/* Because maxint is unsigned, -1 becomes the maximum value. */
/*** Bias adaptation function ***/
static punycode_uint adapt(
punycode_uint delta, punycode_uint numpoints, int firsttime )
{
punycode_uint k;
delta = firsttime ? delta / damp : delta >> 1;
/* delta >> 1 is a faster way of doing delta / 2 */
delta += delta / numpoints;
for (k = 0; delta > ((base - tmin) * tmax) / 2; k += base) {
delta /= base - tmin;
}
return k + (base - tmin + 1) * delta / (delta + skew);
}
/*** Main encode function ***/
enum punycode_status punycode_encode(
punycode_uint input_length,
const punycode_uint input[],
const unsigned char case_flags[],
punycode_uint *output_length,
char output[] )
{
punycode_uint n, delta, h, b, out, max_out, bias, j, m, q, k, t;
/* Initialize the state: */
n = initial_n;
delta = out = 0;
max_out = *output_length;
bias = initial_bias;
/* Handle the basic code points: */
for (j = 0; j < input_length; ++j) {
if (basic(input[j])) {
if (max_out - out < 2) return punycode_big_output;
output[out++] =
case_flags ? encode_basic(input[j], case_flags[j]) : input[j];
}
/* else if (input[j] < n) return punycode_bad_input; */
/* (not needed for Punycode with unsigned code points) */
}
h = b = out;
/* h is the number of code points that have been handled, b is the */
/* number of basic code points, and out is the number of characters */
/* that have been output. */
if (b > 0) output[out++] = delimiter;
/* Main encoding loop: */
while (h < input_length) {
/* All non-basic code points < n have been */
/* handled already. Find the next larger one: */
for (m = maxint, j = 0; j < input_length; ++j) {
/* if (basic(input[j])) continue; */
/* (not needed for Punycode) */
if (input[j] >= n && input[j] < m) m = input[j];
}
/* Increase delta enough to advance the decoder's */
/* <n,i> state to <m,0>, but guard against overflow: */
if (m - n > (maxint - delta) / (h + 1)) return punycode_overflow;
delta += (m - n) * (h + 1);
n = m;
for (j = 0; j < input_length; ++j) {
/* Punycode does not need to check whether input[j] is basic: */
if (input[j] < n /* || basic(input[j]) */ ) {
if (++delta == 0) return punycode_overflow;
}
if (input[j] == n) {
/* Represent delta as a generalized variable-length integer: */
for (q = delta, k = base; ; k += base) {
if (out >= max_out) return punycode_big_output;
t = k <= bias /* + tmin */ ? (punycode_uint) tmin : /* +tmin not needed */
k >= (punycode_uint) bias + (punycode_uint) tmax ? (punycode_uint) tmax : k - (punycode_uint) bias;
if (q < t) break;
output[out++] = encode_digit(t + (q - t) % (base - t), 0);
q = (q - t) / (base - t);
}
output[out++] = encode_digit(q, case_flags && case_flags[j]);
bias = adapt(delta, h + 1, h == b);
delta = 0;
++h;
}
}
++delta, ++n;
}
*output_length = out;
return punycode_success;
}
/*** Main decode function ***/
enum punycode_status punycode_decode(
punycode_uint input_length,
const char input[],
punycode_uint *output_length,
punycode_uint output[],
unsigned char case_flags[] )
{
punycode_uint n, out, i, max_out, bias,
b, j, in, oldi, w, k, digit, t;
/* Initialize the state: */
n = initial_n;
out = i = 0;
max_out = *output_length;
bias = initial_bias;
/* Handle the basic code points: Let b be the number of input code */
/* points before the last delimiter, or 0 if there is none, then */
/* copy the first b code points to the output. */
for (b = j = 0; j < input_length; ++j) if (delim(input[j])) b = j;
if (b > max_out) return punycode_big_output;
for (j = 0; j < b; ++j) {
if (case_flags) case_flags[out] = flagged(input[j]);
if (!basic(input[j])) return punycode_bad_input;
output[out++] = input[j];
}
/* Main decoding loop: Start just after the last delimiter if any */
/* basic code points were copied; start at the beginning otherwise. */
for (in = b > 0 ? b + 1 : 0; in < input_length; ++out) {
/* in is the index of the next character to be consumed, and */
/* out is the number of code points in the output array. */
/* Decode a generalized variable-length integer into delta, */
/* which gets added to i. The overflow checking is easier */
/* if we increase i as we go, then subtract off its starting */
/* value at the end to obtain delta. */
for (oldi = i, w = 1, k = base; ; k += base) {
if (in >= input_length) return punycode_bad_input;
digit = decode_digit(input[in++]);
if (digit >= base) return punycode_bad_input;
if (digit > (maxint - i) / w) return punycode_overflow;
i += digit * w;
t = k <= (punycode_uint) bias /* + tmin */ ? (punycode_uint) tmin : /* +tmin not needed */
k >= (punycode_uint) bias + (punycode_uint) tmax ? (punycode_uint) tmax : k - (punycode_uint) bias;
if (digit < t) break;
if (w > maxint / (base - t)) return punycode_overflow;
w *= (base - t);
}
bias = adapt(i - oldi, out + 1, oldi == 0);
/* i was supposed to wrap around from out+1 to 0, */
/* incrementing n each time, so we'll fix that now: */
if (i / (out + 1) > maxint - n) return punycode_overflow;
n += i / (out + 1);
i %= (out + 1);
/* Insert n at position i of the output: */
/* not needed for Punycode: */
/* if (decode_digit(n) <= base) return punycode_invalid_input; */
if (out >= max_out) return punycode_big_output;
if (case_flags) {
memmove(case_flags + i + 1, case_flags + i, out - i);
/* Case of last character determines uppercase flag: */
case_flags[i] = flagged(input[in - 1]);
}
memmove(output + i + 1, output + i, (out - i) * sizeof *output);
output[i++] = n;
}
*output_length = out;
return punycode_success;
}
@@ -0,0 +1,84 @@
/*
punycode.h from RFC 3492
http://www.nicemice.net/idn/
Adam M. Costello
http://www.nicemice.net/amc/
This is ANSI C code (C89) implementing Punycode (RFC 3492).
*/
#include <limits.h>
enum punycode_status {
punycode_success,
punycode_bad_input, /* Input is invalid. */
punycode_big_output, /* Output would exceed the space provided. */
punycode_overflow /* Input needs wider integers to process. */
};
#if UINT_MAX >= (1 << 26) - 1
typedef unsigned int punycode_uint;
#else
typedef unsigned long punycode_uint;
#endif
enum punycode_status punycode_encode(
punycode_uint input_length,
const punycode_uint input[],
const unsigned char case_flags[],
punycode_uint *output_length,
char output[] );
/* punycode_encode() converts Unicode to Punycode. The input */
/* is represented as an array of Unicode code points (not code */
/* units; surrogate pairs are not allowed), and the output */
/* will be represented as an array of ASCII code points. The */
/* output string is *not* null-terminated; it will contain */
/* zeros if and only if the input contains zeros. (Of course */
/* the caller can leave room for a terminator and add one if */
/* needed.) The input_length is the number of code points in */
/* the input. The output_length is an in/out argument: the */
/* caller passes in the maximum number of code points that it */
/* can receive, and on successful return it will contain the */
/* number of code points actually output. The case_flags array */
/* holds input_length boolean values, where nonzero suggests that */
/* the corresponding Unicode character be forced to uppercase */
/* after being decoded (if possible), and zero suggests that */
/* it be forced to lowercase (if possible). ASCII code points */
/* are encoded literally, except that ASCII letters are forced */
/* to uppercase or lowercase according to the corresponding */
/* uppercase flags. If case_flags is a null pointer then ASCII */
/* letters are left as they are, and other code points are */
/* treated as if their uppercase flags were zero. The return */
/* value can be any of the punycode_status values defined above */
/* except punycode_bad_input; if not punycode_success, then */
/* output_size and output might contain garbage. */
enum punycode_status punycode_decode(
punycode_uint input_length,
const char input[],
punycode_uint *output_length,
punycode_uint output[],
unsigned char case_flags[] );
/* punycode_decode() converts Punycode to Unicode. The input is */
/* represented as an array of ASCII code points, and the output */
/* will be represented as an array of Unicode code points. The */
/* input_length is the number of code points in the input. The */
/* output_length is an in/out argument: the caller passes in */
/* the maximum number of code points that it can receive, and */
/* on successful return it will contain the actual number of */
/* code points output. The case_flags array needs room for at */
/* least output_length values, or it can be a null pointer if the */
/* case information is not needed. A nonzero flag suggests that */
/* the corresponding Unicode character be forced to uppercase */
/* by the caller (if possible), while zero suggests that it be */
/* forced to lowercase (if possible). ASCII code points are */
/* output already in the proper case, but their flags will be set */
/* appropriately so that applying the flags would be harmless. */
/* The return value can be any of the punycode_status values */
/* defined above; if not punycode_success, then output_length, */
/* output, and case_flags might contain garbage. On success, the */
/* decoder will never need to write an output_length greater than */
/* input_length, because of how the encoding is defined. */
Oops, something went wrong.

0 comments on commit 0c5d4a1

Please sign in to comment.