Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: cbi.js: fix sfh() hash calculation over multibyte sequences

Browse source 
The C side implementation of the hash operates on bytes while the JS variant
operated on UTF-16 codepoints, leading to miscalculations on input strings
containing multibyte sequences.

Recode the given string to an internal UTF-8 byte representation and
calculate the hash over that.

Fixes client side mapping of translation strings containing non-ASCII
characters.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-11-19 11:47:18 +01:00
parent 1ca5a99a49
commit 2babc47ae2
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
modules/luci-base/htdocs/luci-static/resources/cbi.js
View file

@ -19,34 +19,58 @@ function sfh(s) {
if (s === null || s.length === 0) if (s === null || s.length === 0)
return null; return null;
var hash = (s.length >>> 0), var bytes = [];
len = (s.length >>> 2),
for (var i = 0; i < s.length; i++) {
var ch = s.charCodeAt(i);
if (ch <= 0x7F)
bytes.push(ch);
else if (ch <= 0x7FF)
bytes.push(((ch >>> 6) & 0x1F) | 0xC0,
( ch & 0x3F) | 0x80);
else if (ch <= 0xFFFF)
bytes.push(((ch >>> 12) & 0x0F) | 0xE0,
((ch >>> 6) & 0x3F) | 0x80,
( ch & 0x3F) | 0x80);
else if (code <= 0x10FFFF)
bytes.push(((ch >>> 18) & 0x07) | 0xF0,
((ch >>> 12) & 0x3F) | 0x80,
((ch >> 6) & 0x3F) | 0x80,
( ch & 0x3F) | 0x80);
}
if (!bytes.length)
return null;
var hash = (bytes.length >>> 0),
len = (bytes.length >>> 2),
off = 0, tmp; off = 0, tmp;
while (len--) { while (len--) {
hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0; hash += ((bytes[off + 1] << 8) + bytes[off]) >>> 0;
tmp = ((((s.charCodeAt(off + 3) << 8) + s.charCodeAt(off + 2)) << 11) ^ hash) >>> 0; tmp = ((((bytes[off + 3] << 8) + bytes[off + 2]) << 11) ^ hash) >>> 0;
hash = ((hash << 16) ^ tmp) >>> 0; hash = ((hash << 16) ^ tmp) >>> 0;
hash += hash >>> 11; hash += hash >>> 11;
off += 4; off += 4;
} }
switch ((s.length & 3) >>> 0) { switch ((bytes.length & 3) >>> 0) {
case 3: case 3:
hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0; hash += ((bytes[off + 1] << 8) + bytes[off]) >>> 0;
hash = (hash ^ (hash << 16)) >>> 0; hash = (hash ^ (hash << 16)) >>> 0;
hash = (hash ^ (s.charCodeAt(off + 2) << 18)) >>> 0; hash = (hash ^ (bytes[off + 2] << 18)) >>> 0;
hash += hash >> 11; hash += hash >> 11;
break; break;
case 2: case 2:
hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0; hash += ((bytes[off + 1] << 8) + bytes[off]) >>> 0;
hash = (hash ^ (hash << 11)) >>> 0; hash = (hash ^ (hash << 11)) >>> 0;
hash += hash >>> 17; hash += hash >>> 17;
break; break;
case 1: case 1:
hash += s.charCodeAt(off); hash += bytes[off];
hash = (hash ^ (hash << 10)) >>> 0; hash = (hash ^ (hash << 10)) >>> 0;
hash += hash >>> 1; hash += hash >>> 1;
break; break;