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

Disable incomplete impl for long property names, but don't remove it in case we want to finish it someday. This ensures that '&unimplemented' is not recognized as a valid property name in policy files.

This commit is contained in:
Brian Cox 2017-08-19 20:13:07 -07:00
parent 6582fb77fb
commit 97a2d44481
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fs/fsparserutil.cpp
View File

@ -83,6 +83,11 @@ bool cFSParserUtil::MapStringToProperty( const TSTRING& str, int& propIndex ) co
default: fMappedChar = false; break;
}
}
else
fMappedChar = false;
/* Leaving this here in case we ever want to implement long property names
else
{
if( 0 == str.compare( TSS_GetString( cFS, fs::STR_PARSER_PROP_MODE ) ) )
@ -122,6 +127,7 @@ bool cFSParserUtil::MapStringToProperty( const TSTRING& str, int& propIndex ) co
else
fMappedChar = false;
}
*/
return( fMappedChar );
}

7
src/fs/fsstrings.cpp
View File

@ -73,8 +73,9 @@ TSS_BeginStringtable( cFS )
TSS_StringEntry( fs::STR_PROP_SHA, _T("SHA") ),
TSS_StringEntry( fs::STR_PROP_HAVAL, _T("HAVAL") ),
TSS_StringEntry( fs::STR_PROP_ACL, _T("ACL Placeholder -- Not Implemented") ),
// TODO: get actual strings
/* Leaving these here in case we ever implement long property names
TSS_StringEntry( fs::STR_PARSER_PROP_DEV, _T("unimplemented") ),
TSS_StringEntry( fs::STR_PARSER_PROP_RDEV, _T("unimplemented") ),
TSS_StringEntry( fs::STR_PARSER_PROP_INODE, _T("unimplemented") ),
@ -94,7 +95,7 @@ TSS_BeginStringtable( cFS )
TSS_StringEntry( fs::STR_PARSER_PROP_MD5, _T("unimplemented") ),
TSS_StringEntry( fs::STR_PARSER_PROP_SHA, _T("unimplemented") ),
TSS_StringEntry( fs::STR_PARSER_PROP_HAVAL, _T("unimplemented") ),
*/
TSS_StringEntry( fs::STR_PARSER_READONLY, _T("ReadOnly")),
TSS_StringEntry( fs::STR_PARSER_DYNAMIC, _T("Dynamic")),
TSS_StringEntry( fs::STR_PARSER_GROWING, _T("Growing")),

5
src/fs/fsstrings.h
View File

@ -77,7 +77,8 @@ TSS_BeginStringIds( fs )
STR_PROP_SHA,
STR_PROP_HAVAL,
STR_PROP_ACL,
/* Leaving these here in case we ever implement long property names
STR_PARSER_PROP_DEV,
STR_PARSER_PROP_RDEV,
STR_PARSER_PROP_INODE,
@ -97,7 +98,7 @@ TSS_BeginStringIds( fs )
STR_PARSER_PROP_MD5,
STR_PARSER_PROP_SHA,
STR_PARSER_PROP_HAVAL,
*/
STR_PARSER_READONLY,
STR_PARSER_DYNAMIC,
STR_PARSER_GROWING,