summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-08-30 17:58:00 -0400
committerJoey Hess <joey@kitenet.net>2010-08-30 17:58:00 -0400
commit8030ecac02a743e930e480650e8c14413f26d9a2 (patch)
tree2071069ca012fd65906fc0696d64ecb467cf8061
parent2b2d777321267af82c5230df35d5c40b65bd8424 (diff)
Receive: avoid hiding check_canedit error messages
Avoid the generic "you are not allowed to change" message, and instead allow check_canedit to propigate out useful error messages. Went back to calling check_canedit in fatal mode, but added a parameter to avoid calling the troublesome subs that might cause a login attempt.
-rw-r--r--IkiWiki.pm4
-rw-r--r--IkiWiki/Receive.pm8
2 files changed, 6 insertions, 6 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6da281999..d114c9a69 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1455,11 +1455,12 @@ sub filter ($$$) {
return $content;
}
-sub check_canedit ($$$;$) {
+sub check_canedit ($$$;$$) {
my $page=shift;
my $q=shift;
my $session=shift;
my $nonfatal=shift;
+ my $nosubs=shift;
my $canedit;
run_hooks(canedit => sub {
@@ -1470,6 +1471,7 @@ sub check_canedit ($$$;$) {
$canedit=1;
}
elsif (ref $ret eq 'CODE') {
+ error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal;
$ret->() unless $nonfatal;
$canedit=0;
}
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index cd746c95f..3a5f91758 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -95,12 +95,12 @@ sub test () {
if ($change->{action} eq 'change' ||
$change->{action} eq 'add') {
if (defined $page) {
- next if IkiWiki::check_canedit($page, $cgi, $session, 1);
+ IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
}
else {
if (IkiWiki::Plugin::attachment->can("check_canattach")) {
IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
- next if IkiWiki::check_canedit($file, $cgi, $session, 1);
+ IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
}
}
}
@@ -116,14 +116,12 @@ sub test () {
if (IkiWiki::Plugin::remove->can("check_canremove")) {
IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
- next if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1);
+ IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
}
}
else {
error "unknown action ".$change->{action};
}
-
- error sprintf(gettext("you are not allowed to change %s"), $file);
}
exit 0;