Allow to specify a remote name for an uploaded file

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 54dd3d2e57b990b667f00749c0686b2f98de1ab0..7ad34c0f3bf01f01ee51c7755e702190ce535ff8 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.3.1
+# Dev-Editor 3.0.1

 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-02-14
+# Last modified: 2006-08-24

 #
 
 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.3.1';
+$VERSION = '3.0.1';

 
 # 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
 


@@ -59,7 +58,6 @@ my $new_virtual  = '';
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {

- $curdir  = upper_path($file) if($curdir eq '');

  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...
  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...


@@ -80,7 +78,7 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))
  {
 
  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
  }
 
  # Check if we have enough permissions to create a file


@@ -88,13 +86,20 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  unless(-r $new_physical && -w $new_physical && -x $new_physical)
  {
 
  unless(-r $new_physical && -w $new_physical && -x $new_physical)
  {

-  abort($config->{'errors'}->{'dir_no_create'},'/',{DIR => $new_virtual});
+  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_virtual .= $file;
  }
 
  # Create the physical and the virtual path
 
  $new_physical = File::Spec->canonpath($new_physical.'/'.$file);
  $new_virtual .= $file;

+
+ # Check if accessing this file is forbidden
+
+ 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


@@ -105,35 +110,31 @@ 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 => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});
-  $uselist->load;
-
-  # 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,
-              uselist      => $uselist,
-              cgi          => $cgi,
-              version      => $VERSION,
-              configfile   => CONFIGFILE);
-
-  # Execute the command...
-
-  my $output = exec_command($command,\%data,$config);
-
-  # ... unlock the list with files in use and show the output of the command
-
-  $uselist->unlock or abort($config->{'errors'}->{'unlock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});
-  print $$output;
+  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
  {


@@ -142,7 +143,7 @@ if(-e $temp_path || -l $temp_path)
 }
 else
 {
 }
 else
 {

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

 }
 
 #
 }
 
 #