colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly handle rule w/ leading whitespace within a quoted path. Uncomment test case that validates correct behavior.

This commit is contained in:
Brian Cox 2017-03-19 23:09:05 -07:00
parent a2e82147eb
commit 5275975d86
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fs/fsparserutil.cpp
View File

@ -131,6 +131,11 @@ void cFSParserUtil::AddSubTypeProps( cFCOPropVector& v ) const
v.AddItemAndGrow( cFSPropSet::PROP_FILETYPE ); v.AddItemAndGrow( cFSPropSet::PROP_FILETYPE );
} }
static inline void trim_leading_whitespace(std::string &str)
{
str.erase(str.begin(), std::find_if(str.begin(), str.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
}
void cFSParserUtil::InterpretFCOName( const std::list<TSTRING>& l, cFCOName& nameOut ) const void cFSParserUtil::InterpretFCOName( const std::list<TSTRING>& l, cFCOName& nameOut ) const
{ {
TSTRING strT; TSTRING strT;
@ -141,6 +146,12 @@ void cFSParserUtil::InterpretFCOName( const std::list<TSTRING>& l, cFCOName& nam
strT = cDevicePath::AsPosix(strT); strT = cDevicePath::AsPosix(strT);
#endif #endif
//Trim any remaining whitespace before actual path, for cases like " /foo",
// otherwise it'll be flagged as a relative path.
//Don't trim trailing whitespace, since that could potentially be a valid path.
if(strT[0] != '/')
trim_leading_whitespace(strT);
// let cFCOName handle interpretation // let cFCOName handle interpretation
nameOut = strT; nameOut = strT;
} }

2
src/parser/testfiles/polhard.txt
View File

@ -18,7 +18,7 @@ FOO = ping;
# test quoted strings # test quoted strings
"/qfoo" -> +p ; "/qfoo" -> +p ;
"/Program Files" -> +p ; "/Program Files" -> +p ;
#" /lots o' spaces " -> +p ; " /lots o' spaces " -> +p ;
#" colon: semicolon; quote' " -> +p ; #" colon: semicolon; quote' " -> +p ;
# test attributes # test attributes