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: Optional strict flag to stringprep

Browse source
This commit is contained in:
Kim Alvefur 2019-04-24 15:01:00 +02:00
parent b5b9b70c88
commit 41a40ab74b
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
util-src/encodings.c
View file

@ -276,6 +276,7 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
int32_t unprepped_len, prepped_len, output_len; int32_t unprepped_len, prepped_len, output_len;
const char *input; const char *input;
char output[1024]; char output[1024];
int flags = USPREP_ALLOW_UNASSIGNED;
UChar unprepped[1024]; /* Temporary unicode buffer (1024 characters) */ UChar unprepped[1024]; /* Temporary unicode buffer (1024 characters) */
UChar prepped[1024]; UChar prepped[1024];
@ -294,6 +295,11 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
return 1; return 1;
} }
/* strict */
if(lua_toboolean(L, 2)) {
flags = 0;
}
u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err); u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err);
if(U_FAILURE(err)) { if(U_FAILURE(err)) {
@ -301,7 +307,7 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
return 1; return 1;
} }
prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, USPREP_ALLOW_UNASSIGNED, NULL, &err); prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, flags, NULL, &err);
if(U_FAILURE(err)) { if(U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
@ -397,6 +403,7 @@ static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) {
const char *s; const char *s;
char string[1024]; char string[1024];
int ret; int ret;
Stringprep_profile_flags flags = 0;
if(!lua_isstring(L, 1)) { if(!lua_isstring(L, 1)) {
lua_pushnil(L); lua_pushnil(L);
@ -405,13 +412,18 @@ static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) {
s = check_utf8(L, 1, &len); s = check_utf8(L, 1, &len);
/* strict */
if(lua_toboolean(L, 2)) {
flags = STRINGPREP_NO_UNASSIGNED;
}
if(s == NULL || len >= 1024 || len != strlen(s)) { if(s == NULL || len >= 1024 || len != strlen(s)) {
lua_pushnil(L); lua_pushnil(L);
return 1; /* TODO return error message */ return 1; /* TODO return error message */
} }
strcpy(string, s); strcpy(string, s);
ret = stringprep(string, 1024, (Stringprep_profile_flags)0, profile); ret = stringprep(string, 1024, flags, profile);
if(ret == STRINGPREP_OK) { if(ret == STRINGPREP_OK) {
lua_pushstring(L, string); lua_pushstring(L, string);