Skip to content

Commit

Permalink
Support IDNA 2008 with UTS46.
Browse files Browse the repository at this point in the history 
UTS 46 provides a migration path from IDNA 2003 to IDNA 2008.

1. Use the up-to-date Unicode data; new characters were
added and some case-folding/mapping have changed since Unicode 3.2 on which
IDNA 2003 is based.
2. Define a case folding/mapping as is the case with IDNA 2003.
3. Use transitional mechanism for 4 deviant characters : German sharp-S,
Greek final-sigma, ZWJ and ZWNJ. That is, the former two are mapped to
'ss' and regular sigma and the latter two are dropped. All the major
browsers do this at the moment so allowing them does not do any good.
We'll review this later as the consensus builds among browser vendors
and registrars. We can also consider handling them separately. For instance,
ZWJ/ZWNJ can be allowed with ContextJ rules, which requires a minor change
in ICU's UTS 46 implementation.
4. Symbol and punctuations continue to be allowed.

We also do the following:

1. Continue to "violate" STD3 rules about non-LDH (Letter, digits and
hyphens) by allowing non-LDH's. That is no change from the current
implementation.
2. Do not allow unassigned code points any more. With an up-to-date
Unicode data, this does not make much difference. And the chance of
new characters not yet reflected in our Unicode data popping up in
a domain name is extremely low.
3. Continue to use CHECK_BIDI. The Bidi rule in IDNA 2008 is more
permissive than in IDNA 2003.

References:
1. http://unicode.org/reports/tr46/ and references therein
   to IDNA 2003 and 2008 RFCs.
2. What IE 10 does : http://goo.gl/3XBhqw
3. Mozilla bug :  https://bugzilla.mozilla.org/show_bug.cgi?id=479520

BUG=61328
TEST=url_unittests (URLCanonTest.Host), net_unittests (NetUtilTest.IDNToU*),
unittests (X509CertificateModelTest.*)

R=brettw@chromium.org, pkasting@chromium.org, rsleevi@chromium.org, thakis@chromium.org

Review URL: https://codereview.chromium.org/23642003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225878 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jshin@chromium.org committed Sep 29, 2013
1 parent 6d066c9 commit 18f00cd
Show file tree
Hide file tree
Showing 5 changed files with 261 additions and 69 deletions.
26 changes: 3 additions & 23 deletions chrome/common/net/x509_certificate_model.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "base/strings/utf_string_conversions.h"
#include "grit/generated_resources.h"
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"

namespace x509_certificate_model {
Expand All @@ -18,28 +19,7 @@ std::string ProcessIDN(const std::string& input) {
input16.reserve(input.length());
input16.insert(input16.end(), input.begin(), input.end());

string16 output16;
output16.resize(input.length());

UErrorCode status = U_ZERO_ERROR;
int output_chars = uidna_IDNToUnicode(input16.data(), input.length(),
&output16[0], output16.length(),
UIDNA_DEFAULT, NULL, &status);
if (status == U_ZERO_ERROR) {
output16.resize(output_chars);
} else if (status != U_BUFFER_OVERFLOW_ERROR) {
return input;
} else {
output16.resize(output_chars);
output_chars = uidna_IDNToUnicode(input16.data(), input.length(),
&output16[0], output16.length(),
UIDNA_DEFAULT, NULL, &status);
if (status != U_ZERO_ERROR)
return input;
DCHECK_EQ(static_cast<size_t>(output_chars), output16.length());
output16.resize(output_chars); // Just to be safe.
}

string16 output16 = net::IDNToUnicode(input, std::string());
if (input16 == output16)
return input; // Input did not contain any encoded data.

Expand Down Expand Up @@ -89,5 +69,5 @@ std::string ProcessRawBits(const unsigned char* data, size_t data_length) {
}
#endif // USE_NSS

} // x509_certificate_model
} // namespace x509_certificate_model

86 changes: 63 additions & 23 deletions net/base/net_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ bool IsIDNComponentSafe(const base::char16* str,
UErrorCode status = U_ZERO_ERROR;
#ifdef U_WCHAR_IS_UTF16
icu::UnicodeSet dangerous_characters(icu::UnicodeString(
L"[[\\ \u00bc\u00bd\u01c3\u0337\u0338"
L"[[\\ \u00ad\u00bc\u00bd\u01c3\u0337\u0338"
L"\u05c3\u05f4\u06d4\u0702\u115f\u1160][\u2000-\u200b]"
L"[\u2024\u2027\u2028\u2029\u2039\u203a\u2044\u205f]"
L"[\u2154-\u2156][\u2159-\u215b][\u215f\u2215\u23ae"
Expand All @@ -341,7 +341,7 @@ bool IsIDNComponentSafe(const base::char16* str,
0, status);
#else
icu::UnicodeSet dangerous_characters(icu::UnicodeString(
"[[\\u0020\\u00bc\\u00bd\\u01c3\\u0337\\u0338"
"[[\\u0020\\u00ad\\u00bc\\u00bd\\u01c3\\u0337\\u0338"
"\\u05c3\\u05f4\\u06d4\\u0702\\u115f\\u1160][\\u2000-\\u200b]"
"[\\u2024\\u2027\\u2028\\u2029\\u2039\\u203a\\u2044\\u205f]"
"[\\u2154-\\u2156][\\u2159-\\u215b][\\u215f\\u2215\\u23ae"
Expand Down Expand Up @@ -398,6 +398,42 @@ bool IsIDNComponentSafe(const base::char16* str,
return false;
}

// A wrapper to use LazyInstance<>::Leaky with ICU's UIDNA, a C pointer to
// a UTS46/IDNA 2008 handling object opened with uidna_openUTS46().
//
// We use UTS46 with BiDiCheck to migrate from IDNA 2003 to IDNA 2008 with
// the backward compatibility in mind. What it does:
//
// 1. Use the up-to-date Unicode data.
// 2. Define a case folding/mapping with the up-to-date Unicode data as
// in IDNA 2003.
// 3. Use transitional mechanism for 4 deviation characters (sharp-s,
// final sigma, ZWJ and ZWNJ) for now.
// 4. Continue to allow symbols and punctuations.
// 5. Apply new BiDi check rules more permissive than the IDNA 2003 BiDI rules.
// 6. Do not apply STD3 rules
// 7. Do not allow unassigned code points.
//
// It also closely matches what IE 10 does except for the BiDi check (
// http://goo.gl/3XBhqw ).
// See http://http://unicode.org/reports/tr46/ and references therein
// for more details.
struct UIDNAWrapper {
UIDNAWrapper() {
UErrorCode err = U_ZERO_ERROR;
// TODO(jungshik): Change options as different parties (browsers,
// registrars, search engines) converge toward a consensus.
value = uidna_openUTS46(UIDNA_CHECK_BIDI, &err);
if (U_FAILURE(err))
value = NULL;
}

UIDNA* value;
};

static base::LazyInstance<UIDNAWrapper>::Leaky
g_uidna = LAZY_INSTANCE_INITIALIZER;

// Converts one component of a host (between dots) to IDN if safe. The result
// will be APPENDED to the given output string and will be the same as the input
// if it is not IDN or the IDN is unsafe to display. Returns whether any
Expand All @@ -414,29 +450,33 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
static const base::char16 kIdnPrefix[] = {'x', 'n', '-', '-'};
if ((comp_len > arraysize(kIdnPrefix)) &&
!memcmp(comp, kIdnPrefix, arraysize(kIdnPrefix) * sizeof(base::char16))) {
// Repeatedly expand the output string until it's big enough. It looks like
// ICU will return the required size of the buffer, but that's not
// documented, so we'll just grow by 2x. This should be rare and is not on a
// critical path.
UIDNA* uidna = g_uidna.Get().value;
DCHECK(uidna != NULL);
size_t original_length = out->length();
for (int extra_space = 64; ; extra_space *= 2) {
UErrorCode status = U_ZERO_ERROR;
out->resize(out->length() + extra_space);
int output_chars = uidna_IDNToUnicode(comp,
static_cast<int32_t>(comp_len), &(*out)[original_length], extra_space,
UIDNA_DEFAULT, NULL, &status);
if (status == U_ZERO_ERROR) {
// Converted successfully.
out->resize(original_length + output_chars);
if (IsIDNComponentSafe(out->data() + original_length, output_chars,
languages))
return true;
}

if (status != U_BUFFER_OVERFLOW_ERROR)
break;
int output_length = 64;
UIDNAInfo info = UIDNA_INFO_INITIALIZER;
UErrorCode status;
do {
out->resize(original_length + output_length);
status = U_ZERO_ERROR;
// This returns the actual length required. If this is more than 64
// code units, |status| will be U_BUFFER_OVERFLOW_ERROR and we'll try
// the conversion again, but with a sufficiently large buffer.
output_length = uidna_labelToUnicode(
uidna, comp, static_cast<int32_t>(comp_len), &(*out)[original_length],
output_length, &info, &status);
} while ((status == U_BUFFER_OVERFLOW_ERROR && info.errors == 0));

if (U_SUCCESS(status) && info.errors == 0) {
// Converted successfully. Ensure that the converted component
// can be safely displayed to the user.
out->resize(original_length + output_length);
if (IsIDNComponentSafe(out->data() + original_length, output_length,
languages))
return true;
}
// Failed, revert back to original string.

// Something went wrong. Revert to original string.
out->resize(original_length);
}

Expand Down
1 change: 1 addition & 0 deletions url/url.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../third_party/icu/icu.gyp:icudata',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
Expand Down
66 changes: 56 additions & 10 deletions url/url_canon_icu.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <stdlib.h>
#include <string.h>

#include "base/lazy_instance.h"
#include "base/logging.h"
#include "third_party/icu/source/common/unicode/ucnv.h"
#include "third_party/icu/source/common/unicode/ucnv_cb.h"
Expand Down Expand Up @@ -71,6 +72,40 @@ class AppendHandlerInstaller {
const void* old_context_;
};

// A wrapper to use LazyInstance<>::Leaky with ICU's UIDNA, a C pointer to
// a UTS46/IDNA 2008 handling object opened with uidna_openUTS46().
//
// We use UTS46 with BiDiCheck to migrate from IDNA 2003 (with unassigned
// code points allowed) to IDNA 2008 with
// the backward compatibility in mind. What it does:
//
// 1. Use the up-to-date Unicode data.
// 2. Define a case folding/mapping with the up-to-date Unicode data as
// in IDNA 2003.
// 3. Use transitional mechanism for 4 deviation characters (sharp-s,
// final sigma, ZWJ and ZWNJ) for now.
// 4. Continue to allow symbols and punctuations.
// 5. Apply new BiDi check rules more permissive than the IDNA 2003 BiDI rules.
// 6. Do not apply STD3 rules
// 7. Do not allow unassigned code points.
//
// It also closely matches what IE 10 does except for the BiDi check (
// http://goo.gl/3XBhqw ).
// See http://http://unicode.org/reports/tr46/ and references therein
// for more details.
struct UIDNAWrapper {
UIDNAWrapper() {
UErrorCode err = U_ZERO_ERROR;
// TODO(jungshik): Change options as different parties (browsers,
// registrars, search engines) converge toward a consensus.
value = uidna_openUTS46(UIDNA_CHECK_BIDI, &err);
if (U_FAILURE(err))
value = NULL;
}

UIDNA* value;
};

} // namespace

ICUCharsetConverter::ICUCharsetConverter(UConverter* converter)
Expand Down Expand Up @@ -107,6 +142,9 @@ void ICUCharsetConverter::ConvertFromUTF16(const base::char16* input,
} while (true);
}

static base::LazyInstance<UIDNAWrapper>::Leaky
g_uidna = LAZY_INSTANCE_INITIALIZER;

// Converts the Unicode input representing a hostname to ASCII using IDN rules.
// The output must be ASCII, but is represented as wide characters.
//
Expand All @@ -116,25 +154,33 @@ void ICUCharsetConverter::ConvertFromUTF16(const base::char16* input,
// the length of the output will be set to the length of the new host name.
//
// On error, this will return false. The output in this case is undefined.
// TODO(jungshik): use UTF-8/ASCII version of nameToASCII.
// Change the function signature and callers accordingly to avoid unnecessary
// conversions in our code. In addition, consider using icu::IDNA's UTF-8/ASCII
// version with StringByteSink. That way, we can avoid C wrappers and additional
// string conversion.
bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) {
DCHECK(output->length() == 0); // Output buffer is assumed empty.

UIDNA* uidna = g_uidna.Get().value;
DCHECK(uidna != NULL);
while (true) {
// Use ALLOW_UNASSIGNED to be more tolerant of hostnames that violate
// the spec (which do exist). This does not present any risk and is a
// little more future proof.
UErrorCode err = U_ZERO_ERROR;
int num_converted = uidna_IDNToASCII(src, src_len, output->data(),
output->capacity(),
UIDNA_ALLOW_UNASSIGNED, NULL, &err);
if (err == U_ZERO_ERROR) {
output->set_length(num_converted);
UIDNAInfo info = UIDNA_INFO_INITIALIZER;
int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(),
output->capacity(), &info, &err);
if (U_SUCCESS(err) && info.errors == 0) {
output->set_length(output_length);
return true;
}
if (err != U_BUFFER_OVERFLOW_ERROR)

// TODO(jungshik): Look at info.errors to handle them case-by-case basis
// if necessary.
if (err != U_BUFFER_OVERFLOW_ERROR || info.errors != 0)
return false; // Unknown error, give up.

// Not enough room in our buffer, expand.
output->Resize(output->capacity() * 2);
output->Resize(output_length);
}
}

Expand Down
Loading

0 comments on commit 18f00cd

Please sign in to comment.