Simplified check_path() a little bit

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 6f38e383eff8b4a79be91ed4fa42fdc9bdc72158..3fd8641090a462d049fd5b0d715968905e49cbe7 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,42 +1,46 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor
+# Dev-Editor 3.0 (CVS)

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

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 10-04-2003
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-04-22

 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 

-use vars qw($VERSION
-            %config);
-
+use vars qw($VERSION);

 use lib 'modules';
 
 use CGI;
 use lib 'modules';
 
 use CGI;

+use Config::DevEdit;
+

 use Command;
 use Command;

-use File::UseList;

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

-$VERSION = '1.0';
+$VERSION = '3.0 (CVS)';
+
+# Path to configuration file
+# Change if necessary!
+
+use constant CONFIGFILE => 'devedit.conf';
+
+# Read the configuration file

 
 

-### Settings ###
+my $config = read_config(CONFIGFILE);
+error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...

 
 

-%config = (
-           fileroot     => 'D:/Server/WWW/dokumente',
-           httproot     => '/',
-           timeformat   => '%d.%m.%Y %H:%M',
-           uselist_file => 'uselist',
-           lock_file    => 'uselist.lock',
-           lock_timeout => '10'
-          );
+# Check if the root directory exists

 
 

-### End Settings ###
+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
 
 
 # Read the most important form data
 


@@ -48,15 +52,14 @@ 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  = '';
 

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

 {
  $curdir  = upper_path($file) if($curdir eq '');
 {
  $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...
 


@@ -65,83 +68,69 @@ if($newfile ne '')
 
  # ... 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("The directory where you want to create this file or directory doesn't exist.");
+  abort($config->{'errors'}->{'dir_not_exist'},'/');

  }
 
  # ... and check if the path is above the root directory
 
  }
 
  # ... and check if the path is above the root directory
 

- unless(($new_physical,$new_virtual) = check_path($config{'fileroot'},$dir))
+ unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))

  {
  {

-  abort("You aren't allowed to create files and directories above the virtual root directory.");
+  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;
 }
 

-# 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
+
+my $temp_path = clean_path($config->{'fileroot'}.'/'.$file);

 
 

-if(-e 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))

  {
  {

-  # Copied from old Dev-Editor (great idea)
-
-  my %dispatch = ('show'         => \&exec_show,
-                  'beginedit'    => \&exec_beginedit,
-                  'canceledit'   => \&exec_unlock,
-                  'endedit'      => \&exec_endedit,
-                  'mkdir'        => \&exec_mkdir,
-                  'mkfile'       => \&exec_mkfile,
-                  'workwithfile' => \&exec_workwithfile,
-                  'copy'         => \&exec_copy,
-                  'rename'       => \&exec_rename,
-                  'remove'       => \&exec_remove,
-                  'unlock'       => \&exec_unlock
-                 );
-
-  # 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("Locking of $config{'uselist_file'} failed. Try it again in a moment. If the problem persists, ask someone to recreate the lock file ($config{'lock_file'}).");
-  $uselist->load;
-
-  # Create a hash with data submitted by user
-  # (the CGI and the File::UseList object will also be included)
+  # 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,
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,

-              uselist      => $uselist,
-              cgi          => $cgi);
+              cgi          => $cgi,
+              version      => $VERSION,
+              configfile   => CONFIGFILE);
+
+  # Execute the command...

 
 

-  unless($dispatch{$command})
-  {
-   $uselist->unlock;
-   abort("Unknown command: $command");
-  }
+  my $output = exec_command($command,\%data,$config);

 
 

-  my $output = &{$dispatch{$command}}(\%data,\%config); # Execute the command...
+  # ... and show its output

 
 

-  $uselist->unlock; # ... unlock the list with used files...
-  print $$output;   # ... and print the output of the command
+  print $$output;

  }
  else
  {
  }
  else
  {

-  abort("Accessing files and directories above the virtual root directory is forbidden.");
+  abort($config->{'errors'}->{'above_root'},'/');

  }
 }
 else
 {
  }
 }
 else
 {

- abort("File/directory does not exist.");
+ abort($config->{'errors'}->{'not_found'},'/');

 }
 
 #
 }
 
 #