SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: move filename_is_valid() and path_is_safe() to path-util.[ch]

Browse Source
This commit is contained in:
Lennart Poettering
2015-10-27 13:25:55 +01:00
parent 4349cd7c1d
commit bb15fafe9c
13 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/util.c
-41
View File
@@ -1439,26 +1439,6 @@ bool in_initrd(void) {
return saved;
}
bool filename_is_valid(const char *p) {
if (isempty(p))
return false;
if (strchr(p, '/'))
return false;
if (streq(p, "."))
return false;
if (streq(p, ".."))
return false;
if (strlen(p) > FILENAME_MAX)
return false;
return true;
}
bool string_is_safe(const char *p) {
const char *t;
@@ -1476,27 +1456,6 @@ bool string_is_safe(const char *p) {
return true;
}
bool path_is_safe(const char *p) {
if (isempty(p))
return false;
if (streq(p, "..") || startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
return false;
if (strlen(p)+1 > PATH_MAX)
return false;
/* The following two checks are not really dangerous, but hey, they still are confusing */
if (streq(p, ".") || startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
return false;
if (strstr(p, "//"))
return false;
return true;
}
/* hey glibc, APIs with callbacks without a user pointer are so useless */
void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
int (*compar) (const void *, const void *, void *), void *arg) {