add virus checking to attachments plugin

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index fea1c11eb4a9c9f7d599c863abbfa13ebfcaa179..0369008878cabae640bb4cb771705ae2e3e6d0dd 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -247,8 +247,6 @@ sub _parse_diff_tree ($@) { #{{{
                last;
        }
 
                last;
        }
 

-       debug("No detail in diff-tree output") if !defined $ci{'details'};
-

        return \%ci;
 } #}}}
 
        return \%ci;
 } #}}}
 


@@ -281,7 +279,8 @@ sub git_sha1 (;$) { #{{{
        my $file = shift || q{--};
 
        # Ignore error since a non-existing file might be given.
        my $file = shift || q{--};
 
        # Ignore error since a non-existing file might be given.

-       my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file);
+       my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD',
+               '--', $file);

        if ($sha1) {
                ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
        } else { debug("Empty sha1sum for '$file'.") }
        if ($sha1) {
                ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
        } else { debug("Empty sha1sum for '$file'.") }


@@ -321,13 +320,6 @@ sub rcs_commit ($$$;$$) { #{{{
                    (length $message ? ": $message" : "");
        }
 
                    (length $message ? ": $message" : "");
        }
 

-       # XXX: Wiki directory is in the unlocked state when starting this
-       # action.  But it takes time for a Git process to finish its job
-       # (especially if a merge required), so we must re-lock to prevent
-       # race conditions.  Only when the time of the real commit action
-       # (i.e. git push) comes, we'll unlock the directory.
-       lockwiki();
-

        # Check to see if the page has been changed by someone else since
        # rcs_prepedit was called.
        my $cur    = git_sha1($file);
        # Check to see if the page has been changed by someone else since
        # rcs_prepedit was called.
        my $cur    = git_sha1($file);


@@ -342,7 +334,6 @@ sub rcs_commit ($$$;$$) { #{{{
        # so we should ignore its exit status (hence run_or_non).
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
        # so we should ignore its exit status (hence run_or_non).
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {

-               unlockwiki();

                if (length $config{gitorigin_branch}) {
                        run_or_cry('git', 'push', $config{gitorigin_branch});
                }
                if (length $config{gitorigin_branch}) {
                        run_or_cry('git', 'push', $config{gitorigin_branch});
                }


@@ -374,7 +365,7 @@ sub rcs_recentchanges ($) { #{{{
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},

-                       time - $ci->{'author_epoch'}
+                       $ci->{'author_epoch'}

                );
 
                my (@pages, @messages);
                );
 
                my (@pages, @messages);


@@ -392,7 +383,10 @@ sub rcs_recentchanges ($) { #{{{
                                diffurl => $diffurl,
                        };
                }
                                diffurl => $diffurl,
                        };
                }

-               push @messages, { line => $_ } foreach @{$ci->{'comment'}};
+
+               push @messages, { line => $_ } foreach grep {
+                       ! m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i
+               }  @{$ci->{'comment'}};

 
                my ($user, $type) = (q{}, "web");
 
 
                my ($user, $type) = (q{}, "web");
 


@@ -421,48 +415,21 @@ sub rcs_recentchanges ($) { #{{{
        return @rets;
 } #}}}
 
        return @rets;
 } #}}}
 

-sub rcs_notify () { #{{{
-       # Send notification mail to subscribed users.
-       #
-       # In usual Git usage, hooks/update script is presumed to send
-       # notification mails (see git-receive-pack(1)).  But we prefer
-       # hooks/post-update to support IkiWiki commits coming from a
-       # cloned repository (through command line) because post-update
-       # is called _after_ each ref in repository is updated (update
-       # hook is called _before_ the repository is updated).  Since
-       # post-update hook does not accept command line arguments, we
-       # don't have an $ENV variable in this function.
-       #
-       # Here, we rely on a simple fact: we can extract all parts of the
-       # notification content by parsing the "HEAD" commit (which also
-       # triggers a refresh of IkiWiki pages).
-
-       my $ci = git_commit_info('HEAD');
-       return if !defined $ci;
-
-       my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
-
-       my ($user, $message);
-       if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
-               $user    = defined $2 ? "$2" : "$3";
-               $message = $4;
+sub rcs_diff ($) { #{{{
+       my $rev=shift;
+       my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
+       my @lines;
+       foreach my $line (run_or_non("git", "show", $sha1)) {
+               if (@lines || $line=~/^diff --git/) {
+                       push @lines, $line."\n";
+               }
+       }
+       if (wantarray) {
+               return @lines;

        }
        else {
        }
        else {

-               $user    = $ci->{'author_username'};
-               $message = join "\n", @{ $ci->{'comment'} };
+               return join("", @lines);

        }
        }

-
-       my $sha1 = $ci->{'sha1'};
-
-       require IkiWiki::UserInfo;
-       send_commit_mails(
-               sub {
-                       $message;
-               },
-               sub {
-                       join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
-               }, $user, @changed_pages
-       );

 } #}}}
 
 sub rcs_getctime ($) { #{{{
 } #}}}
 
 sub rcs_getctime ($) { #{{{