util.xml: Do not allow doctypes, comments or processing instructions
Yes. This is as bad as it sounds. CVE pending.
In Prosody itself, this only affects mod_websocket, which uses util.xml
to parse the <open/> frame, thus allowing unauthenticated remote DoS
using Billion Laughs. However, third-party modules using util.xml may
also be affected by this.
This commit installs handlers which disallow the use of doctype
declarations and processing instructions without any escape hatch. It,
by default, also introduces such a handler for comments, however, there
is a way to enable comments nontheless.
This is because util.xml is used to parse human-facing data, where
comments are generally a desirable feature, and also because comments
are generally harmless.
/*
* This project is MIT licensed. Please see the
* COPYING file in the source package for more information.
*
* Copyright (C) 2016 Kim Alvefur
*/
#include <lua.h>
#include <lauxlib.h>
#if (LUA_VERSION_NUM == 501)
#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
#endif
/* TODO Deduplicate code somehow */
int strop_and(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] & str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
int strop_or(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] | str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
int strop_xor(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] ^ str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
LUA_API int luaopen_util_strbitop(lua_State *L) {
luaL_Reg exports[] = {
{ "sand", strop_and },
{ "sor", strop_or },
{ "sxor", strop_xor },
{ NULL, NULL }
};
lua_newtable(L);
luaL_setfuncs(L, exports, 0);
return 1;
}