X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/4e40e9a450e412da79b7c3ef4a1eaae268b206a4..8f2b742c0f1e1d94ceafd58c5e25c7570a650458:/devedit.pl?ds=sidebyside

diff --git a/devedit.pl b/devedit.pl
index cf4ea19..65b9321 100644
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,20 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
-# Dev-Editor 2.0
+# Dev-Editor 3.1
 #
 # Dev-Editor's main program
 #
-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-10-04
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2011-02-11
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2011 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 2.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).
 #
 
 use strict;
@@ -17,43 +25,55 @@ use lib 'modules';
 
 use CGI;
 use Config::DevEdit;
-use File::UseList;
 
 use Command;
 use Output;
 use Tool;
 
-$VERSION = '2.0';
+$VERSION = '3.2-dev';
 
 # Path to configuration file
 # Change if necessary!
 
-use constant CONFIGFILE => 'devedit.dat';
+use constant CONFIGFILE => 'devedit.conf';
 
 # Read the configuration file
 
 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'} && not -l $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;
 
 my $command = $cgi->param('command') || 'show';
-my $file    = $cgi->param('file')    || '/';
+my $file    = $cgi->param('file')    || $config->{'startdir'} || '/';
 my $curdir  = $cgi->param('curdir')  || '';
 my $newfile = $cgi->param('newfile') || '';
 
+# Check if the command is disabled
+
+if(is_disabled_command($config->{'disable_commands'},$command))
+{
+ abort($config->{'errors'}->{'command_disabled'},'/',{COMMAND => encode_html($command)});
+}
+
 # Create physical and virtual path for the new file
-# This section has to be optimized - ugh!
 
 my $new_physical = '';
 my $new_virtual  = '';
 
 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...
 
@@ -62,64 +82,83 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  # ... 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))
  {
-  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
 
- $new_physical = File::Spec->canonpath($new_physical."/".$file);
+ $new_physical = File::Spec->canonpath($new_physical.'/'.$file);
  $new_virtual .= $file;
-}
 
-# This check has to be performed first, or abs_path() will be confused
+ # Check if accessing this file is forbidden
 
-if(-e clean_path($config->{'fileroot'}."/".$file))
-{
- if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
+ if(is_forbidden_file($config->{'forbidden'},$new_virtual))
  {
-  # 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'},{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)
+  abort($config->{'errors'}->{'forbidden_file'},'/');
+ }
+}
 
-  my %data = (physical     => $physical,
-              virtual      => $virtual,
-              new_physical => $new_physical,
-              new_virtual  => $new_virtual,
-              uselist      => $uselist,
-              cgi          => $cgi,
-              version      => $VERSION,
-              configfile   => CONFIGFILE);
+# This check has to be performed first or abs_path() will be confused
 
-  my $output = exec_command($command,\%data,$config); # Execute the command...
+my $temp_path = clean_path($config->{'fileroot'}.'/'.$file);
 
-  $uselist->unlock; # ... unlock the list with files in use...
-  print $$output;   # ... and show the output of the command
+if(-e $temp_path || -l $temp_path)
+{
+ if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
+ {
+  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
  {
-  abort($config->{'errors'}->{'above_root'});
+  abort($config->{'errors'}->{'above_root'},'/');
  }
 }
 else
 {
- abort($config->{'errors'}->{'not_exist'});
+ abort($config->{'errors'}->{'not_found'},'/');
 }
 
 #