Punicode support for non-Windows.

GitOrigin-RevId: 6ef7dd1bb163bdf369a7ed10a50d598b50e2def6
This commit is contained in:
levlam 2018-05-18 23:38:11 +03:00
parent 2a3d1494aa
commit 0764948a87
2 changed files with 110 additions and 5 deletions

View File

@ -41,6 +41,89 @@ static bool is_ascii_host(Slice host) {
return true; return true;
} }
#if !TD_WINDOWS
static void punycode(string &result, Slice part) {
vector<uint32> codes;
codes.reserve(utf8_length(part));
uint32 processed = 0;
auto begin = part.ubegin();
auto end = part.uend();
while (begin != end) {
uint32 code;
begin = next_utf8_unsafe(begin, &code);
if (code <= 127u) {
result += to_lower(static_cast<char>(code));
processed++;
}
codes.push_back(code);
}
if (processed > 0) {
result += '-';
}
uint32 n = 127;
uint32 delta = 0;
int bias = -72;
bool is_first = true;
while (processed < codes.size()) {
// choose lowest not processed code
uint32 next_n = 0x110000;
for (auto code : codes) {
if (code > n && code < next_n) {
next_n = code;
}
}
delta += (next_n - n - 1) * (processed + 1);
for (auto code : codes) {
if (code < next_n) {
delta++;
}
if (code == next_n) {
// found next symbol, encode delta
int left = static_cast<int>(delta);
while (true) {
bias += 36;
auto t = clamp(bias, 1, 26);
if (left < t) {
result += static_cast<char>(left + 'a');
break;
}
left -= t;
auto digit = t + left % (36 - t);
result += static_cast<char>(digit < 26 ? digit + 'a' : digit - 26 + '0');
left /= 36 - t;
}
processed++;
// update bias
if (is_first) {
delta /= 700;
is_first = false;
} else {
delta /= 2;
}
delta += delta / processed;
bias = 0;
while (delta > 35 * 13) {
delta /= 35;
bias -= 36;
}
bias -= static_cast<int>(36 * delta / (delta + 38));
delta = 0;
}
}
delta++;
n = next_n;
}
}
#endif
Result<string> idn_to_ascii(CSlice host) { Result<string> idn_to_ascii(CSlice host) {
if (is_ascii_host(host)) { if (is_ascii_host(host)) {
return to_lower(host); return to_lower(host);
@ -49,10 +132,15 @@ Result<string> idn_to_ascii(CSlice host) {
return Status::Error("Host name must be encoded in UTF-8"); return Status::Error("Host name must be encoded in UTF-8");
} }
const int MAX_DNS_NAME_LENGTH = 255;
if (host.size() >= MAX_DNS_NAME_LENGTH * 4) { // upper bound, 4 characters per symbol
return Status::Error("Host name is too long");
}
#if TD_WINDOWS #if TD_WINDOWS
TRY_RESULT(whost, to_wstring(host)); TRY_RESULT(whost, to_wstring(host));
wchar_t punycode[256]; wchar_t punycode[MAX_DNS_NAME_LENGTH + 1];
int result_length = IdnToAscii(IDN_ALLOW_UNASSIGNED, whost.c_str(), whost.size(), punycode, 255); int result_length = IdnToAscii(IDN_ALLOW_UNASSIGNED, whost.c_str(), whost.size(), punycode, MAX_DNS_NAME_LENGTH);
if (result_length == 0) { if (result_length == 0) {
return Status::Error("Host can't be converted to ASCII"); return Status::Error("Host can't be converted to ASCII");
} }
@ -60,8 +148,24 @@ Result<string> idn_to_ascii(CSlice host) {
TRY_RESULT(idn_host, from_wstring(punycode, result_length)); TRY_RESULT(idn_host, from_wstring(punycode, result_length));
return idn_host; return idn_host;
#else #else
// TODO auto parts = full_split(Slice(host), '.');
return Status::Error("Internationalized Domain Names are not supported"); bool is_first = true;
string result;
for (auto part : parts) {
if (!is_first) {
result += '.';
}
if (is_ascii_host(part)) {
result.append(part.data(), part.size());
} else {
// TODO nameprep should be applied first, but punycode is better than nothing.
// It is better to use libidn/ICU here if available
result += "xn--";
punycode(result, part);
}
is_first = false;
}
return result;
#endif #endif
} }

View File

@ -296,7 +296,8 @@ TEST(Misc, idn_to_ascii) {
test_idn_to_ascii_one("wіkіреdіа.org", "xn--wkd-8cdx9d7hbd.org"); test_idn_to_ascii_one("wіkіреdіа.org", "xn--wkd-8cdx9d7hbd.org");
test_idn_to_ascii_one("cnwin2k8中国.avol.com", "xn--cnwin2k8-sd0mx14e.avol.com"); test_idn_to_ascii_one("cnwin2k8中国.avol.com", "xn--cnwin2k8-sd0mx14e.avol.com");
test_idn_to_ascii_one("win-2k12r2-addc.阿伯测阿伯测ad.hai.com", "win-2k12r2-addc.xn--ad-tl3ca3569aba8944eca.hai.com"); test_idn_to_ascii_one("win-2k12r2-addc.阿伯测阿伯测ad.hai.com", "win-2k12r2-addc.xn--ad-tl3ca3569aba8944eca.hai.com");
test_idn_to_ascii_one("✌️.ws", "xn--7bi.ws"); test_idn_to_ascii_one("✌.ws", "xn--7bi.ws");
// test_idn_to_ascii_one("✌️.ws", "xn--7bi.ws"); // needs nameprep to succeed
test_idn_to_ascii_one("", "xn--59h"); test_idn_to_ascii_one("", "xn--59h");
test_idn_to_ascii_one("--рф.рф", "xn-----mmcq.xn--p1ai"); test_idn_to_ascii_one("--рф.рф", "xn-----mmcq.xn--p1ai");
ASSERT_TRUE(idn_to_ascii("\xc0").is_error()); ASSERT_TRUE(idn_to_ascii("\xc0").is_error());