releasing version 2.31.1

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a95da40d253f8650671fd843cf5ee858bbfd42cc..2682e13ae5b6e76ac67df22c59319dba07fac51a 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -55,8 +55,8 @@ sub parentlinks ($) { #{{{
        my $path="";
        my $title=$config{wikiname};
        
        my $path="";
        my $title=$config{wikiname};
        

-       return if $page eq 'index'; # toplevel

        foreach my $dir (split("/", $page)) {
        foreach my $dir (split("/", $page)) {

+               next if $dir eq 'index';

                push @ret, { url => urlto($path, $page), page => $title };
                $path.="/".$dir;
                $title=pagetitle($dir);
                push @ret, { url => urlto($path, $page), page => $title };
                $path.="/".$dir;
                $title=pagetitle($dir);


@@ -64,10 +64,9 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub genpage ($$$) { #{{{
+sub genpage ($$) { #{{{

        my $page=shift;
        my $content=shift;
        my $page=shift;
        my $content=shift;

-       my $mtime=shift;

 
        my $templatefile;
        run_hooks(templatefile => sub {
 
        my $templatefile;
        run_hooks(templatefile => sub {


@@ -83,12 +82,9 @@ sub genpage ($$$) { #{{{
        if (length $config{cgiurl}) {
                $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
                $template->param(prefsurl => cgiurl(do => "prefs"));
        if (length $config{cgiurl}) {
                $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
                $template->param(prefsurl => cgiurl(do => "prefs"));

-               if ($config{rcs}) {
-                       $template->param(recentchangesurl => cgiurl(do => "recentchanges"));
-               }

                $actions++;
        }
                $actions++;
        }

-
+               

        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;


@@ -129,7 +125,8 @@ sub genpage ($$$) { #{{{
                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,

-               mtime => displaytime($mtime),
+               mtime => displaytime($pagemtime{$page}),
+               ctime => displaytime($pagectime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -197,6 +194,7 @@ sub render ($) { #{{{
                my $page=pagename($file);
                delete $depends{$page};
                will_render($page, htmlpage($page), 1);
                my $page=pagename($file);
                delete $depends{$page};
                will_render($page, htmlpage($page), 1);

+               return if $type=~/^_/;

                
                my $content=htmlize($page, $type,
                        linkify($page, $page,
                
                my $content=htmlize($page, $type,
                        linkify($page, $page,


@@ -204,8 +202,8 @@ sub render ($) { #{{{
                        filter($page, $page,
                        readfile($srcfile)))));
                
                        filter($page, $page,
                        readfile($srcfile)))));
                

-               writefile(htmlpage($page), $config{destdir},
-                       genpage($page, $content, mtime($srcfile)));
+               my $output=htmlpage($page);
+               writefile($output, $config{destdir}, genpage($page, $content));

        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);


@@ -245,6 +243,19 @@ sub prune ($) { #{{{
 } #}}}
 
 sub refresh () { #{{{
 } #}}}
 
 sub refresh () { #{{{

+       # security check, avoid following symlinks in the srcdir path
+       my $test=$config{srcdir};
+       while (length $test) {
+               if (-l $test) {
+                       error("symlink found in srcdir path ($test)");
+               }
+               unless ($test=~s/\/+$//) {
+                       $test=dirname($test);
+               }
+       }
+       
+       run_hooks(refresh => sub { shift->() });
+

        # find existing pages
        my %exists;
        my @files;
        # find existing pages
        my %exists;
        my @files;


@@ -270,58 +281,75 @@ sub refresh () { #{{{
                        }
                },
        }, $config{srcdir});
                        }
                },
        }, $config{srcdir});

-       find({
-               no_chdir => 1,
-               wanted => sub {
-                       $_=decode_utf8($_);
-                       if (file_pruned($_, $config{underlaydir})) {
-                               $File::Find::prune=1;
-                       }
-                       elsif (! -d $_ && ! -l $_) {
-                               my ($f)=/$config{wiki_file_regexp}/; # untaint
-                               if (! defined $f) {
-                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
+       foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+               find({
+                       no_chdir => 1,
+                       wanted => sub {
+                               $_=decode_utf8($_);
+                               if (file_pruned($_, $dir)) {
+                                       $File::Find::prune=1;

                                }
                                }

-                               else {
-                                       # Don't add pages that are in the
-                                       # srcdir.
-                                       $f=~s/^\Q$config{underlaydir}\E\/?//;
-                                       if (! -e "$config{srcdir}/$f" && 
-                                           ! -l "$config{srcdir}/$f") {
-                                               my $page=pagename($f);
-                                               if (! $exists{$page}) {
-                                                       push @files, $f;
-                                                       $exists{$page}=1;
+                               elsif (! -d $_ && ! -l $_) {
+                                       my ($f)=/$config{wiki_file_regexp}/; # untaint
+                                       if (! defined $f) {
+                                               warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
+                                       }
+                                       else {
+                                               $f=~s/^\Q$dir\E\/?//;
+                                               # avoid underlaydir
+                                               # override attacks; see
+                                               # security.mdwn
+                                               if (! -e "$config{srcdir}/$f" && 
+                                                   ! -l "$config{srcdir}/$f") {
+                                                       my $page=pagename($f);
+                                                       if (! $exists{$page}) {
+                                                               push @files, $f;
+                                                               $exists{$page}=1;
+                                                       }

                                                }
                                        }
                                }
                                                }
                                        }
                                }

-                       }
-               },
-       }, $config{underlaydir});
+                       },
+               }, $dir);
+       };

 
 

-       my %rendered;
+       my (%rendered, @add, @del, @internal);

 
        # check for added or removed pages
 
        # check for added or removed pages

-       my @add;

        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {

-                       push @add, $file;
+                       if (isinternal($page)) {
+                               push @internal, $file;
+                       }
+                       else {
+                               push @add, $file;
+                       }

                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {

-                               $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+                               eval {
+                                       my $time=rcs_getctime("$config{srcdir}/$file");
+                                       $pagectime{$page}=$time;
+                               };
+                               if ($@) {
+                                       print STDERR $@;
+                               }

                        }
                        }

-                       elsif (! exists $pagectime{$page}) {
+                       if (! exists $pagectime{$page}) {

                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }
        }
                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }
        }

-       my @del;

        foreach my $page (keys %pagemtime) {
                if (! $exists{$page}) {
        foreach my $page (keys %pagemtime) {
                if (! $exists{$page}) {

-                       debug(sprintf(gettext("removing old page %s"), $page));
-                       push @del, $pagesources{$page};
+                       if (isinternal($page)) {
+                               push @internal, $pagesources{$page};
+                       }
+                       else {
+                               debug(sprintf(gettext("removing old page %s"), $page));
+                               push @del, $pagesources{$page};
+                       }

                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;


@@ -346,12 +374,19 @@ sub refresh () { #{{{
                    $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$mtime;
                    $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$mtime;

-                       push @needsbuild, $file;
+                       if (isinternal($page)) {
+                               push @internal, $file;
+                               # Preprocess internal page in scan-only mode.
+                               preprocess($page, $page, readfile(srcfile($file)), 1);
+                       }
+                       else {
+                               push @needsbuild, $file;
+                       }

                }
        }
        run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
                }
        }
        run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 

-       # scan and rendder files
+       # scan and render files

        foreach my $file (@needsbuild) {
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);
        foreach my $file (@needsbuild) {
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);


@@ -362,6 +397,15 @@ sub refresh () { #{{{
                render($file);
                $rendered{$file}=1;
        }
                render($file);
                $rendered{$file}=1;
        }

+       foreach my $file (@internal) {
+               # internal pages are not rendered
+               my $page=pagename($file);
+               delete $depends{$page};
+               foreach my $old (@{$renderedfiles{$page}}) {
+                       delete $destsources{$old};
+               }
+               $renderedfiles{$page}=[];
+       }

        
        # rebuild pages that link to added or removed pages
        if (@add || @del) {
        
        # rebuild pages that link to added or removed pages
        if (@add || @del) {


@@ -377,13 +421,17 @@ sub refresh () { #{{{
                }
        }
 
                }
        }
 

-       if (%rendered || @del) {
+       if (%rendered || @del || @internal) {
+               my @changed=(keys %rendered, @del);
+

                # rebuild dependant pages
                foreach my $f (@files) {
                        next if $rendered{$f};
                        my $p=pagename($f);
                        if (exists $depends{$p}) {
                # rebuild dependant pages
                foreach my $f (@files) {
                        next if $rendered{$f};
                        my $p=pagename($f);
                        if (exists $depends{$p}) {

-                               foreach my $file (keys %rendered, @del) {
+                               # only consider internal files
+                               # if the page explicitly depends on such files
+                               foreach my $file (@changed, $depends{$p}=~/internal\(/ ? @internal : ()) {

                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p}, location => $p)) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p}, location => $p)) {


@@ -399,7 +447,7 @@ sub refresh () { #{{{
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
                my %linkchanged;
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
                my %linkchanged;

-               foreach my $file (keys %rendered, @del) {
+               foreach my $file (@changed) {

                        my $page=pagename($file);
                        
                        if (exists $links{$page}) {
                        my $page=pagename($file);
                        
                        if (exists $links{$page}) {


@@ -421,6 +469,7 @@ sub refresh () { #{{{
                                }
                        }
                }
                                }
                        }
                }

+

                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {


@@ -471,8 +520,9 @@ sub commandline_render () { #{{{
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);

+       $pagemtime{$page}=mtime($srcfile);

 
 

-       print genpage($page, $content, mtime($srcfile));
+       print genpage($page, $content);

        exit 0;
 } #}}}
 
        exit 0;
 } #}}}