X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4a07e28acc916d825e311c53894e9eae3525bfc7..29d387d2bacfdf10cc8712af1250e5655967f1b9:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5fd0dea0d..adae9f0d5 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -10,7 +10,7 @@ use Encode;
 my %backlinks;
 my $backlinks_calculated=0;
 
-sub calculate_backlinks () { #{{{
+sub calculate_backlinks () {
 	return if $backlinks_calculated;
 	%backlinks=();
 	foreach my $page (keys %links) {
@@ -22,9 +22,9 @@ sub calculate_backlinks () { #{{{
 		}
 	}
 	$backlinks_calculated=1;
-} #}}}
+}
 
-sub backlinks ($) { #{{{
+sub backlinks ($) {
 	my $page=shift;
 
 	calculate_backlinks();
@@ -45,29 +45,11 @@ sub backlinks ($) { #{{{
 		push @links, { url => $href, page => pagetitle($p_trimmed) };
 	}
 	return @links;
-} #}}}
+}
 
-sub parentlinks ($) { #{{{
-	my $page=shift;
-	
-	my @ret;
-	my $pagelink="";
-	my $path="";
-	my $title=$config{wikiname};
-	
-	return if $page eq 'index'; # toplevel
-	foreach my $dir (split("/", $page)) {
-		push @ret, { url => urlto($path, $page), page => $title };
-		$path.="/".$dir;
-		$title=pagetitle($dir);
-	}
-	return @ret;
-} #}}}
-
-sub genpage ($$$) { #{{{
+sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
-	my $mtime=shift;
 
 	my $templatefile;
 	run_hooks(templatefile => sub {
@@ -81,15 +63,13 @@ sub genpage ($$$) { #{{{
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
+		$template->param(editurl => cgiurl(do => "edit", page => $page))
+			if IkiWiki->can("cgi_editpage");
 		$template->param(prefsurl => cgiurl(do => "prefs"));
-		if ($config{rcs}) {
-			$template->param(recentchangesurl => cgiurl(do => "recentchanges"));
-		}
 		$actions++;
 	}
-
-	if (length $config{historyurl}) {
+		
+	if (defined $config{historyurl} && length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
 		$template->param(historyurl => $u);
@@ -125,11 +105,11 @@ sub genpage ($$$) { #{{{
 			? $config{wikiname} 
 			: pagetitle(basename($page)),
 		wikiname => $config{wikiname},
-		parentlinks => [parentlinks($page)],
 		content => $content,
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
-		mtime => displaytime($mtime),
+		mtime => displaytime($pagemtime{$page}),
+		ctime => displaytime($pagectime{$page}),
 		baseurl => baseurl($page),
 	);
 
@@ -138,6 +118,10 @@ sub genpage ($$$) { #{{{
 	});
 	
 	$content=$template->output;
+	
+	run_hooks(postscan => sub {
+		shift->(page => $page, content => $content);
+	});
 
 	run_hooks(format => sub {
 		$content=shift->(
@@ -147,15 +131,9 @@ sub genpage ($$$) { #{{{
 	});
 
 	return $content;
-} #}}}
-
-sub mtime ($) { #{{{
-	my $file=shift;
-	
-	return (stat($file))[9];
-} #}}}
+}
 
-sub scan ($) { #{{{
+sub scan ($) {
 	my $file=shift;
 
 	my $type=pagetype($file);
@@ -165,30 +143,55 @@ sub scan ($) { #{{{
 		my $page=pagename($file);
 		will_render($page, htmlpage($page), 1);
 
-		# Always needs to be done, since filters might add links
-		# to the content.
-		$content=filter($page, $page, $content);
-
-		my @links;
-		while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-			push @links, linkpage($2);
-		}
 		if ($config{discussion}) {
 			# Discussion links are a special case since they're
 			# not in the text of the page, but on its template.
-			push @links, $page."/".gettext("discussion");
+			$links{$page}=[ $page."/".gettext("discussion") ];
 		}
-		$links{$page}=\@links;
-		
+		else {
+			$links{$page}=[];
+		}
+
+		run_hooks(scan => sub {
+			shift->(
+				page => $page,
+				content => $content,
+			);
+		});
+
 		# Preprocess in scan-only mode.
 		preprocess($page, $page, $content, 1);
 	}
 	else {
 		will_render($file, $file, 1);
 	}
-} #}}}
+}
+
+sub fast_file_copy (@) {
+	my $srcfile=shift;
+	my $destfile=shift;
+	my $srcfd=shift;
+	my $destfd=shift;
+	my $cleanup=shift;
+
+	my $blksize = 16384;
+	my ($len, $buf, $written);
+	while ($len = sysread $srcfd, $buf, $blksize) {
+		if (! defined $len) {
+			next if $! =~ /^Interrupted/;
+			error("failed to read $srcfile: $!", $cleanup);
+		}
+		my $offset = 0;
+		while ($len) {
+			defined($written = syswrite $destfd, $buf, $len, $offset)
+				or error("failed to write $destfile: $!", $cleanup);
+			$len -= $written;
+			$offset += $written;
+		}
+	}
+}
 
-sub render ($) { #{{{
+sub render ($) {
 	my $file=shift;
 	
 	my $type=pagetype($file);
@@ -197,44 +200,42 @@ sub render ($) { #{{{
 		my $page=pagename($file);
 		delete $depends{$page};
 		will_render($page, htmlpage($page), 1);
+		return if $type=~/^_/;
 		
-		my $content=htmlize($page, $type,
+		my $content=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
 			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);
 		delete $depends{$file};
 		will_render($file, $file, 1);
-		writefile($file, $config{destdir}, undef, 1, sub {
-			my $destfd=shift;
-			my $cleanup=shift;
-
-			my $blksize = 16384;
-			my ($len, $buf, $written);
-			while ($len = sysread $srcfd, $buf, $blksize) {
-				if (! defined $len) {
-					next if $! =~ /^Interrupted/;
-					error("failed to read $srcfile: $!", $cleanup);
-				}
-				my $offset = 0;
-				while ($len) {
-					defined($written = syswrite $destfd, $buf, $len, $offset)
-						or error("failed to write $file: $!", $cleanup);
-					$len -= $written;
-					$offset += $written;
+		
+		if ($config{hardlink}) {
+			# only hardlink if owned by same user
+			my @stat=stat($srcfile);
+			if ($stat[4] == $>) {
+				prep_writefile($file, $config{destdir});
+				unlink($config{destdir}."/".$file);
+				if (link($srcfile, $config{destdir}."/".$file)) {
+					return;
 				}
 			}
+			# if hardlink fails, fall back to copying
+		}
+		
+		my $srcfd=readfile($srcfile, 1, 1);
+		writefile($file, $config{destdir}, undef, 1, sub {
+			fast_file_copy($srcfile, $file, $srcfd, @_);
 		});
 	}
-} #}}}
+}
 
-sub prune ($) { #{{{
+sub prune ($) {
 	my $file=shift;
 
 	unlink($file);
@@ -242,9 +243,22 @@ sub prune ($) { #{{{
 	while (rmdir($dir)) {
 		$dir=dirname($dir);
 	}
-} #}}}
+}
+
+sub refresh () {
+	# security check, avoid following symlinks in the srcdir path by default
+	my $test=$config{srcdir};
+	while (length $test) {
+		if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
+			error(sprintf(gettext("symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"), $test));
+		}
+		unless ($test=~s/\/+$//) {
+			$test=dirname($test);
+		}
+	}
+	
+	run_hooks(refresh => sub { shift->() });
 
-sub refresh () { #{{{
 	# find existing pages
 	my %exists;
 	my @files;
@@ -257,7 +271,7 @@ sub refresh () { #{{{
 			if (file_pruned($_, $config{srcdir})) {
 				$File::Find::prune=1;
 			}
-			elsif (! -d $_ && ! -l $_) {
+			elsif (! -l $_ && ! -d _) {
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
 					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
@@ -265,63 +279,87 @@ sub refresh () { #{{{
 				else {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
 					push @files, $f;
-					$exists{pagename($f)}=1;
+					my $pagename = pagename($f);
+					if ($exists{$pagename}) {
+						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
+					}
+					$exists{$pagename}=1;
 				}
 			}
 		},
 	}, $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 (! -l $_ && ! -d _) {
+					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 (! -l "$config{srcdir}/$f" && 
+						    ! -e _) {
+						    	my $page=pagename($f);
+							if (! $exists{$page}) {
+								push @files, $f;
+								$exists{$page}=1;
+							}
 						}
 					}
 				}
-			}
-		},
-	}, $config{underlaydir});
-
-	my %rendered;
+			},
+		}, $dir);
+	};
 
+	my (%rendered, @add, @del, @internal);
 	# check for added or removed pages
-	my @add;
 	foreach my $file (@files) {
 		my $page=pagename($file);
+		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
+			# the page has changed its type
+			$forcerebuild{$page}=1;
+		}
 		$pagesources{$page}=$file;
 		if (! $pagemtime{$page}) {
-			push @add, $file;
-			$pagecase{lc $page}=$page;
-			if ($config{getctime} && -e "$config{srcdir}/$file") {
-				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+			if (isinternal($page)) {
+				push @internal, $file;
 			}
-			elsif (! exists $pagectime{$page}) {
-				$pagectime{$page}=mtime(srcfile($file));
+			else {
+				push @add, $file;
+				if ($config{getctime} && -e "$config{srcdir}/$file") {
+					eval {
+						my $time=rcs_getctime("$config{srcdir}/$file");
+						$pagectime{$page}=$time;
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+				}
+			}
+			$pagecase{lc $page}=$page;
+			if (! exists $pagectime{$page}) {
+				$pagectime{$page}=(srcfile_stat($file))[10];
 			}
 		}
 	}
-	my @del;
 	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;
@@ -340,13 +378,19 @@ sub refresh () { #{{{
 	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
-		
-		my $mtime=mtime(srcfile($file));
+		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
-		    $mtime > $pagemtime{$page} ||
+		    $stat[9] > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-			$pagemtime{$page}=$mtime;
-			push @needsbuild, $file;
+			$pagemtime{$page}=$stat[9];
+			if (isinternal($page)) {
+				push @internal, $file;
+				# Preprocess internal page in scan-only mode.
+				preprocess($page, $page, readfile($srcfile), 1);
+			}
+			else {
+				push @needsbuild, $file;
+			}
 		}
 	}
 	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
@@ -362,6 +406,15 @@ sub refresh () { #{{{
 		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) {
@@ -377,13 +430,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}) {
-				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)) {
@@ -399,7 +456,7 @@ sub refresh () { #{{{
 		# 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}) {
@@ -421,6 +478,7 @@ sub refresh () { #{{{
 				}
 			}
 		}
+
 		foreach my $link (keys %linkchanged) {
 		    	my $linkfile=$pagesources{$link};
 			if (defined $linkfile) {
@@ -449,11 +507,9 @@ sub refresh () { #{{{
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
-} #}}}
+}
 
-sub commandline_render () { #{{{
-	loadplugins();
-	checkconfig();
+sub commandline_render () {
 	lockwiki();
 	loadindex();
 	unlockwiki();
@@ -470,10 +526,12 @@ sub commandline_render () { #{{{
 	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
-	$content=htmlize($page, $type, $content);
+	$content=htmlize($page, $page, $type, $content);
+	$pagemtime{$page}=(stat($srcfile))[9];
+	$pagectime{$page}=$pagemtime{$page} if ! exists $pagectime{$page};
 
-	print genpage($page, $content, mtime($srcfile));
+	print genpage($page, $content);
 	exit 0;
-} #}}}
+}
 
 1