X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/9fdc1d205fbe98f5f1f2f474e243e43018c2f30c..f6b35ba3aaa4cb67ac80c6cff80e541996f76e80:/modules/Command.pm?ds=inline diff --git a/modules/Command.pm b/modules/Command.pm index e2a0063..0c2caf0 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2004-03-15 +# Last modified: 2004-10-04 # use strict; @@ -26,6 +26,7 @@ use Output; use Template; my $script = $ENV{'SCRIPT_NAME'}; +my $users = eval("getpwuid(0)") && eval("getgrgid(0)"); my %dispatch = ('show' => \&exec_show, 'beginedit' => \&exec_beginedit, @@ -37,6 +38,7 @@ my %dispatch = ('show' => \&exec_show, 'copy' => \&exec_copy, 'rename' => \&exec_rename, 'remove' => \&exec_remove, + 'chprop' => \&exec_chprop, 'unlock' => \&exec_unlock, 'about' => \&exec_about ); @@ -61,10 +63,16 @@ sub exec_command($$$) { my ($command,$data,$config) = @_; - return error($config->{'err_cmd_unknown'},'/',{COMMAND => $command}) unless($dispatch{$command}); + foreach(keys(%dispatch)) + { + if(lc($_) eq lc($command)) + { + my $output = &{$dispatch{$_}}($data,$config); + return $output; + } + } - my $output = &{$dispatch{$command}}($data,$config); - return $output; + return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command}); } # exec_show() @@ -81,6 +89,7 @@ sub exec_show($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $uselist = $data->{'uselist'}; my $tpl = new Template; @@ -104,7 +113,7 @@ sub exec_show($$) my @stat = stat($physical."/.."); my $udtpl = new Template; - $udtpl->read_file($config->{'tpl_dirlist_up'}); + $udtpl->read_file($config->{'templates'}->{'dirlist_up'}); $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual))); $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9]))); @@ -120,13 +129,15 @@ sub exec_show($$) my $virt_path = encode_entities($virtual.$dir."/"); my $dtpl = new Template; - $dtpl->read_file($config->{'tpl_dirlist_dir'}); + $dtpl->read_file($config->{'templates'}->{'dirlist_dir'}); $dtpl->fillin("DIR",$virt_path); $dtpl->fillin("DIR_NAME",$dir); $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9]))); $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path)); + $dtpl->parse_if_block("users",$users && -o $physical."/".$dir); + $dirlist .= $dtpl->get_template; } @@ -138,10 +149,10 @@ sub exec_show($$) my $virt_path = encode_entities($virtual.$file); my @stat = stat($phys_path); - my $in_use = $data->{'uselist'}->in_use($virtual.$file); + my $in_use = $uselist->in_use($virtual.$file); my $ftpl = new Template; - $ftpl->read_file($config->{'tpl_dirlist_file'}); + $ftpl->read_file($config->{'templates'}->{'dirlist_file'}); $ftpl->fillin("FILE",$virt_path); $ftpl->fillin("FILE_NAME",$file); @@ -153,16 +164,21 @@ sub exec_show($$) $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); - $ftpl->parse_if_block("editable",-w $phys_path && -r $phys_path && -T $phys_path && not $in_use); + $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("in_use",$in_use); $ftpl->parse_if_block("unused",not $in_use); + $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}); + + $ftpl->parse_if_block("users",$users && -o $phys_path); + $dirlist .= $ftpl->get_template; } - $tpl->read_file($config->{'tpl_dirlist'}); + $tpl->read_file($config->{'templates'}->{'dirlist'}); $tpl->fillin("DIRLIST",$dirlist); $tpl->fillin("DIR",$virtual); @@ -173,7 +189,7 @@ sub exec_show($$) { # View a file - return error($config->{'err_noview'},upper_path($virtual)) unless(-r $physical); + return error($config->{'errors'}->{'noview'},upper_path($virtual)) unless(-r $physical); # Check on binary files # We have to do it in this way, or empty files @@ -183,22 +199,33 @@ sub exec_show($$) { # Binary file - return error($config->{'err_binary'},upper_path($virtual)); + return error($config->{'errors'}->{'binary'},upper_path($virtual)); } else { # Text file - my $content = file_read($physical); - $$content =~ s/\015\012|\012|\015/\n/g; + my $size = (stat($physical))[7]; - $tpl->read_file($config->{'tpl_viewfile'}); + if($config->{'max_file_size'} && $size > $config->{'max_file_size'}) + { + return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}}) + } + else + { + my $content = file_read($physical); + $$content =~ s/\015\012|\012|\015/\n/g; - $tpl->fillin("FILE",$virtual); - $tpl->fillin("DIR",upper_path($virtual)); - $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); - $tpl->fillin("SCRIPT",$script); - $tpl->fillin("CONTENT",encode_entities($$content)); + $tpl->read_file($config->{'templates'}->{'viewfile'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + $tpl->fillin("CONTENT",encode_entities($$content)); + + $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual)); + } } } @@ -224,9 +251,9 @@ sub exec_beginedit($$) my $virtual = $data->{'virtual'}; my $uselist = $data->{'uselist'}; - return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical); - return error($config->{'err_in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual)); - return error($config->{'err_noedit'},upper_path($virtual)) unless(-r $physical && -w $physical); + return error($config->{'errors'}->{'editdir'},upper_path($virtual)) if(-d $physical); + return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual)); + return error($config->{'errors'}->{'noedit'},upper_path($virtual)) unless(-r $physical && -w $physical); # Check on binary files @@ -234,31 +261,38 @@ sub exec_beginedit($$) { # Binary file - return error($config->{'err_binary'},upper_path($virtual)); + return error($config->{'errors'}->{'binary'},upper_path($virtual)); } else { - # Text file + if($config->{'max_file_size'} && (stat($physical))[7] > $config->{'max_file_size'}) + { + return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}}) + } + else + { + # Text file - $uselist->add_file($virtual); - $uselist->save; + $uselist->add_file($virtual); + $uselist->save; - my $content = file_read($physical); - $$content =~ s/\015\012|\012|\015/\n/g; + my $content = file_read($physical); + $$content =~ s/\015\012|\012|\015/\n/g; - my $tpl = new Template; - $tpl->read_file($config->{'tpl_editfile'}); + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'editfile'}); - $tpl->fillin("FILE",$virtual); - $tpl->fillin("DIR",upper_path($virtual)); - $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); - $tpl->fillin("SCRIPT",$script); - $tpl->fillin("CONTENT",encode_entities($$content)); + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + $tpl->fillin("CONTENT",encode_entities($$content)); - my $output = header(-type => "text/html"); - $output .= $tpl->get_template; + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - return \$output; + return \$output; + } } } @@ -308,7 +342,7 @@ sub exec_endedit($$) $content = encode_entities($content,"\200-\377"); } - if($data->{'cgi'}->param('saveas')) + if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '') { # Create the new filename @@ -317,11 +351,11 @@ sub exec_endedit($$) # Check if someone else is editing the new file - return error($config->{'err_in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual)); + return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual)); } - return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical); - return error($config->{'err_noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical); + return error($config->{'errors'}->{'editdir'},upper_path($virtual)) if(-d $physical); + return error($config->{'errors'}->{'noedit'}, upper_path($virtual)) if(-e $physical && !(-r $physical && -w $physical)); if(file_save($physical,\$content)) { @@ -336,7 +370,7 @@ sub exec_endedit($$) } else { - return error($config->{'err_edit_failed'},upper_path($virtual),{FILE => $virtual}); + return error($config->{'errors'}->{'edit_failed'},upper_path($virtual),{FILE => $virtual}); } } @@ -357,10 +391,26 @@ sub exec_mkfile($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); + if($new_physical) + { + return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); + + file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'mkfile'}); + + $tpl->fillin("DIR","/"); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - file_create($new_physical) or return error($config->{'err_mkfile_failed'},$dir,{FILE => $new_virtual}); - return devedit_reload({command => 'show', file => $dir}); + return \$output; + } } # exec_mkdir() @@ -380,10 +430,26 @@ sub exec_mkdir($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); + return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); + + if($new_physical) + { + mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'mkdir'}); + + $tpl->fillin("DIR","/"); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - mkdir($new_physical,0777) or return error($config->{'err_mkdir_failed'},$dir,{DIR => $new_virtual}); - return devedit_reload({command => 'show', file => $dir}); + return \$output; + } } # exec_upload() @@ -410,23 +476,21 @@ sub exec_upload($$) my $file_phys = $physical."/".$filename; my $file_virt = $virtual."".$filename; - return error($config->{'err_file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys); + return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite')); my $ascii = $cgi->param('ascii'); my $handle = $cgi->upload('uploaded_file'); local *FILE; - open(FILE,">$file_phys") or return error($config->{'err_mkfile_failed'},$virtual,{FILE => $file_virt}); + open(FILE,">$file_phys") or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt}); binmode(FILE) unless($ascii); - my $data; + # Read transferred file and write it to disk - while(read($handle,$data,1024)) - { - $data =~ s/\015\012|\012|\015/\n/g if($ascii); - print FILE $data; - } + read($handle, my $data, -s $handle); + $data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode + print FILE $data; close(FILE); @@ -435,7 +499,7 @@ sub exec_upload($$) else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_upload'}); + $tpl->read_file($config->{'templates'}->{'upload'}); $tpl->fillin("DIR",$virtual); $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); @@ -464,7 +528,8 @@ sub exec_copy($$) my $virtual = encode_entities($data->{'virtual'}); my $new_physical = $data->{'new_physical'}; - return error($config->{'err_nocopy'}) unless(-r $physical); + return error($config->{'errors'}->{'dircopy'}) if(-d $physical); + return error($config->{'errors'}->{'nocopy'}) unless(-r $physical); if($new_physical) { @@ -474,16 +539,16 @@ sub exec_copy($$) if(-e $new_physical) { - return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); if(-d $new_physical) { - return error($config->{'err_dircopy'}); + return error($config->{'errors'}->{'dir_replace'},$dir); } elsif(not $data->{'cgi'}->param('confirmed')) { my $tpl = new Template; - $tpl->read_file($config->{'tpl_confirm_replace'}); + $tpl->read_file($config->{'templates'}->{'confirm_replace'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("NEW_FILE",$new_virtual); @@ -502,13 +567,13 @@ sub exec_copy($$) } } - copy($physical,$new_physical) or return error($config->{'err_copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); + copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); return devedit_reload({command => 'show', file => $dir}); } else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_copyfile'}); + $tpl->read_file($config->{'templates'}->{'copyfile'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("DIR",upper_path($virtual)); @@ -538,7 +603,8 @@ sub exec_rename($$) my $virtual = $data->{'virtual'}; my $new_physical = $data->{'new_physical'}; - return error($config->{'err_in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); + return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/"); + return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); if($new_physical) { @@ -548,16 +614,16 @@ sub exec_rename($$) if(-e $new_physical) { - return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); if(-d $new_physical) { - return error($config->{'err_dircopy'}); + return error($config->{'errors'}->{'dir_replace'},$dir); } elsif(not $data->{'cgi'}->param('confirmed')) { my $tpl = new Template; - $tpl->read_file($config->{'tpl_confirm_replace'}); + $tpl->read_file($config->{'templates'}->{'confirm_replace'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("NEW_FILE",$new_virtual); @@ -576,13 +642,13 @@ sub exec_rename($$) } } - rename($physical,$new_physical) or return error($config->{'err_rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); + rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); return devedit_reload({command => 'show', file => $dir}); } else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_renamefile'}); + $tpl->read_file($config->{'templates'}->{'renamefile'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("DIR",upper_path($virtual)); @@ -611,6 +677,8 @@ sub exec_remove($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/"); + if(-d $physical) { # Remove a directory @@ -623,7 +691,7 @@ sub exec_remove($$) else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_confirm_rmdir'}); + $tpl->read_file($config->{'templates'}->{'confirm_rmdir'}); $tpl->fillin("DIR",$virtual); $tpl->fillin("UPPER_DIR",upper_path($virtual)); @@ -640,17 +708,17 @@ sub exec_remove($$) { # Remove a file - return error($config->{'err_in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); + return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); if($data->{'cgi'}->param('confirmed')) { - unlink($physical) or return error($config->{'err_delete_failed'},upper_path($virtual),{FILE => $virtual}); + unlink($physical) or return error($config->{'errors'}->{'delete_failed'},upper_path($virtual),{FILE => $virtual}); return devedit_reload({command => 'show', file => upper_path($virtual)}); } else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_confirm_rmfile'}); + $tpl->read_file($config->{'templates'}->{'confirm_rmfile'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("DIR",upper_path($virtual)); @@ -665,6 +733,83 @@ sub exec_remove($$) } } +# exec_chprop() +# +# Change the mode and the group of a file or a directory +# +# Params: 1. Reference to user input hash +# 2. Reference to config hash +# +# Return: Output of the command (Scalar Reference) + +sub exec_chprop($$) +{ + my ($data,$config) = @_; + my $physical = $data->{'physical'}; + my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); + my $cgi = $data->{'cgi'}; + my $mode = $cgi->param('mode'); + my $group = $cgi->param('group'); + + if($users) + { + if(-o $physical) + { + if($mode || $group) + { + if($mode) + { + my $oct_mode = $mode; + $oct_mode = "0".$oct_mode if(length($oct_mode) == 3); + $oct_mode = oct($oct_mode); + + chmod($oct_mode,$physical); + } + + chgrp($group,$physical) if($group); + + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my @stat = stat($physical); + + my $mode = $stat[2]; + my $mode_oct = substr(sprintf("%04o",$mode),-4); + my $gid = $stat[5]; + my $group = getgrgid($gid); + + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'chprop'}); + + $tpl->fillin("MODE_OCTAL",$mode_oct); + $tpl->fillin("MODE_STRING",mode_string($mode)); + $tpl->fillin("GID",$gid); + $tpl->fillin("GROUP",$group); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } + } + else + { + return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual}); + } + } + else + { + return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual}); + } +} + # exec_unlock() # # Remove a file from the list of used files and @@ -688,7 +833,7 @@ sub exec_unlock($$) else { my $tpl = new Template; - $tpl->read_file($config->{'tpl_confirm_unlock'}); + $tpl->read_file($config->{'templates'}->{'confirm_unlock'}); $tpl->fillin("FILE",$virtual); $tpl->fillin("DIR",upper_path($virtual)); @@ -716,7 +861,7 @@ sub exec_about($$) my ($data,$config) = @_; my $tpl = new Template; - $tpl->read_file($config->{'tpl_about'}); + $tpl->read_file($config->{'templates'}->{'about'}); $tpl->fillin("SCRIPT",$script); @@ -748,7 +893,7 @@ sub exec_about($$) # Check if the functions getpwuid() and getgrgid() are available - if(eval("getpwuid(0)") && eval("getgrgid(0)")) + if($users) { # Dev-Editor is running on a system which allows users and groups # So we display the user and the group of our process