From 569d31d875837b163d041d651316253e682c100e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 22 Jul 2008 13:29:54 -0400
Subject: [PATCH] permission checking improvements

Break out into function so it can be done up-front before confirmation too.
---
 IkiWiki/Plugin/remove.pm | 61 ++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 9b6655139..d4f1c7d66 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -12,6 +12,38 @@ sub import { #{{{
 
 } # }}}
 
+sub check_canremove ($$$$) {
+	my $page=shift;
+	my $q=shift;
+	my $session=shift;
+	my $attachment=shift;
+
+	# Must be a known source file.
+	if (! exists $pagesources{$page}) {
+		error(sprintf(gettext("%s does not exist"),
+		htmllink("", "", $page, noimageinline => 1)));
+	}
+
+	# 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 (-l "$config{srcdir}/$file" && ! -f _) {
+		error(sprintf(gettext("%s is not a file"), $file));
+	}
+	
+	# Must be editiable.
+	IkiWiki::check_canedit($page, $q, $session);
+
+	# This is sorta overkill, but better safe
+	# than sorry. If a user can't upload an
+	# attachment, don't let them delete it.
+	if ($attachment) {
+		IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+	}
+}
+
 sub formbuilder_setup (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
@@ -53,6 +85,8 @@ sub removal_confirm ($$@) {
 	my $attachment=shift;
 	my @pages=@_;
 
+	check_canremove($_, $q, $session, $attachment) foreach @pages;
+
    	# Save current form state to allow returning to it later
 	# without losing any edits.
 	# (But don't save what button was submitted, to avoid
@@ -124,32 +158,9 @@ sub sessioncgi ($$) { #{{{
 			# 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 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 (-l "$config{srcdir}/$file" && ! -f _) {
-					error(sprintf(gettext("%s is not a file"), $file));
-				}
-				
-				# Must be editiable.
-				IkiWiki::check_canedit($page, $q, $session);
-
-				# This is sorta overkill, but better safe
-				# than sorry. If a user can't upload an
-				# attachment, don't let them delete it.
-				if ($q->param("attachment")) {
-					IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
-				}
+				check_canremove($page, $q, $session, $q->param("attachment"));
 
-				push @files, IkiWiki::possibly_foolish_untaint($file);
+				push @files, IkiWiki::possibly_foolish_untaint($pagesources{$page});
 			}
 
 			# Do removal, and update the wiki.
-- 
2.26.2