Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-enabled anti-svg bomb code before some jerk tries to exploit it. It was used for wide strings. Moved it to std::string deserialisation.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-01-31 12:30:31 +00:00
parent c04693faba
commit e19d2e3c36
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

35
libretroshare/src/serialiser/rstlvbase.cc
View file

@ -547,6 +547,38 @@ bool GetTlvString(void *data, uint32_t size, uint32_t *offset,
in = std::string(strdata, strsize); in = std::string(strdata, strsize);
} }
// Check for string content. We want to avoid possible lol bombs as soon as possible.
static const int number_of_suspiscious_strings = 4 ;
static const std::string err_in = "**** String removed (SVG bomb?) ****" ;
static std::string suspiscious_strings[number_of_suspiscious_strings] = { "<!e", // base ingredient of xml bombs
"<!E",
"PD94bW", // this is the base64 encoding of "<?xml*"
"PHN2Zy" // this is the base64 encoding of "<svg*"
} ;
#ifdef TLV_BASE_DEBUG
std::cerr << "Checking wide string \"" << in << std::endl;
#endif
// Drop any string with "<!" or "<!"...
// TODO: check what happens with partial messages
//
for(int i=0;i<number_of_suspiscious_strings;++i)
if (in.find(suspiscious_strings[i]) != std::string::npos)
{
std::cerr << "**** suspiscious wstring contains \"" << suspiscious_strings[i] << "\" (SVG bomb suspected). " ;
std::cerr << "========== Original string =========" << std::endl;
std::cerr << in << std::endl;
std::cerr << "=============== END ================" << std::endl;
for(uint32_t k=0;k<in.length();++k)
if(k < err_in.length())
in[k] = err_in[k] ; // It's important to keep the same size for in than the size it should have,
else
in[k] = ' '; // otherwise the deserialization of derived items that use it might fail
break ;
}
*offset += tlvsize; /* step along */ *offset += tlvsize; /* step along */
return true; return true;
} }
@ -556,6 +588,7 @@ uint32_t GetTlvStringSize(const std::string &in) {
} }
#ifdef REMOVED_CODE
/* We must use a consistent wchar size for cross platform ness. /* We must use a consistent wchar size for cross platform ness.
* As unix uses 4bytes, and windows 2bytes? we'll go with 4bytes for maximum flexibility * As unix uses 4bytes, and windows 2bytes? we'll go with 4bytes for maximum flexibility
*/ */
@ -692,7 +725,7 @@ bool GetTlvWideString(void *data, uint32_t size, uint32_t *offset,
uint32_t GetTlvWideStringSize(std::wstring &in) { uint32_t GetTlvWideStringSize(std::wstring &in) {
return TLV_HEADER_SIZE + in.size() * RS_WCHAR_SIZE; return TLV_HEADER_SIZE + in.size() * RS_WCHAR_SIZE;
} }
#endif
bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset,
uint16_t type, struct sockaddr_in *out) { uint16_t type, struct sockaddr_in *out) {

2
libretroshare/src/serialiser/rstlvbase.h
View file

@ -274,9 +274,11 @@ bool SetTlvString(void *data, uint32_t size, uint32_t *offset, uint16_t type
bool GetTlvString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::string &in); bool GetTlvString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::string &in);
uint32_t GetTlvStringSize(const std::string &in); uint32_t GetTlvStringSize(const std::string &in);
#ifdef REMOVED_CODE
bool SetTlvWideString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::wstring out); bool SetTlvWideString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::wstring out);
bool GetTlvWideString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::wstring &in); bool GetTlvWideString(void *data, uint32_t size, uint32_t *offset, uint16_t type, std::wstring &in);
uint32_t GetTlvWideStringSize(std::wstring &in); uint32_t GetTlvWideStringSize(std::wstring &in);
#endif
bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *out); bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *out);
bool GetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *in); bool GetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *in);