probably redundant symlink check

[ikiwiki.git] / IkiWiki / Plugin / remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index e56a4a99c36d43043ca9608e5a4ac3e5962b0522..7cc1d615e53e65740b395f2b3abe2e8731e59adf 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -116,31 +116,30 @@ sub sessioncgi ($$) { #{{{
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {
                        my @pages=$q->param("page");
-                       my @files = map { $pagesources{$_} } @pages;
        
                        # Validate removal by checking that the page exists,
                        # and that the user is allowed to edit(/remove) it.
                        my @files;
                        foreach my $page (@pages) {
+                               # Must be a known source file.
                                if (! exists $pagesources{$page}) {
                                        error(sprintf(gettext("%s does not exist"),
                                        htmllink("", "", $page, noimageinline => 1)));
                                }
+                               
+                               # Must be editiable.
                                IkiWiki::check_canedit($page, $q, $session);
 
-                               my $file=$pagesources{$_};
+                               # Must exist on disk, and be a regular file.
+                               my $file=$pagesources{$page};
                                if (! -e "$config{srcdir}/$file") {
                                        error(sprintf(gettext("%s is not in the srcdir, so it cannot be deleted"), $file));
                                }
-                               elsif (! -f "$config{srcdir}/$file") {
+                               elsif (-l "$config{srcdir}/$file" && ! -f _) {
                                        error(sprintf(gettext("%s is not a file"), $file));
                                }
 
-                               # This untaint is safe because we've
-                               # verified the file is a known source file,
-                               # and is in the srcdir, and is a regular
-                               # file.
-                               push @files, possibly_foolish_untaint($file);
+                               push @files, IkiWiki::possibly_foolish_untaint($file);
                        }
 
                        # Do removal, and update the wiki.
@@ -161,11 +160,6 @@ sub sessioncgi ($$) { #{{{
                                        IkiWiki::prune("$config{srcdir}/$file");
                                }
                        }
-                       foreach my $file (@files) {
-                               delete $IkiWiki::pagecase{$file};
-                               print STDERR "delete $file\n";
-                               delete $IkiWiki::links{$file};
-                       }
                        IkiWiki::refresh();
                        IkiWiki::saveindex();