cherry-pick uri security fix

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

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 61f49cc1b1665f5f071ba22bf3b1b57cf5d79a2b..ecc561bde86691489ab726eec677741f7fb6691f 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -3,18 +3,16 @@
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

-use POSIX qw(setlocale LC_CTYPE);

 
 package IkiWiki;
 
 
 package IkiWiki;
 

-my $tla_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
-

 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
        close STDOUT;
        open (STDOUT, ">/dev/null");
        my $ret=system(@_);
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
        close STDOUT;
        open (STDOUT, ">/dev/null");
        my $ret=system(@_);

+       close STDOUT;

        open (STDOUT, ">&SAVEOUT");
        close SAVEOUT;
        return $ret;
        open (STDOUT, ">&SAVEOUT");
        close SAVEOUT;
        return $ret;


@@ -39,10 +37,19 @@ sub rcs_prepedit ($) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub rcs_commit ($$$) { #{{{
+sub rcs_commit ($$$;$$) { #{{{

        my $file=shift;
        my $message=shift;
        my $rcstoken=shift;
        my $file=shift;
        my $message=shift;
        my $rcstoken=shift;

+       my $user=shift;
+       my $ipaddr=shift;
+
+       if (defined $user) {
+               $message="web commit by $user".(length $message ? ": $message" : "");
+       }
+       elsif (defined $ipaddr) {
+               $message="web commit from $ipaddr".(length $message ? ": $message" : "");
+       }

 
        if (-d "$config{srcdir}/{arch}") {
                # Check to see if the page has been changed by someone
 
        if (-d "$config{srcdir}/{arch}") {
                # Check to see if the page has been changed by someone


@@ -88,7 +95,9 @@ sub rcs_recentchanges ($) {
        return unless -d "$config{srcdir}/{arch}";
 
        eval q{use Date::Parse};
        return unless -d "$config{srcdir}/{arch}";
 
        eval q{use Date::Parse};

+       error($@) if $@;

        eval q{use Mail::Header};
        eval q{use Mail::Header};

+       error($@) if $@;

 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);
 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);


@@ -104,16 +113,17 @@ sub rcs_recentchanges ($) {
                my $summ = $head->get("Summary");
                my $newfiles = $head->get("New-files");
                my $modfiles = $head->get("Modified-files");
                my $summ = $head->get("Summary");
                my $newfiles = $head->get("New-files");
                my $modfiles = $head->get("Modified-files");

+               my $remfiles = $head->get("Removed-files");

                my $user = $head->get("Creator");
 
                my $user = $head->get("Creator");
 

-               my @paths = grep {!/^(.*\/\)?.arch-ids\/.*\.id$/} split(/ /,
-                       "$newfiles $modfiles");
+               my @paths = grep { !/^(.*\/)?\.arch-ids\/.*\.id$/ }
+                       split(/ /, "$newfiles $modfiles .arch-ids/fake.id");

 
                my $sdate = $head->get("Standard-date");
 
                my $sdate = $head->get("Standard-date");

-               my $when = time - str2time($sdate, 'UTC');
+               my $when = str2time($sdate, 'UTC');

 
                my $committype = "web";
 
                my $committype = "web";

-               if (defined $summ && $summ =~ /$tla_webcommit/) {
+               if (defined $summ && $summ =~ /$config{web_commit_regexp}/) {

                        $user = defined $2 ? "$2" : "$3";
                        $summ = $4;
                }
                        $user = defined $2 ? "$2" : "$3";
                        $summ = $4;
                }


@@ -135,7 +145,8 @@ sub rcs_recentchanges ($) {
                                diffurl => $diffurl,
                        } if length $file;
                }
                                diffurl => $diffurl,
                        } if length $file;
                }

-               push @ret, { rev => $change,
+               push @ret, {
+                       rev => $change,

                        user => $user,
                        committype => $committype,
                        when => $when,
                        user => $user,
                        committype => $committype,
                        when => $when,


@@ -149,83 +160,12 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
        return @ret;
 }
 

-sub rcs_notify () { #{{{
-       # FIXME: Not set
-       if (! exists $ENV{ARCH_VERSION}) {
-               error("ARCH_VERSION is not set, not running from tla post-commit hook, cannot send notifications");
-       }
-       my $rev=int(possibly_foolish_untaint($ENV{REV}));
-
-       eval q{use Mail::Header};
-       open(LOG, $ENV{"ARCH_LOG"});
-       my $head = Mail::Header->new(\*LOG);
-       close(LOG);
-
-       my $message = $head->get("Summary");
-       my $user = $head->get("Creator");
-
-       my $newfiles = $head->get("New-files");
-       my $modfiles = $head->get("Modified-files");
-
-       my @changed_pages = grep {!/(^.*\/)?\.arch-ids\/.*\.id$/} split(/ /,
-               "$newfiles $modfiles");
-
-       if ($message =~ /$tla_webcommit/) {
-               $user=defined $2 ? "$2" : "$3";
-               $message=$4;
-       }
-
-       require IkiWiki::UserInfo;
-       my @email_recipients=commit_notify_list($user, @changed_pages);
-       if (@email_recipients) {
-               # TODO: if a commit spans multiple pages, this will send
-               # subscribers a diff that might contain pages they did not
-               # sign up for. Should separate the diff per page and
-               # reassemble into one mail with just the pages subscribed to.
-               my $logs = `tla logs -d $config{srcdir}`;
-               my @changesets = reverse split(/\n/, $logs);
-               my $i;
-
-               for($i=0;$i<$#changesets;$i++) {
-                       last if $changesets[$i] eq $rev;
-               }
-
-               my $revminusone = $changesets[$i+1];
-               my $diff=`tla diff -d $ENV{ARCH_TREE_ROOT} $revminusone`;
-
-               my $subject="$config{wikiname} update of ";
-               if (@changed_pages > 2) {
-                       $subject.="$changed_pages[0] $changed_pages[1] etc";
-               }
-               else {
-                       $subject.=join(" ", @changed_pages);
-               }
-               $subject.=" by $user";
-
-               my $template=template("notifymail.tmpl");
-               $template->param(
-                       wikiname => $config{wikiname},
-                       diff => $diff,
-                       user => $user,
-                       message => $message,
-               );
-
-               eval q{use Mail::Sendmail};
-               foreach my $email (@email_recipients) {
-                       sendmail(
-                               To => $email,
-                               From => "$config{wikiname} <$config{adminemail}>",
-                               Subject => $subject,
-                               Message => $template->output,
-                       ) or error("Failed to send update notification mail");
-               }
-       }
-} #}}}
-

 sub rcs_getctime ($) { #{{{
        my $file=shift;
        eval q{use Date::Parse};
 sub rcs_getctime ($) { #{{{
        my $file=shift;
        eval q{use Date::Parse};

+       error($@) if $@;

        eval q{use Mail::Header};
        eval q{use Mail::Header};

+       error($@) if $@;

 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);
 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);