]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/attachment.pm
add mimetype checking
[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm
index 15c9a8c483a44f92e34f6952ef59d0ebd922fa4b..5d918c43f0551baeb28c4b6b6b03035567e9ea73 100644 (file)
@@ -15,50 +15,31 @@ sub checkconfig () { #{{{
        $config{cgi_disable_uploads}=0;
 } #}}}
 
-sub attachment_location ($) {
-       my $page=shift;
-       
-       # Put the attachment in a subdir of the page it's attached
-       # to, unless that page is an "index" page.
-       $page=~s/(^|\/)index//;
-       $page.="/" if length $page;
-       
-       return $page;
-}
-
-sub attachment_list ($) {
-       my $page=shift;
-       my $loc=attachment_location($page);
-
-       my @ret;
-       foreach my $f (values %pagesources) {
-               if (! defined IkiWiki::pagetype($f) &&
-                   $f=~m/^\Q$loc\E[^\/]+$/ &&
-                   -e "$config{srcdir}/$f") {
-                       push @ret, {
-                               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'">',
-                               link => htmllink($page, $page, $f, noimageinline => 1),
-                               size => humansize((stat(_))[7]),
-                               mtime => displaytime($IkiWiki::pagemtime{$f}),
-                       };
-               }
-       }
-
-       return @ret;
-}
-
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
        my $form=$params{form};
+       my $q=$params{cgi};
 
        if ($form->field("do") eq "edit") {
                $form->field(name => 'attachment', type => 'file');
-               $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
-
                # These buttons are not put in the usual place, so
-               # is not added to the normal formbuilder button list.
+               # are not added to the normal formbuilder button list.
                $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
                $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
+
+               # Add the javascript from the toggle plugin;
+               # the attachments interface uses it to toggle visibility.
+               require IkiWiki::Plugin::toggle;
+               $form->tmpl_param("javascript" => $IkiWiki::Plugin::toggle::javascript);
+               # Start with the attachments interface toggled invisible,
+               # but if it was used, keep it open.
+               if ($form->submitted ne "Upload Attachment" &&
+                   ! length $q->param("attachment_select")) {
+                       $form->tmpl_param("attachments-class" => "toggleable");
+               }
+               else {
+                       $form->tmpl_param("attachments-class" => "toggleable-open");
+               }
        }
        elsif ($form->title eq "preferences") {
                my $session=$params{session};
@@ -91,14 +72,10 @@ sub formbuilder (@) { #{{{
 
        return if $form->field("do") ne "edit";
 
-       if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") {
+       my $filename=$q->param('attachment');
+       if (defined $filename && length $filename &&
+            ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
                my $session=$params{session};
-
-               my $filename=$q->param('attachment');
-               if (! defined $filename || ! length $filename) {
-                       # no file, so do nothing
-                       return;
-               }
                
                # This is an (apparently undocumented) way to get the name
                # of the temp file that CGI writes the upload to.
@@ -124,7 +101,10 @@ sub formbuilder (@) { #{{{
                            length $allowed_attachments) {
                                $allowed=pagespec_match($filename,
                                        $allowed_attachments,
-                                       file => $tempfile);
+                                       file => $tempfile,
+                                       user => $session->param("name"),
+                                       ip => $ENV{REMOTE_ADDR},
+                               );
                                last if $allowed;
                        }
                }
@@ -139,7 +119,11 @@ sub formbuilder (@) { #{{{
                # Try to use a fast rename; fall back to copying.
                IkiWiki::prep_writefile($filename, $config{srcdir});
                unlink($config{srcdir}."/".$filename);
-               if (! rename($tempfile, $config{srcdir}."/".$filename)) {
+               if (rename($tempfile, $config{srcdir}."/".$filename)) {
+                       # The temp file has tight permissions; loosen up.
+                       chmod(0666 & ~umask, $config{srcdir}."/".$filename);
+               }
+               else {
                        my $fh=$q->upload('attachment');
                        if (! defined $fh || ! ref $fh) {
                                error("failed to get filehandle");
@@ -170,10 +154,49 @@ sub formbuilder (@) { #{{{
                }
                $form->field(name => 'editcontent',
                        value => $form->field('editcontent')."\n\n".$add,
-                       force => 1);
+                       force => 1) if length $add;
        }
+       
+       # Generate the attachment list only after having added any new
+       # attachments.
+       $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 } # }}}
 
+sub attachment_location ($) {
+       my $page=shift;
+       
+       # Put the attachment in a subdir of the page it's attached
+       # to, unless that page is an "index" page.
+       $page=~s/(^|\/)index//;
+       $page.="/" if length $page;
+       
+       return $page;
+}
+
+sub attachment_list ($) {
+       my $page=shift;
+       my $loc=attachment_location($page);
+
+       my @ret;
+       foreach my $f (values %pagesources) {
+               if (! defined IkiWiki::pagetype($f) &&
+                   $f=~m/^\Q$loc\E[^\/]+$/ &&
+                   -e "$config{srcdir}/$f") {
+                       push @ret, {
+                               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
+                               link => htmllink($page, $page, $f, noimageinline => 1),
+                               size => humansize((stat(_))[7]),
+                               mtime => displaytime($IkiWiki::pagemtime{$f}),
+                               mtime_raw => $IkiWiki::pagemtime{$f},
+                       };
+               }
+       }
+
+       # Sort newer attachments to the top of the list, so a newly-added
+       # attachment appears just before the form used to add it.
+       return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
+}
+
 my %units=(            # size in bytes
        B               => 1,
        byte            => 1,
@@ -215,7 +238,7 @@ sub parsesize ($) { #{{{
        my $base=$size+0; # force to number
        use warnings;
        foreach my $unit (sort keys %units) {
-               if ($size=~/\Q$unit\E/i) {
+               if ($size=~/[0-9\s]\Q$unit\E$/i) {
                        return $base * $units{$unit};
                }
        }
@@ -227,7 +250,7 @@ sub humansize ($) { #{{{
 
        foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) {
                if ($size / $units{$unit} > 0.25) {
-                       return (int($size / $units{$unit} * 10)/10)."$unit";
+                       return (int($size / $units{$unit} * 10)/10).$unit;
                }
        }
        return $size; # near zero, or negative
@@ -248,7 +271,7 @@ sub match_maxsize ($$;@) { #{{{
        }
 
        if (-s $params{file} > $maxsize) {
-               return IkiWiki::FailReason->new("file too large");
+               return IkiWiki::FailReason->new("file too large (".(-s $params{file})." >  $maxsize)");
        }
        else {
                return IkiWiki::SuccessReason->new("file not too large");
@@ -275,6 +298,39 @@ 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";
+       }
+
+       # turn glob into a safe regexp
+       my $regexp=quotemeta($wanted);
+       $regexp=~s/\\\*/.*/g;
+       $regexp=~s/\\\?/./g;
+
+       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_ispage ($$;@) { #{{{
        my $filename=shift;
 
@@ -286,4 +342,38 @@ sub match_ispage ($$;@) { #{{{
        }
 } #}}}
 
+sub match_user ($$;@) { #{{{
+       shift;
+       my $user=shift;
+       my %params=@_;
+       
+       if (! exists $params{user}) {
+               return IkiWiki::FailReason->new("no user specified");
+       }
+
+       if (defined $params{user} && lc $params{user} eq lc $user) {
+               return IkiWiki::SuccessReason->new("user is $user");
+       }
+       else {
+               return IkiWiki::FailReason->new("user is $params{user}, not $user");
+       }
+} #}}}
+
+sub match_ip ($$;@) { #{{{
+       shift;
+       my $ip=shift;
+       my %params=@_;
+       
+       if (! exists $params{ip}) {
+               return IkiWiki::FailReason->new("no IP specified");
+       }
+
+       if (defined $params{ip} && lc $params{ip} eq lc $ip) {
+               return IkiWiki::SuccessReason->new("IP is $ip");
+       }
+       else {
+               return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
+       }
+} #}}}
+
 1