X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/94c8a9b0ec83b96ea5f6f23059aeafbc8c5122e1..0577a1ece82df55f43840d9187fd5b150ec25361:/modules/Tool.pm diff --git a/modules/Tool.pm b/modules/Tool.pm index 1bc020d..2b73423 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -6,7 +6,7 @@ package Tool; # Some shared sub routines # # Author: Patrick Canterino -# Last modified: 2004-07-12 +# Last modified: 2004-11-13 # use strict; @@ -30,12 +30,12 @@ use base qw(Exporter); devedit_reload equal_url file_name - query_string + mode_string upper_path); # check_path() # -# Check, if a virtual path is above a virtual root directory +# Check if a virtual path is above a virtual root directory # (currently no check if the path exists - check otherwise!) # # Params: 1. Virtual root directory @@ -56,27 +56,21 @@ sub check_path($$) $path =~ s!^/{1}!!; $path = $root."/".$path; - unless(-d $path) - { - # The path points to a file - # We have to extract the directory name and create the absolute path + # We extract the last part of the path and create the absolute path - my $dir = upper_path($path); - my $file = file_name($path); + my $first = upper_path($path); + my $last = file_name($path); - $dir = abs_path($dir); - $path = $dir."/".$file; - } - else - { - $path = abs_path($path); - } + $first = abs_path($first); + $path = $first."/".$last; - $path = File::Spec->canonpath($path); + $first = File::Spec->canonpath($first); + $path = File::Spec->canonpath($path); # Check if the path is above the root directory - return if(index($path,$root) == -1); + return if(index($path,$root) != 0); + return if($first eq $root && $last =~ m!^(/|\\)?\.\.(/|\\)?$!); # Create short path name @@ -130,14 +124,14 @@ sub devedit_reload($) # SSL encrypted HTTP (HTTPS) $protocol = "https"; - $port = ($ENV{'SERVER_PORT'} == 443) ? "" : ":".$ENV{'SERVER_PORT'}; + $port = ":".$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 443); } else { # Simple HTTP $protocol = "http"; - $port = ($ENV{'SERVER_PORT'} == 80) ? "" : ":".$ENV{'SERVER_PORT'}; + $port = ":".$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 80); } # The following code is grabbed from Template::_query of @@ -145,12 +139,12 @@ sub devedit_reload($) # and modified by Patrick Canterino my $query = '?'.join ('&' => - map { - (ref) - ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}} - : escape ($_).'='.escape ($params -> {$_}) - } keys %$params - ); + map { + (ref) + ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}} + : escape ($_).'='.escape ($params -> {$_}) + } keys %$params + ); # Create the redirection header @@ -202,6 +196,44 @@ sub file_name($) return $path; } +# mode_string() +# +# Convert a file mode number into a human readable string (rwxr-x-r-x) +# (also supports SetUID, SetGID and Sticky Bit) +# +# Params: File mode number +# +# Return: Human readable mode string + +sub mode_string($) +{ + my $mode = shift; + my $string = ""; + + # User + + $string = ($mode & 00400) ? "r" : "-"; + $string .= ($mode & 00200) ? "w" : "-"; + $string .= ($mode & 00100) ? (($mode & 04000) ? "s" : "x") : + ($mode & 04000) ? "S" : "-"; + + # Group + + $string .= ($mode & 00040) ? "r" : "-"; + $string .= ($mode & 00020) ? "w" : "-"; + $string .= ($mode & 00010) ? (($mode & 02000) ? "s" : "x") : + ($mode & 02000) ? "S" : "-"; + + # Other + + $string .= ($mode & 00004) ? "r" : "-"; + $string .= ($mode & 00002) ? "w" : "-"; + $string .= ($mode & 00001) ? (($mode & 01000) ? "t" : "x") : + ($mode & 01000) ? "T" : "-"; + + return $string; +} + # upper_path() # # Cut away the last part of a path