urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

factor out check_canattach 

Other plugins will need to use this.
master
Joey Hess 2008-07-21 22:41:31 -04:00
parent 96c529826d
commit f9cbe871ad
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
IkiWiki/Plugin/attachment.pm
View File

@ -11,6 +11,34 @@ sub import { #{{{
hook(type => "formbuilder", id => "attachment", call => \&formbuilder); hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
} # }}} } # }}}
sub check_canattach ($$;$) {
my $session=shift;
my $dest=shift; # where it's going to be put, under the srcdir
my $file=shift; # the path to the attachment currently
# Use a special pagespec to test that the attachment is valid.
my $allowed=1;
foreach my $admin (@{$config{adminuser}}) {
my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
if (defined $allowed_attachments &&
length $allowed_attachments) {
$allowed=pagespec_match($dest,
$allowed_attachments,
file => $file,
user => $session->param("name"),
ip => $ENV{REMOTE_ADDR},
);
last if $allowed;
}
}
if (! $allowed) {
error(gettext("attachment rejected")." ($allowed)");
}
else {
return 1;
}
}
sub checkconfig () { #{{{ sub checkconfig () { #{{{
$config{cgi_disable_uploads}=0; $config{cgi_disable_uploads}=0;
} #}}} } #}}}
@ -113,25 +141,8 @@ sub formbuilder (@) { #{{{
# Check that the user is allowed to edit a page with the # Check that the user is allowed to edit a page with the
# name of the attachment. # name of the attachment.
IkiWiki::check_canedit($filename, $q, $session, 1); IkiWiki::check_canedit($filename, $q, $session, 1);
# And that the attachment itself is acceptable.
# Use a special pagespec to test that the attachment is valid. check_canattach($session, $filename, $tempfile);
my $allowed=1;
foreach my $admin (@{$config{adminuser}}) {
my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
if (defined $allowed_attachments &&
length $allowed_attachments) {
$allowed=pagespec_match($filename,
$allowed_attachments,
file => $tempfile,
user => $session->param("name"),
ip => $ENV{REMOTE_ADDR},
);
last if $allowed;
}
}
if (! $allowed) {
error(gettext("attachment rejected")." ($allowed)");
}
# Needed for fast_file_copy and for rendering below. # Needed for fast_file_copy and for rendering below.
require IkiWiki::Render; require IkiWiki::Render;