DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

[server] add is_valid_file() function, default to lstat() instead of stat(), more %include_folder tests

Browse Source
This commit is contained in:
Michael Rash
2015-12-13 01:39:29 -08:00
parent b305f67ca5
commit d8dc1fcdee
6 changed files with 100 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/utils.c
View File

@@ -83,17 +83,32 @@ hex_dump(const unsigned char *data, const int size)
static int
is_valid_path(const char *path, const int file_type)
{
#if HAVE_STAT
if(strnlen(path, MAX_PATH_LEN) == MAX_PATH_LEN)
{
log_msg(LOG_ERR, "[-] Provided path is too long");
return(0);
}
#if HAVE_STAT || HAVE_LSTAT
struct stat st;
/* If we are unable to stat the given path, then return with error.
*/
#if HAVE_LSTAT /* prefer lstat() to stat() */
if(lstat(path, &st) != 0)
{
log_msg(LOG_ERR, "[-] unable to lstat() path: %s: %s",
path, strerror(errno));
return(0);
}
#else
if(stat(path, &st) != 0)
{
log_msg(LOG_ERR, "[-] unable to stat() path: %s: %s",
path, strerror(errno));
return(0);
}
#endif
if(file_type == IS_DIR)
{
@@ -105,10 +120,15 @@ is_valid_path(const char *path, const int file_type)
if(!S_ISREG(st.st_mode) || ! (st.st_mode & S_IXUSR))
return(0);
}
else if(file_type == IS_FILE)
{
if(!S_ISREG(st.st_mode))
return(0);
}
else
return(0);
#endif /* HAVE_STAT */
#endif /* HAVE_STAT || HAVE_LSTAT */
return(1);
}
@@ -125,6 +145,12 @@ is_valid_exe(const char *path)
return is_valid_path(path, IS_EXE);
}
int
is_valid_file(const char *path)
{
return is_valid_path(path, IS_FILE);
}
int
verify_file_perms_ownership(const char *file)
{