allow multiple setup file types, and support safe parsing

Finally removed the last hardcoding of IkiWiki::Setup::Standard.
Take the first "IkiWiki::Setup::*" in the setup file to define the
setuptype, and remember that type to use in dumping later. (But it can be
overridden using --set, etc.)

Also, support setup file types that are not evaled.
master
Joey Hess 2010-03-19 14:52:17 -04:00
parent 6dc6fe2f9b
commit b1dade8d96
3 changed files with 39 additions and 12 deletions

View File

@ -467,6 +467,13 @@ sub getsetup () {
safe => 0,
rebuild => 0,
},
setuptype => {
type => "internal",
default => "IkiWiki::Setup::Standard",
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
},
allow_symlinks_before_srcdir => {
type => "boolean",
default => 0,

View File

@ -1,6 +1,8 @@
#!/usr/bin/perl
# Ikiwiki setup files are perl files that 'use IkiWiki::Setup::foo',
# passing it some sort of configuration data.
# Ikiwiki setup files can be perl files that 'use IkiWiki::Setup::foo',
# passing it some sort of configuration data. Or, they can contain
# the module name at the top, without the 'use', and the whole file is
# then fed into that module.
package IkiWiki::Setup;
@ -10,25 +12,40 @@ use IkiWiki;
use open qw{:utf8 :std};
use File::Spec;
sub load ($) {
sub load ($;$) {
my $setup=IkiWiki::possibly_foolish_untaint(shift);
my $safemode=shift;
$config{setupfile}=File::Spec->rel2abs($setup);
#translators: The first parameter is a filename, and the second
#translators: is a (probably not translated) error message.
open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
my $code;
my $content;
{
local $/=undef;
$code=<IN> || error("$setup: $!");
$content=<IN> || error("$setup: $!");
}
($code)=$code=~/(.*)/s;
close IN;
eval $code;
if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
$config{setuptype}=$2;
if ($1) {
error sprintf(gettext("cannot load %s in safe mode"), $setup)
if $safemode;
eval IkiWiki::possibly_foolish_untaint($content);
error("$setup: ".$@) if $@;
}
else {
eval qq{require $config{setuptype}};
error $@ if $@;
$config{setuptype}->loaddump(IkiWiki::possibly_foolish_untaint($content));
}
}
else {
error sprintf(gettext("failed to parse %s"), $setup);
}
}
sub merge ($) {
# Merge setup into existing config and untaint.
@ -133,8 +150,9 @@ sub getsetup () {
sub dump ($) {
my $file=IkiWiki::possibly_foolish_untaint(shift);
require IkiWiki::Setup::Standard;
my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
eval qq{require $config{setuptype}};
error $@ if $@;
my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
open (OUT, ">", $file) || die "$file: $!";
print OUT "$_\n" foreach @dump;

View File

@ -82,8 +82,10 @@ sub dumpvalues ($@) {
return @ret;
}
sub gendump ($) {
sub gendump ($$) {
my $class=shift;
my $description=shift;
my %setup=(%config);
my @ret;