Fix bug in wikiname sanitisation in the setup automator.

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 060a8be56c2872e5b7f9c0620dbd9caffdff067b..a54b53817bfbbf726d26ce298fdc8b4eb2a4479f 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -6,6 +6,7 @@ package IkiWiki::Setup::Automator;
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

+use IkiWiki::UserInfo;

 use Term::ReadLine;
 use File::Path;
 
 use Term::ReadLine;
 use File::Path;
 


@@ -16,95 +17,125 @@ sub ask ($$) { #{{{
        $r->readline($question." ", $default);
 } #}}}
 
        $r->readline($question." ", $default);
 } #}}}
 

+sub prettydir ($) { #{{{
+       my $dir=shift;
+       $dir=~s/^\Q$ENV{HOME}\E\//~\//;
+       return $dir;
+} #}}}
+

 sub import (@) { #{{{
 sub import (@) { #{{{

-       my %setup=@_;
+       my $this=shift;
+       IkiWiki::Setup::merge({@_});

 
        # Sanitize this to avoid problimatic directory names.
 
        # Sanitize this to avoid problimatic directory names.

-       $setup{wikiname}=~s/[^-A-Za-z0-9_] //g;
-       if (! length $setup{wikiname}) {
-               die "you must enter a wikiname\n";
+       $config{wikiname}=~s/[^-A-Za-z0-9_]//g;
+       if (! length $config{wikiname}) {
+               error gettext("you must enter a wikiname (that contains alphanumerics)");

        }
 
        # Avoid overwriting any existing files.
        }
 
        # Avoid overwriting any existing files.

-       foreach my $key (qw{srcdir destdir repository setupfile}) {
-               next unless exists $setup{$key};
+       foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+               next unless exists $config{$key};

                my $add="";
                my $add="";

-               while (-e $setup{$key}.$add) {
+               while (-e $add.$config{$key}) {

                        $add=1 if ! $add;
                        $add++;
                }
                        $add=1 if ! $add;
                        $add++;
                }

-               $setup{$key}.=$add;
+               $config{$key}=$add.$config{$key};
+       }
+       
+       # Set up wrapper
+       if ($config{rcs}) {
+               if ($config{rcs} eq 'git') {
+                       $config{git_wrapper}=$config{repository}."/hooks/post-update";
+               }
+               elsif ($config{rcs} eq 'svn') {
+                       $config{svn_wrapper}=$config{repository}."/hooks/post-commit";
+               }
+               elsif ($config{rcs} eq 'bzr') {
+                       # TODO
+               }
+               elsif ($config{rcs} eq 'mercurial') {
+                       # TODO
+               }
+               else {
+                       error sprintf(gettext("unsupported revision control system %s"),
+                               $config{rcs});
+               }

        }
 
        }
 

-       print "\n\nSetting up $setup{wikiname} ...\n";
+       IkiWiki::checkconfig();
+
+       print "\n\nSetting up $config{wikiname} ...\n";

 
        # Set up the repository.
 
        # Set up the repository.

-       mkpath($setup{srcdir}) || die "mkdir $setup{srcdir}: $!";
-       delete $setup{repository} if ! $setup{rcs} || $setup{rcs}=~/bzr|mercurial/;
-       if ($setup{rcs}) {
-               my @params=($setup{rcs}, $setup{srcdir});
-               push @params, $setup{repository} if exists $setup{repository};
+       mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!";
+       delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/;
+       if ($config{rcs}) {
+               my @params=($config{rcs}, $config{srcdir});
+               push @params, $config{repository} if exists $config{repository};

                if (system("ikiwiki-makerepo", @params) != 0) {
                if (system("ikiwiki-makerepo", @params) != 0) {

-                       die "failed: ikiwiki-makerepo @params";
+                       error gettext("failed to set up the repository with ikiwiki-makerepo");

                }
        }
 
        # Generate setup file.
                }
        }
 
        # Generate setup file.

-       my @params=(
-               "--dumpsetup", $setup{setupfile},
-               "--wikiname", $setup{wikiname},
-               "--url", $setup{url},
-               "--cgiurl", $setup{cgiurl}
-       );
-       if ($setup{rcs}) {
-               push @params, "--rcs", $setup{rcs};
-               if ($setup{rcs} eq 'git') {
-                       push @params, "--set", "git_wrapper=".
-                               $setup{repository}."/hooks/post-update";
-               }
-               elsif ($setup{rcs} eq 'svn') {
-                       push @params, "--set", "svn_wrapper=".
-                               $setup{repository}."/hooks/post-commit";
-               }
-               elsif ($setup{rcs} eq 'bzr') {
-                       # TODO
-               }
-               elsif ($setup{rcs} eq 'mercurial') {
-                       # TODO
-               }
+       require IkiWiki::Setup;
+       IkiWiki::Setup::dump($config{dumpsetup});
+
+       # Build the wiki, but w/o wrappers, so it's not live yet.
+       mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
+       if (system("ikiwiki", "--refresh", "--setup", $config{dumpsetup}) != 0) {
+               die "ikiwiki --refresh --setup $config{dumpsetup} failed";

        }
        }

-       if (exists $setup{add_plugins}) {
-               foreach my $plugin (@{$setup{add_plugins}}) {
-                       push @params, "--plugin", $plugin;
+
+       # Create admin user(s).
+       foreach my $admin (@{$config{adminuser}}) {
+               next if $admin=~/^http\?:\/\//; # openid
+               
+               # Prompt for password w/o echo.
+               system('stty -echo 2>/dev/null');
+               local $|=1;
+               print "\n\nCreating wiki admin $admin ...\n";
+               print "Choose a password: ";
+               chomp(my $password=<STDIN>);
+               print "\n\n\n";
+               system('stty sane 2>/dev/null');
+
+               if (IkiWiki::userinfo_setall($admin, { regdate => time }) &&
+                   IkiWiki::Plugin::passwordauth::setpassword($admin, $password)) {
+                       IkiWiki::userinfo_set($admin, "email", $config{adminemail}) if defined $config{adminemail};

                }
                }

-       }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       push @params, "--disable-plugin", $plugin;
+               else {
+                       error("problem setting up $admin user");

                }
        }
                }
        }

-       foreach my $key (keys %setup) {
-               next if $key =~ /^(disable_plugins|add_plugins|setupfile|wikiname|url|cgiurl||srcdir|destdir|repository)$/;
-               push @params, "--set", "$key=$setup{$key}";
-       }
-       if (system("ikiwiki", @params, $setup{srcdir}, $setup{destdir}) != 0) {
-               die "failed: ikiwiki @params";
+       
+       # Add wrappers, make live.
+       if (system("ikiwiki", "--wrappers", "--setup", $config{dumpsetup}) != 0) {
+               die "ikiwiki --wrappers --setup $config{dumpsetup} failed";

        }
 
        }
 

-       # Build the wiki.
-       mkpath($setup{destdir}) || die "mkdir $setup{destdir}: $!";
-       if (system("ikiwiki", "--setup", $setup{setupfile}) != 0) {
-               die "ikiwiki --setup $setup{setupfile} failed";
+       # Add it to the wikilist.
+       mkpath("$ENV{HOME}/.ikiwiki");
+       open (WIKILIST, ">>$ENV{HOME}/.ikiwiki/wikilist") || die "$ENV{HOME}/.ikiwiki/wikilist: $!";
+       print WIKILIST "$ENV{USER} $config{dumpsetup}\n";
+       close WIKILIST;
+       if (system("ikiwiki-update-wikilist") != 0) {
+               print STDERR "** Failed to add you to the system wikilist file.\n";
+               print STDERR "** (Probably ikiwiki-update-wikilist is not SUID root.)\n";
+               print STDERR "** Your wiki will not be automatically updated when ikiwiki is upgraded.\n";

        }
        }

-
+       

        # Done!
        # Done!

-       print "\n\nSuccessfully set up $setup{wikiname}:\n";
-       foreach my $key (qw{url srcdir destdir repository setupfile}) {
-               next unless exists $setup{$key};
-               my $value=$setup{$key};
-               $value=~s/^\Q$ENV{HOME}\E\//~\//;
-               print "\t$key: ".(" " x (10 - length($key)))." $value\n";
+       print "\n\nSuccessfully set up $config{wikiname}:\n";
+       foreach my $key (qw{url srcdir destdir repository}) {
+               next unless exists $config{$key};
+               print "\t$key: ".(" " x (10 - length($key)))." ".
+                       prettydir($config{$key})."\n";

        }
        }

+       print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
+       print " ikiwiki -setup ".prettydir($config{dumpsetup})."\n";

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