X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/91dc65a53fbe7dc79a983a51f330033b343cba36..28756a17617639eff8ce8d5014d3ec0acdd146d2:/devedit.pl diff --git a/devedit.pl b/devedit.pl index c29c22e..3ec92df 100644 --- a/devedit.pl +++ b/devedit.pl @@ -6,7 +6,7 @@ # Dev-Editor's main program # # Author: Patrick Canterino -# Last modified: 2004-11-04 +# Last modified: 2004-11-26 # use strict; @@ -35,6 +35,10 @@ use constant CONFIGFILE => 'devedit.dat'; my $config = read_config(CONFIGFILE); error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy... +# Check if the root directory exists + +abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'}); + # Check if we are able to access the root directory abort($config->{'errors'}->{'no_root_access'}) unless(-r $config->{'fileroot'} && -x $config->{'fileroot'}); @@ -68,14 +72,22 @@ if($newfile ne '' && $newfile !~ /^\s+$/) unless(-d clean_path($config->{'fileroot'}."/".$dir)) { - abort($config->{'errors'}->{'dir_not_exist'}); + abort($config->{'errors'}->{'dir_not_exist'},"/"); } # ... and check if the path is above the root directory unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir)) { - abort($config->{'errors'}->{'create_ar'}); + abort($config->{'errors'}->{'create_ar'},"/"); + } + + # Check if we have enough permissions to create a file + # in this directory + + unless(-r $new_physical && -w $new_physical && -x $new_physical) + { + abort($config->{'errors'}->{'dir_no_create'},"/",{DIR => $new_virtual}); } # Create the physical and the virtual path @@ -96,7 +108,7 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) lockfile => $config->{'lock_file'}, timeout => $config->{'lock_timeout'}); - $uselist->lock or abort($config->{'errors'}->{'lock_failed'},{USELIST => $config->{'uselist_file'}, LOCK_FILE => $config->{'lock_file'}}); + $uselist->lock or abort($config->{'errors'}->{'lock_failed'},undef,{USELIST => $config->{'uselist_file'}, LOCK_FILE => $config->{'lock_file'}}); $uselist->load; # Create a hash with data submitted by user @@ -118,12 +130,12 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) } else { - abort($config->{'errors'}->{'above_root'}); + abort($config->{'errors'}->{'above_root'},"/"); } } else { - abort($config->{'errors'}->{'not_exist'}); + abort($config->{'errors'}->{'not_exist'},"/"); } #