- Check if we have enough permissions to write in directory at the following

  points:
  - Before executing a command which creates a new file
  - Before uploading a file
  - Before removing or moving/renaming a file or directory
- oct() does not care about leading zeros, the resulting value is always the
  same.
- The name of the variable which will be replaced by a directory to go back to
  in error.htm was renamed from "{DIR}" to "{BACK}". "{DIR}" caused some
  problems.
- Changed the names of some error messages:
  nocopy -> no_copy
  noedit -> no_edit
  noview -> no_view

diff --git a/devedit.pl b/devedit.pl
index aa7a3caf61e965a8dc82de2f89c578961296bd59..3ec92dfb17df1fd48f385a294187958e3139894a 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -6,7 +6,7 @@
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-11-13
+# Last modified: 2004-11-26

 #
 
 use strict;
 #
 
 use strict;


@@ -82,6 +82,14 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
   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
 
  $new_physical = File::Spec->canonpath($new_physical."/".$file);
  # Create the physical and the virtual path
 
  $new_physical = File::Spec->canonpath($new_physical."/".$file);

diff --git a/errors.dat b/errors.dat
index b09148f6e2d89e799f719c19f011aa56f30e7545..995e5f8ce97ee0991ad44f697a4c4cd4ae90f50b 100644 (file)
--- a/errors.dat
+++ b/errors.dat
@@ -7,6 +7,7 @@ copy_failed    = Could not copy '{FILE}' to '{NEW_FILE}'.
 create_ar      = You aren't allowed to create files and directories above the virtual root directory.
 delete_failed  = Could not delete file '{FILE}'.
 dircopy        = This editor is not able to copy directories.
 create_ar      = You aren't allowed to create files and directories above the virtual root directory.
 delete_failed  = Could not delete file '{FILE}'.
 dircopy        = This editor is not able to copy directories.

+dir_no_create  = You have not enough permissions to create a file in the directory '{DIRECTORY}'.

 dir_not_exist  = The directory where you want to create this file or directory doesn't exist.
 dir_read_fail  = Reading of directory '{DIR}' failed.
 dir_replace    = You are not allowed to replace a directory.
 dir_not_exist  = The directory where you want to create this file or directory doesn't exist.
 dir_read_fail  = Reading of directory '{DIR}' failed.
 dir_replace    = You are not allowed to replace a directory.


@@ -21,14 +22,16 @@ invalid_group  = '{GROUP}' seems to be an invalid group name. Please check it an
 lock_failed    = Locking of '{USELIST}' failed. Try it again in a moment. If the problem persists, ask someone to recreate the lock file ('{LOCK_FILE}').
 mkdir_failed   = Could not create directory '{DIR}'.
 mkfile_failed  = Could not create file '{FILE}'.
 lock_failed    = Locking of '{USELIST}' failed. Try it again in a moment. If the problem persists, ask someone to recreate the lock file ('{LOCK_FILE}').
 mkdir_failed   = Could not create directory '{DIR}'.
 mkfile_failed  = Could not create file '{FILE}'.

-noedit         = You have not enough permissions to edit this file.
-nocopy         = You have not enough permissions to copy this file.
-noview         = You have not enough permissions to view this file.
+no_copy        = You have not enough permissions to copy this file.
+no_delete      = You have not enough permissions to delete this file.

 no_dir_access  = You have not enough permissions to access this directory.
 no_directory   = '{FILE}' is not a directory.
 no_dir_access  = You have not enough permissions to access this directory.
 no_directory   = '{FILE}' is not a directory.

+no_edit        = You have not enough permissions to edit this file.
+no_rename      = You have not enough permissions to move/rename this file.

 no_root_access = You have not enough permissions to access the root directory.
 no_root_dir    = The root directory does not exist or is not a directory.
 no_users       = It seems that your system doesn't support users and groups.
 no_root_access = You have not enough permissions to access the root directory.
 no_root_dir    = The root directory does not exist or is not a directory.
 no_users       = It seems that your system doesn't support users and groups.

+no_view        = You have not enough permissions to view this file.

 not_exist      = File/directory does not exist.
 not_owner      = You are not the owner of '{FILE}', so you are not allowed to change the mode and the group.
 remove_root    = You are not allowed to remove the root directory.
 not_exist      = File/directory does not exist.
 not_owner      = You are not the owner of '{FILE}', so you are not allowed to change the mode and the group.
 remove_root    = You are not allowed to remove the root directory.

diff --git a/modules/Command.pm b/modules/Command.pm
index f2b1a04f4b9031c038129b674f2580ccb1d65d1c..83739f04d475d48c64982b4fb3f3ab43e720182e 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-11-25
+# Last modified: 2004-11-26

 #
 
 use strict;
 #
 
 use strict;


@@ -106,6 +106,8 @@ sub exec_show($$)
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 

+  my $dir_writeable = -w $physical;
+

   my $dirlist = "";
 
   # Create the link to the upper directory
   my $dirlist = "";
 
   # Create the link to the upper directory


@@ -156,6 +158,7 @@ sub exec_show($$)
 
    my @stat      = stat($phys_path);
    my $in_use    = $uselist->in_use($virtual.$file);
 
    my @stat      = stat($phys_path);
    my $in_use    = $uselist->in_use($virtual.$file);

+   my $too_large = $config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'};

 
    my $ftpl = new Template;
    $ftpl->read_file($config->{'templates'}->{'dirlist_file'});
 
    my $ftpl = new Template;
    $ftpl->read_file($config->{'templates'}->{'dirlist_file'});


@@ -170,8 +173,8 @@ sub exec_show($$)
    $ftpl->parse_if_block("binary",-B $phys_path);
    $ftpl->parse_if_block("readonly",not -w $phys_path);
 
    $ftpl->parse_if_block("binary",-B $phys_path);
    $ftpl->parse_if_block("readonly",not -w $phys_path);
 

-   $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}));
-   $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}) && not $in_use);
+   $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not $too_large);
+   $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not $too_large && not $in_use);

 
    $ftpl->parse_if_block("in_use",$in_use);
    $ftpl->parse_if_block("unused",not $in_use);
 
    $ftpl->parse_if_block("in_use",$in_use);
    $ftpl->parse_if_block("unused",not $in_use);


@@ -189,12 +192,14 @@ sub exec_show($$)
   $tpl->fillin("DIR",$virtual);
   $tpl->fillin("SCRIPT",$script);
   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
   $tpl->fillin("DIR",$virtual);
   $tpl->fillin("SCRIPT",$script);
   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));

+
+  $tpl->parse_if_block("dir_writeable",$dir_writeable);

  }
  else
  {
   # View a file
 
  }
  else
  {
   # View a file
 

-  return error($config->{'errors'}->{'noview'},$upper_path) unless(-r $physical);
+  return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);

 
   # Check on binary files
   # We have to do it in this way, or empty files
 
   # Check on binary files
   # We have to do it in this way, or empty files


@@ -258,7 +263,7 @@ sub exec_beginedit($$)
 
  return error($config->{'errors'}->{'editdir'},$dir)                    if(-d $physical);
  return error($config->{'errors'}->{'in_use'}, $dir,{FILE => $virtual}) if($uselist->in_use($virtual));
 
  return error($config->{'errors'}->{'editdir'},$dir)                    if(-d $physical);
  return error($config->{'errors'}->{'in_use'}, $dir,{FILE => $virtual}) if($uselist->in_use($virtual));

- return error($config->{'errors'}->{'noedit'}, $dir)                    unless(-r $physical && -w $physical);
+ return error($config->{'errors'}->{'no_edit'},$dir)                    unless(-r $physical && -w $physical);

 
  # Check on binary files
 
 
  # Check on binary files
 


@@ -370,7 +375,7 @@ sub exec_endedit($$)
 
  return error($config->{'errors'}->{'text_to_binary'},$dir) unless(-T $physical);
  return error($config->{'errors'}->{'editdir'},$dir)        if(-d $physical);
 
  return error($config->{'errors'}->{'text_to_binary'},$dir) unless(-T $physical);
  return error($config->{'errors'}->{'editdir'},$dir)        if(-d $physical);

- return error($config->{'errors'}->{'noedit'}, $dir)        if(-e $physical && !(-r $physical && -w $physical));
+ return error($config->{'errors'}->{'no_edit'},$dir)        if(-e $physical && !(-r $physical && -w $physical));

 
  if(file_save($physical,\$content))
  {
 
  if(file_save($physical,\$content))
  {


@@ -479,6 +484,7 @@ sub exec_upload($$)
  my $cgi            = $data->{'cgi'};
 
  return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical);
  my $cgi            = $data->{'cgi'};
 
  return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical);

+ return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => $virtual});

 
  if(my $uploaded_file = $cgi->param('uploaded_file'))
  {
 
  if(my $uploaded_file = $cgi->param('uploaded_file'))
  {


@@ -541,7 +547,7 @@ sub exec_copy($$)
  my $new_physical   = $data->{'new_physical'};
 
  return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);
  my $new_physical   = $data->{'new_physical'};
 
  return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);

- return error($config->{'errors'}->{'nocopy'},upper_path($virtual))  unless(-r $physical);
+ return error($config->{'errors'}->{'no_copy'},upper_path($virtual)) unless(-r $physical);

 
  if($new_physical)
  {
 
  if($new_physical)
  {


@@ -616,6 +622,7 @@ sub exec_rename($$)
  my $new_physical   = $data->{'new_physical'};
 
  return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
  my $new_physical   = $data->{'new_physical'};
 
  return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");

+ return error($config->{'errors'}->{'no_rename'},upper_path($virtual)) unless(-w upper_path($physical));

  return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
 
  if($new_physical)
  return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
 
  if($new_physical)


@@ -689,7 +696,8 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 

- return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'remove_root'},"/")                if($virtual eq "/");
+ return error($config->{'errors'}->{'no_delete'},upper_path($virtual)) unless(-w upper_path($physical));

 
  if(-d $physical)
  {
 
  if(-d $physical)
  {


@@ -778,11 +786,7 @@ sub exec_chprop($$)
     {
      # Change the mode
 
     {
      # Change the mode
 

-     my $oct_mode = $mode;
-     $oct_mode    = "0".$oct_mode if(length($oct_mode) == 3);
-     $oct_mode    = oct($oct_mode);
-
-     chmod($oct_mode,$physical);
+     chmod(oct($mode),$physical);

     }
 
     if($group)
     }
 
     if($group)

diff --git a/modules/Output.pm b/modules/Output.pm
index 5fd22bf55bb6991b21f18d168742899b91d8cb22..9ab86978ff81223610e6939f294b3cc56df43700 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -6,7 +6,7 @@ package Output;
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-11-13
+# Last modified: 2004-11-26

 #
 
 use strict;
 #
 
 use strict;


@@ -59,7 +59,7 @@ sub error($;$$)
  $tpl->read_file($tpl_error);
 
  $tpl->fillin("ERROR",$message);
  $tpl->read_file($tpl_error);
 
  $tpl->fillin("ERROR",$message);

- $tpl->fillin("DIR",$path);
+ $tpl->fillin("BACK",$path);

  $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'}));
 
  $tpl->parse_if_block("dir",defined $path);
  $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'}));
 
  $tpl->parse_if_block("dir",defined $path);

diff --git a/templates/chprop.htm b/templates/chprop.htm
index 4a9fc3face4476a33039b0952a128ac1642cb615..e5ed8f5e6fd4f9ca293a5f7a587ec125d9113673 100644 (file)
--- a/templates/chprop.htm
+++ b/templates/chprop.htm
@@ -43,7 +43,7 @@
 
 <ul>
 <li><b>Change mode:</b><br>
 
 <ul>
 <li><b>Change mode:</b><br>

-Use an <b>octal</b> number to change the mode of the file. You may use the three or four number form. For this, SetUID, SetGID and Sticky Bit are also supported.</li>
+Use an <b>octal</b> number to change the mode of the file. SetUID, SetGID and Sticky Bit are also supported.</li>

 <li><b>Change group:</b><br>
 Enter the group name or the group ID the file should be assigned to. If a group name is also a numeric group ID, the value is used as a group name.</li>
 </ul>
 <li><b>Change group:</b><br>
 Enter the group name or the group ID the file should be assigned to. If a group name is also a numeric group ID, the value is used as a group name.</li>
 </ul>

diff --git a/templates/dirlist_dir.htm b/templates/dirlist_dir.htm
index 6a1a740afa2e2e813c521a113f2e1fb1ec61f5a0..cfac797724595725e22218ead8ac98cca35afd28 100644 (file)
--- a/templates/dirlist_dir.htm
+++ b/templates/dirlist_dir.htm
@@ -2,5 +2,5 @@
 <td align="right" style="white-space:nowrap">[SUBDIR]</td>
 <td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{IF readable}<a href="{SCRIPT}?command=show&amp;file={DIR}">{DIR_NAME}/</a>{ELSE}<span style="color:#C0C0C0" title="Not accessible">{DIR_NAME}/</span>{ENDIF}</td>
 <td align="right" style="white-space:nowrap">[SUBDIR]</td>
 <td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{IF readable}<a href="{SCRIPT}?command=show&amp;file={DIR}">{DIR_NAME}/</a>{ELSE}<span style="color:#C0C0C0" title="Not accessible">{DIR_NAME}/</span>{ENDIF}</td>

-<td style="padding-left:15pt;white-space:nowrap;">(<a href="{SCRIPT}?command=rename&amp;file={DIR}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={DIR}">Delete</a> |{IF users} <a href="{SCRIPT}?command=chprop&amp;file={DIR}">Chmod/Chgrp</a> |{ENDIF} <a href="{URL}" target="_blank">View in Browser</a>)</td>
+<td style="padding-left:15pt;white-space:nowrap;">({IF dir_writeable}<a href="{SCRIPT}?command=rename&amp;file={DIR}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={DIR}">Delete</a> | {ENDIF}{IF users}<a href="{SCRIPT}?command=chprop&amp;file={DIR}">Chmod/Chgrp</a> | {ENDIF}<a href="{URL}" target="_blank">View in Browser</a>)</td>

 </tr>
 </tr>

diff --git a/templates/dirlist_file.htm b/templates/dirlist_file.htm
index 1de43cafd7dd67349a659f704d3ae6888451339f..720ae170496c9cb1026f67c1ee67520b3cc0cbe5 100644 (file)
--- a/templates/dirlist_file.htm
+++ b/templates/dirlist_file.htm
@@ -2,5 +2,5 @@
 <td align="right" style="white-space:nowrap">{SIZE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{FILE_NAME}</td>
 <td align="right" style="white-space:nowrap">{SIZE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
 <td style="padding-left:15pt;white-space:nowrap;">{FILE_NAME}</td>

-<td style="padding-left:15pt;white-space:nowrap;">({IF viewable}<a href="{SCRIPT}?command=show&amp;file={FILE}">View</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{ENDIF}{ENDIF}">View</span>{ENDIF} | {IF editable}<a href="{SCRIPT}?command=beginedit&amp;file={FILE}">Edit</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF readonly}Read only{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{IF in_use}In use{ENDIF}{ENDIF}{ENDIF}{ENDIF}">Edit</span>{ENDIF} | <a href="{SCRIPT}?command=copy&amp;file={FILE}">Copy</a>{IF unused} | <a href="{SCRIPT}?command=rename&amp;file={FILE}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={FILE}">Delete</a>{ENDIF}{IF in_use} | <a href="{SCRIPT}?command=unlock&amp;file={FILE}">Unlock</a>{ENDIF} |{IF users} <a href="{SCRIPT}?command=chprop&amp;file={FILE}">Chmod/Chgrp</a> |{ENDIF} <a href="{URL}" target="_blank">View in Browser</a>)</td>
+<td style="padding-left:15pt;white-space:nowrap;">({IF viewable}<a href="{SCRIPT}?command=show&amp;file={FILE}">View</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{ENDIF}{ENDIF}">View</span>{ENDIF} | {IF editable}<a href="{SCRIPT}?command=beginedit&amp;file={FILE}">Edit</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF readonly}Read only{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{IF in_use}In use{ENDIF}{ENDIF}{ENDIF}{ENDIF}">Edit</span>{ENDIF} | <a href="{SCRIPT}?command=copy&amp;file={FILE}">Copy</a>{IF unused}{IF dir_writeable} | <a href="{SCRIPT}?command=rename&amp;file={FILE}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={FILE}">Delete</a>{ENDIF}{ENDIF}{IF in_use} | <a href="{SCRIPT}?command=unlock&amp;file={FILE}">Unlock</a>{ENDIF} |{IF users} <a href="{SCRIPT}?command=chprop&amp;file={FILE}">Chmod/Chgrp</a> |{ENDIF} <a href="{URL}" target="_blank">View in Browser</a>)</td>

 </tr>
 </tr>

diff --git a/templates/error.htm b/templates/error.htm
index 56989040c6bf49e5226137df56c7b5e826885acf..17abf7f01abd61828bb70e501a6b98d32a74f901 100644 (file)
--- a/templates/error.htm
+++ b/templates/error.htm
@@ -12,6 +12,6 @@
 
 <p>{ERROR}</p>{IF dir}
 
 
 <p>{ERROR}</p>{IF dir}
 

-<p><a href="{SCRIPT}?command=show&amp;file={DIR}">Back to {DIR}</a></p>{ENDIF}
+<p><a href="{SCRIPT}?command=show&amp;file={BACK}">Back to {BACK}</a></p>{ENDIF}

 </body>
 </html>
\ No newline at end of file
 </body>
 </html>
\ No newline at end of file