X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/80450094dc12549cd73cb42673c8ab6dd8e83351..4780f42f030a63e97503e82d71ccd5d1c323e550:/modules/Tool.pm?ds=inline diff --git a/modules/Tool.pm b/modules/Tool.pm index 785a02e..23770a1 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -5,8 +5,8 @@ package Tool; # # Some shared sub routines # -# Author: Patrick Canterino -# Last modified: 2004-07-12 +# Author: Patrick Canterino +# Last modified: 2005-02-13 # use strict; @@ -28,13 +28,15 @@ use base qw(Exporter); @EXPORT = qw(check_path clean_path devedit_reload + dos_wildcard_match equal_url file_name + 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 @@ -52,37 +54,36 @@ sub check_path($$) $root = abs_path($root); $root = File::Spec->canonpath($root); - $path =~ s!^/{1}!!; - $path = $root."/".$path; + $path =~ tr!\\!/!; + $path =~ s!^/+!!; + $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); + $first = abs_path($first); - $dir = abs_path($dir); - $path = $dir."/".$file; - } - else + my $last = file_name($path); + $last = '' if($last eq '.'); + + if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!)) { - $path = abs_path($path); + $first = abs_path($first.'/'.$last); + $last = ''; } - $path = File::Spec->canonpath($path); + $path = File::Spec->canonpath($first.'/'.$last); # Check if the path is above the root directory - return if(index($path,$root) == -1); + return if(index($path,$root) != 0); # Create short path name my $short_path = substr($path,length($root)); - $short_path =~ tr!\\!\/!; - $short_path = "/".$short_path if($short_path !~ m!^/!); - $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path); + $short_path =~ tr!\\!/!; + $short_path = '/'.$short_path if($short_path !~ m!^/!); + $short_path = $short_path.'/' if($short_path !~ m!/$! && -d $path && not -l $path); return ($path,$short_path); } @@ -111,53 +112,83 @@ sub clean_path($) # with some other parameters # # Params: Hash Reference (will be merged to a query string) +# (optional) # # Return: HTTP redirection header (Scalar Reference) -sub devedit_reload($) +sub devedit_reload(;$) { my $params = shift; # Detect the protocol (simple HTTP or SSL encrypted HTTP) # and check if the server listens on the default port - my $protocol = ""; - my $port = ""; + my $protocol = ''; + my $port = ''; if(https) { # SSL encrypted HTTP (HTTPS) - $protocol = "https"; - $port = ($ENV{'SERVER_PORT'} == 443) ? "" : ":".$ENV{'SERVER_PORT'}; + $protocol = 'https'; + $port = ':'.$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 443); } else { # Simple HTTP - $protocol = "http"; - $port = ($ENV{'SERVER_PORT'} == 80) ? "" : ":".$ENV{'SERVER_PORT'}; + $protocol = 'http'; + $port = ':'.$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 80); } # The following code is grabbed from Template::_query of # Andre Malo's selfforum (http://sourceforge.net/projects/selfforum/) # and modified by Patrick Canterino - my $query = '?'.join ('&' => + my $query = ''; + + if(ref($params) eq 'HASH') + { + $query = '?'.join ('&' => map { (ref) ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}} : escape ($_).'='.escape ($params -> {$_}) } keys %$params ); + } # Create the redirection header - my $header = redirect($protocol."://".virtual_host.$port.$ENV{'SCRIPT_NAME'}.$query); + my $header = redirect($protocol.'://'.virtual_host.$port.$ENV{'SCRIPT_NAME'}.$query); return \$header; } +# dos_wildcard_match() +# +# Check if a string matches against a DOS-style wildcard +# +# Params: 1. Pattern +# 2. String +# +# Return: Status code (Boolean) + +sub dos_wildcard_match($$) +{ + my ($pattern,$string) = @_; + + # The following part is stolen from File::DosGlob + + # escape regex metachars but not glob chars + $pattern =~ s:([].+^\-\${}[|]):\\$1:g; + # and convert DOS-style wildcards to regex + $pattern =~ s/\*/.*/g; + $pattern =~ s/\?/.?/g; + + return ($string =~ m|^$pattern$|is); +} + # equal_url() # # Create URL equal to a file or directory @@ -172,9 +203,9 @@ sub equal_url($$) my ($root,$path) = @_; my $url; - $root =~ s!/$!!; - $path =~ s!^/!!; - $url = $root."/".$path; + $root =~ s!/+$!!; + $path =~ s!^/+!!; + $url = $root.'/'.$path; return $url; } @@ -192,18 +223,57 @@ sub file_name($) my $path = shift; $path =~ tr!\\!/!; - unless($path eq "/") + unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!i)) { - $path = substr($path,0,-1) if($path =~ m!/$!); - $path = substr($path,rindex($path,"/")+1); + $path =~ s!/+$!!; + $path = substr($path,rindex($path,'/')+1); } 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 +# Remove the last part of a path +# (the resulting path contains a trailing slash) # # Params: Path # @@ -214,10 +284,10 @@ sub upper_path($) my $path = shift; $path =~ tr!\\!/!; - unless($path eq "/") + unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!i)) { - $path = substr($path,0,-1) if($path =~ m!/$!); - $path = substr($path,0,rindex($path,"/")+1); + $path =~ s!/+$!!; + $path = substr($path,0,rindex($path,'/')+1); } return $path;