Merge branch 'master'

[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index a5c42d638a6651ac1796f6db973227a14482b371..cb762e453e9f92c368fed3784c1ad5820455e6f6 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -20,7 +20,7 @@ sub formbuilder_setup (@) { #{{{
        my $form=$params{form};
        my $q=$params{cgi};
 
        my $form=$params{form};
        my $q=$params{cgi};
 

-       if ($form->field("do") eq "edit") {
+       if (defined $form->field("do") && $form->field("do") eq "edit") {

                $form->field(name => 'attachment', type => 'file');
                # These buttons are not put in the usual place, so
                # are not added to the normal formbuilder button list.
                $form->field(name => 'attachment', type => 'file');
                # These buttons are not put in the usual place, so
                # are not added to the normal formbuilder button list.


@@ -47,7 +47,13 @@ sub formbuilder_setup (@) { #{{{
 
                $form->field(name => "allowed_attachments", size => 50,
                        fieldset => "admin",
 
                $form->field(name => "allowed_attachments", size => 50,
                        fieldset => "admin",

-                       comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
+                       comment => "(".
+                               htmllink("", "", 
+                                       "ikiwiki/PageSpec/attachment", 
+                                       noimageinline => 1,
+                                       linktext => "Enhanced PageSpec",
+                               ).")"
+               );

                if (! IkiWiki::is_admin($user_name)) {
                        $form->field(name => "allowed_attachments", type => "hidden");
                }
                if (! IkiWiki::is_admin($user_name)) {
                        $form->field(name => "allowed_attachments", type => "hidden");
                }


@@ -70,7 +76,7 @@ sub formbuilder (@) { #{{{
        my $form=$params{form};
        my $q=$params{cgi};
 
        my $form=$params{form};
        my $q=$params{cgi};
 

-       return if $form->field("do") ne "edit";
+       return if ! defined $form->field("do") || $form->field("do") ne "edit";

 
        my $filename=$q->param('attachment');
        if (defined $filename && length $filename &&
 
        my $filename=$q->param('attachment');
        if (defined $filename && length $filename &&


@@ -298,6 +304,73 @@ sub match_minsize ($$;@) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub match_mimetype ($$;@) { #{{{
+       shift;
+       my $wanted=shift;
+
+       my %params=@_;
+       if (! exists $params{file}) {
+               return IkiWiki::FailReason->new("no file specified");
+       }
+
+       # Use ::magic to get the mime type, the idea is to only trust
+       # data obtained by examining the actual file contents.
+       eval q{use File::MimeInfo::Magic};
+       if ($@) {
+               return IkiWiki::FailReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type");
+       }
+       my $mimetype=File::MimeInfo::Magic::magic($params{file});
+       if (! defined $mimetype) {
+               $mimetype="unknown";
+       }
+
+       my $regexp=IkiWiki::glob2re($wanted);
+       if ($mimetype!~/^$regexp$/i) {
+               return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
+       }
+       else {
+               return IkiWiki::SuccessReason->new("file MIME type is $mimetype");
+       }
+} #}}}
+
+sub match_virusfree ($$;@) { #{{{
+       shift;
+       my $wanted=shift;
+
+       my %params=@_;
+       if (! exists $params{file}) {
+               return IkiWiki::FailReason->new("no file specified");
+       }
+
+       if (! exists $IkiWiki::config{virus_checker} ||
+           ! length $IkiWiki::config{virus_checker}) {
+               return IkiWiki::FailReason->new("no virus_checker configured");
+       }
+
+       # The file needs to be fed into the virus checker on stdin,
+       # because the file is not world-readable, and if clamdscan is
+       # used, clamd would fail to read it.
+       eval q{use IPC::Open2};
+       error($@) if $@;
+       open (IN, "<", $params{file}) || return IkiWiki::FailReason->new("failed to read file");
+       binmode(IN);
+       my $sigpipe=0;
+       $SIG{PIPE} = sub { $sigpipe=1 };
+       my $pid=open2(\*CHECKER_OUT, "<&IN", $IkiWiki::config{virus_checker}); 
+       my $reason=<CHECKER_OUT>;
+       chomp $reason;
+       1 while (<CHECKER_OUT>);
+       close(CHECKER_OUT);
+       waitpid $pid, 0;
+       $SIG{PIPE}="DEFAULT";
+       if ($sigpipe || $?) {
+               return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
+       }
+       else {
+               return IkiWiki::SuccessReason->new("file seems virusfree ($reason)");
+       }
+} #}}}
+

 sub match_ispage ($$;@) { #{{{
        my $filename=shift;
 
 sub match_ispage ($$;@) { #{{{
        my $filename=shift;