foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 4246c7e785a42fdcefd4977d2c1a75dfa3ceb62e..ea3833a37d5e98f062db2d5cdc410962a29a9330 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1,21 +1,16 @@
 #!/usr/bin/perl -T
 #!/usr/bin/perl -T

+$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";

 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use File::Find;

 use Memoize;
 use File::Spec;
 use HTML::Template;
 use Memoize;
 use File::Spec;
 use HTML::Template;

+use Getopt::Long;

 
 

-BEGIN {
-       $blosxom::version="is a proper perl module too much to ask?";
-       do "/usr/bin/markdown";
-}
-
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";

 my (%links, %oldlinks, %oldpagemtime, %renderedfiles, %pagesources);
 
 my (%links, %oldlinks, %oldpagemtime, %renderedfiles, %pagesources);
 

-my %config=(
+my %config=( #{{{

        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
        wiki_link_regexp => qr/\[\[([^\s]+)\]\]/,
        wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
        wiki_link_regexp => qr/\[\[([^\s]+)\]\]/,
        wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,


@@ -23,23 +18,54 @@ my %config=(
        wikiname => "wiki",
        default_pageext => ".mdwn",
        cgi => 0,
        wikiname => "wiki",
        default_pageext => ".mdwn",
        cgi => 0,

-       url => "",
-       cgiurl => "",
-       historyurl => "",

        svn => 1,
        svn => 1,

+       url => '',
+       cgiurl => '',
+       historyurl => '',

        anonok => 0,
        rebuild => 0,
        anonok => 0,
        rebuild => 0,

-       wrapper => 0,
+       wrapper => undef,
+       wrappermode => undef,

        srcdir => undef,
        destdir => undef,
        templatedir => undef,
        srcdir => undef,
        destdir => undef,
        templatedir => undef,

-);
+       setup => undef,
+); #}}}
+
+GetOptions( #{{{
+       "setup=s" => \$config{setup},
+       "wikiname=s" => \$config{wikiname},
+       "verbose|v!" => \$config{verbose},
+       "rebuild!" => \$config{rebuild},
+       "wrapper=s" => sub { $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap" },
+       "wrappermode=i" => \$config{wrappermode},
+       "svn!" => \$config{svn},
+       "anonok!" => \$config{anonok},
+       "cgi!" => \$config{cgi},
+       "url=s" => \$config{url},
+       "cgiurl=s" => \$config{cgiurl},
+       "historyurl=s" => \$config{historyurl},
+       "exclude=s@" => sub {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+       },
+) || usage();
+
+if (! $config{setup}) {
+       usage() unless @ARGV == 3;
+       $config{srcdir} = possibly_foolish_untaint(shift);
+       $config{templatedir} = possibly_foolish_untaint(shift);
+       $config{destdir} = possibly_foolish_untaint(shift);
+       if ($config{cgi} && ! length $config{url}) {
+               error("Must specify url to wiki with --url when using --cgi");
+       }
+}
+#}}}

 
 sub usage { #{{{
        die "usage: ikiwiki [options] source templates dest\n";
 } #}}}
 
 
 sub usage { #{{{
        die "usage: ikiwiki [options] source templates dest\n";
 } #}}}
 

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

        if ($config{cgi}) {
                print "Content-type: text/html\n\n";
                print misctemplate("Error", "<p>Error: @_</p>");
        if ($config{cgi}) {
                print "Content-type: text/html\n\n";
                print misctemplate("Error", "<p>Error: @_</p>");


@@ -66,7 +92,7 @@ sub mtime ($) { #{{{
        return (stat($page))[9];
 } #}}}
 
        return (stat($page))[9];
 } #}}}
 

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

        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/;
        return $untainted;
        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/;
        return $untainted;


@@ -146,17 +172,18 @@ sub findlinks ($) { #{{{
        my $content=shift;
 
        my @links;
        my $content=shift;
 
        my @links;

-       while ($content =~ /$config{wiki_link_regexp}/g) {
+       while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {

                push @links, lc($1);
        }
        return @links;
 } #}}}
 
                push @links, lc($1);
        }
        return @links;
 } #}}}
 

-# Given a page and the text of a link on the page, determine which existing
-# page that link best points to. Prefers pages under a subdirectory with
-# the same name as the source page, failing that goes down the directory tree
-# to the base looking for matching pages.

 sub bestlink ($$) { #{{{
 sub bestlink ($$) { #{{{

+       # Given a page and the text of a link on the page, determine which
+       # existing page that link best points to. Prefers pages under a
+       # subdirectory with the same name as the source page, failing that
+       # goes down the directory tree to the base looking for matching
+       # pages.

        my $page=shift;
        my $link=lc(shift);
        
        my $page=shift;
        my $link=lc(shift);
        


@@ -220,7 +247,9 @@ sub linkify ($$) { #{{{
        my $content=shift;
        my $file=shift;
 
        my $content=shift;
        my $file=shift;
 

-       $content =~ s/$config{wiki_link_regexp}/htmllink(pagename($file), $1)/eg;
+       $content =~ s{(\\?)$config{wiki_link_regexp}}{
+               $1 ? "[[$2]]" : htmllink(pagename($file), $2)
+       }eg;

        
        return $content;
 } #}}}
        
        return $content;
 } #}}}


@@ -229,6 +258,13 @@ sub htmlize ($$) { #{{{
        my $type=shift;
        my $content=shift;
        
        my $type=shift;
        my $content=shift;
        

+       if (! $INC{"/usr/bin/markdown"}) {
+               no warnings 'once';
+               $blosxom::version="is a proper perl module too much to ask?";
+               use warnings 'all';
+               do "/usr/bin/markdown";
+       }
+       

        if ($type eq '.mdwn') {
                return Markdown::Markdown($content);
        }
        if ($type eq '.mdwn') {
                return Markdown::Markdown($content);
        }


@@ -321,9 +357,9 @@ sub finalize ($$) { #{{{
        return $template->output;
 } #}}}
 
        return $template->output;
 } #}}}
 

-# Important security check. Make sure to call this before saving any files
-# to the source directory.

 sub check_overwrite ($$) { #{{{
 sub check_overwrite ($$) { #{{{

+       # Important security check. Make sure to call this before saving
+       # any files to the source directory.

        my $dest=shift;
        my $src=shift;
        
        my $dest=shift;
        my $src=shift;
        


@@ -509,11 +545,15 @@ sub refresh () { #{{{
        # Find existing pages.
        my %exists;
        my @files;
        # Find existing pages.
        my %exists;
        my @files;

+       
+       eval q{use File::Find};

        find({
                no_chdir => 1,
                wanted => sub {
                        if (/$config{wiki_file_prune_regexp}/) {
        find({
                no_chdir => 1,
                wanted => sub {
                        if (/$config{wiki_file_prune_regexp}/) {

+                               no warnings 'once';

                                $File::Find::prune=1;
                                $File::Find::prune=1;

+                               use warnings "all";

                        }
                        elsif (! -d $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                        }
                        elsif (! -d $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint


@@ -628,9 +668,8 @@ FILE:               foreach my $file (@files) {
        }
 } #}}}
 
        }
 } #}}}
 

-# Generates a C wrapper program for running ikiwiki in a specific way.
-# The wrapper may be safely made suid.
-sub gen_wrapper () { #{{{
+sub gen_wrapper (@) { #{{{
+       my %config=(@_);

        eval q{use Cwd 'abs_path'};
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});
        eval q{use Cwd 'abs_path'};
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});


@@ -639,6 +678,10 @@ sub gen_wrapper () { #{{{
                error("$this doesn't seem to be executable");
        }
 
                error("$this doesn't seem to be executable");
        }
 

+       if ($config{setup}) {
+               error("cannot create a wrapper that uses a setup file");
+       }
+       

        my @params=($config{srcdir}, $config{templatedir}, $config{destdir},
                "--wikiname=$config{wikiname}");
        push @params, "--verbose" if $config{verbose};
        my @params=($config{srcdir}, $config{templatedir}, $config{destdir},
                "--wikiname=$config{wikiname}");
        push @params, "--verbose" if $config{verbose};


@@ -700,12 +743,15 @@ $envsave
 }
 EOF
        close OUT;
 }
 EOF
        close OUT;

-       if (system("gcc", "ikiwiki-wrap.c", "-o", "ikiwiki-wrap") != 0) {
+       if (system("gcc", "ikiwiki-wrap.c", "-o", possibly_foolish_untaint($config{wrapper})) != 0) {

                error("failed to compile ikiwiki-wrap.c");
        }
        unlink("ikiwiki-wrap.c");
                error("failed to compile ikiwiki-wrap.c");
        }
        unlink("ikiwiki-wrap.c");

-       print "successfully generated ikiwiki-wrap\n";
-       exit 0;
+       if (defined $config{wrappermode} &&
+           ! chmod(oct($config{wrappermode}), possibly_foolish_untaint($config{wrapper}))) {
+               error("chmod $config{wrapper}: $!");
+       }
+       print "successfully generated $config{wrapper}\n";

 } #}}}
                
 sub misctemplate ($$) { #{{{
 } #}}}
                
 sub misctemplate ($$) { #{{{


@@ -1104,35 +1150,34 @@ sub cgi () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-# main {{{
-if (grep /^-/, @ARGV) {
-       eval {use Getopt::Long};
-       GetOptions(
-               "wikiname=s" => \$config{wikiname},
-               "verbose|v!" => \$config{verbose},
-               "rebuild!" => \$config{rebuild},
-               "wrapper!" => \$config{wrapper},
-               "svn!" => \$config{svn},
-               "anonok!" => \$config{anonok},
-               "cgi!" => \$config{cgi},
-               "url=s" => \$config{url},
-               "cgiurl=s" => \$config{cgiurl},
-               "historyurl=s" => \$config{historyurl},
-               "exclude=s@" => sub {
-                       $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
-               },
-       ) || usage();
-}
-usage() unless @ARGV == 3;
-$config{srcdir} = possibly_foolish_untaint(shift);
-$config{templatedir} = possibly_foolish_untaint(shift);
-$config{destdir} = possibly_foolish_untaint(shift);
+sub setup () { # {{{
+       my $setup=possibly_foolish_untaint($config{setup});
+       delete $config{setup};
+       open (IN, $setup) || error("read $setup: $!\n");
+       local $/=undef;
+       my $code=<IN>;
+       ($code)=$code=~/(.*)/s;
+       close IN;
+       eval $code;
+       error($@) if $@;
+       print "$config{wikiname} setup complete, now forcing a rebuild.\n";
+       $config{cgi}=0;
+       $config{rebuild}=1;
+       foreach my $c (keys %config) {
+               $config{$c}=possibly_foolish_untaint($config{$c})
+                       if defined $config{$c};
+       }
+       refresh();
+       saveindex();
+       exit;
+} #}}}

 
 

-if ($config{cgi} && ! length $config{url}) {
-       error("Must specify url to wiki with --url when using --cgi");
+# main {{{
+setup() if $config{setup};
+if ($config{wrapper}) {
+       gen_wrapper(%config);
+       exit;

 }
 }

-
-gen_wrapper() if $config{wrapper};

 memoize('pagename');
 memoize('bestlink');
 loadindex() unless $config{rebuild};
 memoize('pagename');
 memoize('bestlink');
 loadindex() unless $config{rebuild};