michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove .. from paths before comparing to allowed roots

Browse Source
This commit is contained in:
Jamie Cameron
2014-05-14 16:46:18 -07:00
parent 677ab62b55
commit a3b8a39d6d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
file/file-lib.pl
View File

@@ -182,18 +182,21 @@ else {
# Returns 1 if some file can be edited/deleted
sub can_access
{
return &under_root_dir($_[0], \@allowed_roots) &&
($_[0] eq "/" || !&under_root_dir($_[0], \@denied_roots));
local $path = &simplify_path($_[0]);
return &under_root_dir($path, \@allowed_roots) &&
($path eq "/" || !&under_root_dir($path, \@denied_roots));
}
# under_root_dir(file, &roots)
# Returns 1 if some file is under one of the given roots
sub under_root_dir
{
local @f = grep { $_ ne '' } split(/\//, $_[0]);
local $path = &simplify_path($_[0]);
local $roots = $_[1];
local @f = grep { $_ ne '' } split(/\//, $path);
local $r;
DIR: foreach $r (@{$_[1]}) {
return 1 if ($r eq '/' || $_[0] eq '/' || $_[0] eq $r);
DIR: foreach $r (@$roots) {
return 1 if ($r eq '/' || $path eq '/' || $path eq $r);
local @a = grep { $_ ne '' } split(/\//, $r);
local $i;
for($i=0; $i<@a; $i++) {
@@ -209,8 +212,9 @@ return 0;
# directories are included as well.
sub can_list
{
return &under_root_dir_or_parent($_[0], \@allowed_roots) &&
($_[0] eq "/" || !&under_root_dir($_[0], \@denied_roots));
local $path = &simplify_path($_[0]);
return &under_root_dir_or_parent($path, \@allowed_roots) &&
($path eq "/" || !&under_root_dir($path, \@denied_roots));
}
# under_root_dir_or_parent(file, &roots)