mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.encodings: Switch ICU binding to IDNA2008 (fixes #533, #1301)

Browse source
This commit is contained in:
Kim Alvefur 2019-09-11 00:14:59 +02:00
parent b733d61de6
commit bb4cb60fb8
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
util-src/encodings.c
View file

@ -269,6 +269,7 @@ static const luaL_Reg Reg_utf8[] = {
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <unicode/utrace.h> #include <unicode/utrace.h>
#include <unicode/uspoof.h> #include <unicode/uspoof.h>
#include <unicode/uidna.h>
static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile) { static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile) {
size_t input_len; size_t input_len;
@ -323,6 +324,7 @@ UStringPrepProfile *icu_nodeprep;
UStringPrepProfile *icu_resourceprep; UStringPrepProfile *icu_resourceprep;
UStringPrepProfile *icu_saslprep; UStringPrepProfile *icu_saslprep;
USpoofChecker *icu_spoofcheck; USpoofChecker *icu_spoofcheck;
UIDNA *icu_idna2008;
#if (U_ICU_VERSION_MAJOR_NUM < 58) #if (U_ICU_VERSION_MAJOR_NUM < 58)
/* COMPAT */ /* COMPAT */
@ -339,6 +341,7 @@ void init_icu(void) {
icu_saslprep = usprep_openByType(USPREP_RFC4013_SASLPREP, &err); icu_saslprep = usprep_openByType(USPREP_RFC4013_SASLPREP, &err);
icu_spoofcheck = uspoof_open(&err); icu_spoofcheck = uspoof_open(&err);
uspoof_setChecks(icu_spoofcheck, USPOOF_CONFUSABLE, &err); uspoof_setChecks(icu_spoofcheck, USPOOF_CONFUSABLE, &err);
icu_idna2008 = uidna_openUTS46(UIDNA_USE_STD3_RULES, &err);
if(U_FAILURE(err)) { if(U_FAILURE(err)) {
fprintf(stderr, "[c] util.encodings: error: %s\n", u_errorName((UErrorCode)err)); fprintf(stderr, "[c] util.encodings: error: %s\n", u_errorName((UErrorCode)err));
@ -434,9 +437,10 @@ static int Lidna_to_ascii(lua_State *L) { /** idna.to_ascii(s) */
return 1; return 1;
} }
dest_len = uidna_IDNToASCII(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err); UIDNAInfo info = UIDNA_INFO_INITIALIZER;
dest_len = uidna_nameToASCII(icu_idna2008, ustr, ulen, dest, 256, &info, &err);
if(U_FAILURE(err)) { if(U_FAILURE(err) || info.errors) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
@ -468,9 +472,10 @@ static int Lidna_to_unicode(lua_State *L) { /** idna.to_unicode(s) */
return 1; return 1;
} }
dest_len = uidna_IDNToUnicode(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err); UIDNAInfo info = UIDNA_INFO_INITIALIZER;
dest_len = uidna_nameToUnicode(icu_idna2008, ustr, ulen, dest, 1024, &info, &err);
if(U_FAILURE(err)) { if(U_FAILURE(err) || info.errors) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {