- Dev-Editor is now able to forbid accessing a file using the configuration file

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index aa7a3caf61e965a8dc82de2f89c578961296bd59..f6d59c9a58470f54c4c1e56e728f219e8eab37e5 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.1a
+# Dev-Editor 3.0 (CVS)

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

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-11-13
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-06-09

 #
 
 use strict;
 #
 
 use strict;


@@ -17,18 +17,17 @@ use lib 'modules';
 
 use CGI;
 use Config::DevEdit;
 
 use CGI;
 use Config::DevEdit;

-use File::UseList;

 
 use Command;
 use Output;
 use Tool;
 
 
 use Command;
 use Output;
 use Tool;
 

-$VERSION = '2.1a';
+$VERSION = '3.0 (CVS)';

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

-use constant CONFIGFILE => 'devedit.dat';
+use constant CONFIGFILE => 'devedit.conf';

 
 # Read the configuration file
 
 
 # Read the configuration file
 


@@ -37,7 +36,7 @@ error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...
 
 # Check if the root directory exists
 
 
 # Check if the root directory exists
 

-abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'});
+abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'} && not -l $config->{'fileroot'});

 
 # Check if we are able to access the root directory
 
 
 # Check if we are able to access the root directory
 


@@ -53,7 +52,6 @@ my $curdir  = $cgi->param('curdir')  || '';
 my $newfile = $cgi->param('newfile') || '';
 
 # Create physical and virtual path for the new file
 my $newfile = $cgi->param('newfile') || '';
 
 # Create physical and virtual path for the new file

-# This section has to be optimized - ugh!

 
 my $new_physical = '';
 my $new_virtual  = '';
 
 my $new_physical = '';
 my $new_virtual  = '';


@@ -61,7 +59,7 @@ my $new_virtual  = '';
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
  $curdir  = upper_path($file) if($curdir eq '');
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
  $curdir  = upper_path($file) if($curdir eq '');

- my $path = clean_path($curdir.$newfile);
+ my $path = $curdir.'/'.$newfile;

 
  # Extract file and directory name...
 
 
  # Extract file and directory name...
 


@@ -70,64 +68,83 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  # ... check if the directory exists ...
 
 
  # ... check if the directory exists ...
 

- unless(-d clean_path($config->{'fileroot'}."/".$dir))
+ my $temp_path = clean_path($config->{'fileroot'}.'/'.$dir);
+
+ unless(-d $temp_path && not -l $temp_path)

  {
  {

-  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_above_root'},'/');
+ }
+
+ # 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 => encode_html($new_virtual)});

  }
 
  # Create the physical and the virtual path
 
  }
 
  # Create the physical and the virtual path
 

- $new_physical = File::Spec->canonpath($new_physical."/".$file);
+ $new_physical = File::Spec->canonpath($new_physical.'/'.$file);

  $new_virtual .= $file;
  $new_virtual .= $file;

+
+ # Check if the file is denied by configuration
+
+ 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
 
 }
 
 # This check has to be performed first or abs_path() will be confused
 

-if(-e clean_path($config->{'fileroot'}."/".$file))
+my $temp_path = clean_path($config->{'fileroot'}.'/'.$file);
+
+if(-e $temp_path || -l $temp_path)

 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {
 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {

-  # Create a File::UseList object and load the list
-
-  my $uselist = new File::UseList(listfile => $config->{'uselist_file'},
-                                  lockfile => $config->{'lock_file'},
-                                  timeout  => $config->{'lock_timeout'});
-
-  $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
-  # (some other necessary information will also be included)
-
-  my %data = (physical     => $physical,
-              virtual      => $virtual,
-              new_physical => $new_physical,
-              new_virtual  => $new_virtual,
-              uselist      => $uselist,
-              cgi          => $cgi,
-              version      => $VERSION,
-              configfile   => CONFIGFILE);
-
-  my $output = exec_command($command,\%data,$config); # Execute the command...
-
-  $uselist->unlock; # ... unlock the list with files in use...
-  print $$output;   # ... and show the output of the command
+  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
  {
  }
  else
  {

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

  }
 }
 else
 {
  }
 }
 else
 {

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

 }
 
 #
 }
 
 #