This file testing order before saving a file makes more sense

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 13f71eed41822f52b432591392c9acc0d5f8edb4..2bf27bf4dd10a2fe550645d01e8d5d0eaa07ee0e 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,12 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor 2.0
+# Dev-Editor 2.2

 #
 # Dev-Editor's main program
 #
 #
 # Dev-Editor's main program
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-04
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-11-26

 #
 
 use strict;
 #
 
 use strict;


@@ -23,7 +23,7 @@ use Command;
 use Output;
 use Tool;
 
 use Output;
 use Tool;
 

-$VERSION = '2.0';
+$VERSION = '2.2';

 
 # Path to configuration file
 # Change if necessary!
 
 # Path to configuration file
 # Change if necessary!


@@ -35,6 +35,14 @@ use constant CONFIGFILE => 'devedit.dat';
 my $config = read_config(CONFIGFILE);
 error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...
 
 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'});
+

 # Read the most important form data
 
 my $cgi = new CGI;
 # Read the most important form data
 
 my $cgi = new CGI;


@@ -50,7 +58,7 @@ my $newfile = $cgi->param('newfile') || '';
 my $new_physical = '';
 my $new_virtual  = '';
 
 my $new_physical = '';
 my $new_virtual  = '';
 

-if($newfile ne '')
+if($newfile ne '' && $newfile !~ /^\s+$/)

 {
  $curdir  = upper_path($file) if($curdir eq '');
  my $path = clean_path($curdir.$newfile);
 {
  $curdir  = upper_path($file) if($curdir eq '');
  my $path = clean_path($curdir.$newfile);


@@ -64,14 +72,22 @@ if($newfile ne '')
 
  unless(-d clean_path($config->{'fileroot'}."/".$dir))
  {
 
  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))
  {
  }
 
  # ... 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
  }
 
  # Create the physical and the virtual path


@@ -80,7 +96,7 @@ if($newfile ne '')
  $new_virtual .= $file;
 }
 
  $new_virtual .= $file;
 }
 

-# This check has to be performed first, or abs_path() will be confused
+# This check has to be performed first or abs_path() will be confused

 
 if(-e clean_path($config->{'fileroot'}."/".$file))
 {
 
 if(-e clean_path($config->{'fileroot'}."/".$file))
 {


@@ -92,7 +108,7 @@ if(-e clean_path($config->{'fileroot'}."/".$file))
                                   lockfile => $config->{'lock_file'},
                                   timeout  => $config->{'lock_timeout'});
 
                                   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
   $uselist->load;
 
   # Create a hash with data submitted by user


@@ -114,12 +130,12 @@ if(-e clean_path($config->{'fileroot'}."/".$file))
  }
  else
  {
  }
  else
  {

-  abort($config->{'errors'}->{'above_root'});
+  abort($config->{'errors'}->{'above_root'},"/");

  }
 }
 else
 {
  }
 }
 else
 {

- abort($config->{'errors'}->{'not_exist'});
+ abort($config->{'errors'}->{'not_exist'},"/");

 }
 
 #
 }
 
 #