]> sipb.mit.edu Git - ikiwiki.git/commitdiff
probably redundant symlink check
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 01:57:58 +0000 (21:57 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 01:57:58 +0000 (21:57 -0400)
IkiWiki/Plugin/remove.pm

index 91f133ab69ee58ad29d2a5f48ba3cdc190a8a546..7cc1d615e53e65740b395f2b3abe2e8731e59adf 100644 (file)
@@ -121,24 +121,24 @@ sub sessioncgi ($$) { #{{{
                        # and that the user is allowed to edit(/remove) it.
                        my @files;
                        foreach my $page (@pages) {
                        # 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)));
                                }
                                if (! exists $pagesources{$page}) {
                                        error(sprintf(gettext("%s does not exist"),
                                        htmllink("", "", $page, noimageinline => 1)));
                                }
+                               
+                               # Must be editiable.
                                IkiWiki::check_canedit($page, $q, $session);
 
                                IkiWiki::check_canedit($page, $q, $session);
 
+                               # 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));
                                }
                                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));
                                }
 
                                        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, IkiWiki::possibly_foolish_untaint($file);
                        }
 
                                push @files, IkiWiki::possibly_foolish_untaint($file);
                        }