cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0b3d5e40614040620f8d380df2809c57434d298a..b4030307847fd0392a848da51330ff40db15889b 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -8,10 +8,13 @@ use Encode;
 use IkiWiki 2.00;
 use URI;
 
+my %knownfeeds;
+my %page_numfeeds;
+
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
-       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+       hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
@@ -31,6 +34,8 @@ sub getopt () { #{{{
        GetOptions(
                "rss!" => \$config{rss},
                "atom!" => \$config{atom},
+               "allowrss!" => \$config{allowrss},
+               "allowatom!" => \$config{allowatom},
        );
 }
 
@@ -88,11 +93,10 @@ sub preprocess_inline (@) { #{{{
        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
-       my $rss=($config{rss} && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
-       my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
+       my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
+       my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
-       $feeds=0 if $params{preview};
        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
@@ -149,12 +153,37 @@ sub preprocess_inline (@) { #{{{
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));
+       # Force a scan of this page so any metadata that appears after this
+       # inline directive is available when inlining. The page normally 
+       # wouldn't be scanned if it's only being rebuilt because of a
+       # depedency.
+       IkiWiki::scan($pagesources{$params{page}});
+
+       my $feednum="";
 
-       my $rssurl=basename(rsspage($params{page}));
-       my $atomurl=basename(atompage($params{page}));
+       my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
+       if (exists $knownfeeds{$feedid}) {
+               $feednum=$knownfeeds{$feedid};
+       }
+       else {
+               if (exists $page_numfeeds{$params{destpage}}) {
+                       if ($feeds) {
+                               $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+                       }
+               }
+               else {
+                       $feednum=$knownfeeds{$feedid}="";
+                       if ($feeds) {
+                               $page_numfeeds{$params{destpage}}=1;
+                       }
+               }
+       }
+
+       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
        my $ret="";
 
-       if ($config{cgiurl} && (exists $params{rootpage} ||
+       if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
                        (exists $params{postform} && yesno($params{postform})))) {
                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
@@ -173,7 +202,7 @@ sub preprocess_inline (@) { #{{{
                }
                $ret.=$formtemplate->output;
        }
-       elsif ($feeds) {
+       elsif ($feeds && !$params{preview}) {
                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;
@@ -202,7 +231,9 @@ sub preprocess_inline (@) { #{{{
                                }
                                $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
                                $template->param(title => pagetitle(basename($page)));
-                               $template->param(ctime => displaytime($pagectime{$page}));
+                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+                               $template->param(first => 1) if $page eq $list[0];
+                               $template->param(last => 1) if $page eq $list[$#list];
        
                                if ($actions) {
                                        my $file = $pagesources{$page};
@@ -215,7 +246,7 @@ sub preprocess_inline (@) { #{{{
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
-                                                                       $params{page},
+                                                                       $params{destpage},
                                                                        gettext("Discussion"),
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
@@ -228,7 +259,7 @@ sub preprocess_inline (@) { #{{{
                                }
        
                                run_hooks(pagetemplate => sub {
-                                       shift->(page => $page, destpage => $params{page},
+                                       shift->(page => $page, destpage => $params{destpage},
                                                template => $template,);
                                });
        
@@ -238,9 +269,9 @@ sub preprocess_inline (@) { #{{{
                        else {
                                if (defined $type) {
                                        $ret.="\n".
-                                             linkify($page, $params{page},
-                                             preprocess($page, $params{page},
-                                             filter($page, $params{page},
+                                             linkify($page, $params{destpage},
+                                             preprocess($page, $params{destpage},
+                                             filter($page, $params{destpage},
                                              readfile(srcfile($file)))));
                                }
                        }
@@ -256,20 +287,24 @@ sub preprocess_inline (@) { #{{{
                }
        
                if ($rss) {
-                       my $rssp=rsspage($params{page});
-                       will_render($params{page}, $rssp);
-                       writefile($rssp, $config{destdir},
-                               genfeed("rss", $rssurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       my $rssp=rsspage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $rssp);
+                       if (! $params{preview}) {
+                               writefile($rssp, $config{destdir},
+                                       genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       }
                }
                if ($atom) {
-                       my $atomp=atompage($params{page});
-                       will_render($params{page}, $atomp);
-                       writefile($atomp, $config{destdir},
-                               genfeed("atom", $atomurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       my $atomp=atompage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $atomp);
+                       if (! $params{preview}) {
+                               writefile($atomp, $config{destdir},
+                                       genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       }
                }
        }