X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/8bc393b21655cb67a6c0bb7ef450b94c366e7aff..90f85fa0a6322d4c28787db73a2e90efd3b0718c:/devedit.pl diff --git a/devedit.pl b/devedit.pl index 3eebb27..f7b2818 100644 --- a/devedit.pl +++ b/devedit.pl @@ -1,12 +1,20 @@ #!C:/Programme/Perl/bin/perl.exe -w # -# Dev-Editor 2.3.1 +# Dev-Editor 3.0.1 # # Dev-Editor's main program # # Author: Patrick Canterino -# Last modified: 2005-04-09 +# Last modified: 2006-08-24 +# +# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann +# Copyright (C) 2003-2009 Patrick Canterino +# All Rights Reserved. +# +# This file can be distributed and/or modified under the terms of +# of the Artistic License 1.0 (see also the LICENSE file found at +# the top level of the Dev-Editor distribution). # use strict; @@ -22,7 +30,7 @@ use Command; use Output; use Tool; -$VERSION = '2.3.1'; +$VERSION = '3.0.1'; # Path to configuration file # Change if necessary! @@ -58,7 +66,6 @@ my $new_virtual = ''; if($newfile ne '' && $newfile !~ /^\s+$/) { - $curdir = upper_path($file) if($curdir eq ''); my $path = $curdir.'/'.$newfile; # Extract file and directory name... @@ -87,13 +94,20 @@ if($newfile ne '' && $newfile !~ /^\s+$/) unless(-r $new_physical && -w $new_physical && -x $new_physical) { - abort($config->{'errors'}->{'dir_no_create'},'/',{DIR => $new_virtual}); + abort($config->{'errors'}->{'dir_no_create'},'/',{DIR => encode_html($new_virtual)}); } # Create the physical and the virtual path $new_physical = File::Spec->canonpath($new_physical.'/'.$file); $new_virtual .= $file; + + # Check if accessing this file is forbidden + + if(is_forbidden_file($config->{'forbidden'},$new_virtual)) + { + abort($config->{'errors'}->{'forbidden_file'},'/'); + } } # This check has to be performed first or abs_path() will be confused @@ -104,24 +118,31 @@ if(-e $temp_path || -l $temp_path) { if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file)) { - # Create a hash containing data submitted by the user - # (some other necessary information are also included) - - my %data = (physical => $physical, - virtual => $virtual, - new_physical => $new_physical, - new_virtual => $new_virtual, - cgi => $cgi, - version => $VERSION, - configfile => CONFIGFILE); - - # Execute the command... - - my $output = exec_command($command,\%data,$config); - - # ... and show the output of the command - - print $$output; + if(is_forbidden_file($config->{'forbidden'},$virtual)) + { + abort($config->{'errors'}->{'forbidden_file'},'/'); + } + else + { + # Create a hash containing data submitted by the user + # (some other necessary information are also included) + + my %data = (physical => $physical, + virtual => $virtual, + new_physical => $new_physical, + new_virtual => $new_virtual, + cgi => $cgi, + version => $VERSION, + configfile => CONFIGFILE); + + # Execute the command... + + my $output = exec_command($command,\%data,$config); + + # ... and show its output + + print $$output; + } } else {