urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. Closes: #547378

master
Joey Hess 2009-09-23 13:46:32 -04:00
parent 82ad4f57d6
commit 01a9a12bbf
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IkiWiki/Setup/Automator.pm
View File

@ -24,16 +24,21 @@ sub prettydir ($) {
return $dir;
}
sub sanitize_wikiname ($) {
my $wikiname=shift;
# Sanitize this to avoid problimatic directory names.
$wikiname=~s/[^-A-Za-z0-9_]//g;
if (! length $wikiname) {
error gettext("you must enter a wikiname (that contains alphanumerics)");
}
return $wikiname;
}
sub import (@) {
my $this=shift;
IkiWiki::Setup::merge({@_});
# Sanitize this to avoid problimatic directory names.
$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.
foreach my $key (qw{srcdir destdir repository dumpsetup}) {
next unless exists $config{$key};

15
auto-blog.setup
View File

@ -15,6 +15,7 @@ require IkiWiki::Setup::Automator;
our $wikiname=IkiWiki::Setup::Automator::ask(
gettext("What will the blog be named?"), gettext("blog"));
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
our $rcs=IkiWiki::Setup::Automator::ask(
gettext("What revision control system to use?"), "git");
our $admin=IkiWiki::Setup::Automator::ask(
@ -27,13 +28,13 @@ IkiWiki::Setup::Automator->import(
wikiname => $wikiname,
adminuser => [$admin],
rcs => $rcs,
srcdir => "$ENV{HOME}/$wikiname",
destdir => "$ENV{HOME}/public_html/$wikiname",
repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
dumpsetup => "$ENV{HOME}/$wikiname.setup",
url => "http://$domain/~$ENV{USER}/$wikiname",
cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
srcdir => "$ENV{HOME}/$wikiname_short",
destdir => "$ENV{HOME}/public_html/$wikiname_short",
repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
url => "http://$domain/~$ENV{USER}/$wikiname_short",
cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
adminemail => "$ENV{USER}\@$domain",
add_plugins => [qw{goodstuff websetup comments blogspam}],
disable_plugins => [qw{}],

15
auto.setup
View File

@ -14,6 +14,7 @@ require IkiWiki::Setup::Automator;
our $wikiname=IkiWiki::Setup::Automator::ask(
gettext("What will the wiki be named?"), gettext("wiki"));
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
our $rcs=IkiWiki::Setup::Automator::ask(
gettext("What revision control system to use?"), "git");
our $admin=IkiWiki::Setup::Automator::ask(
@ -26,13 +27,13 @@ IkiWiki::Setup::Automator->import(
wikiname => $wikiname,
adminuser => [$admin],
rcs => $rcs,
srcdir => "$ENV{HOME}/$wikiname",
destdir => "$ENV{HOME}/public_html/$wikiname",
repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
dumpsetup => "$ENV{HOME}/$wikiname.setup",
url => "http://$domain/~$ENV{USER}/$wikiname",
cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
srcdir => "$ENV{HOME}/$wikiname_short",
destdir => "$ENV{HOME}/public_html/$wikiname_short",
repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
url => "http://$domain/~$ENV{USER}/$wikiname_short",
cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
adminemail => "$ENV{USER}\@$domain",
add_plugins => [qw{goodstuff websetup}],
disable_plugins => [qw{}],

2
debian/changelog vendored
View File

@ -14,6 +14,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
* Updated Czech translation from Miroslav Kure. Closes: #546223
* rsync: New plugin that allows pushing the destdir to a remote host
via rsync or similar. Thanks, Amitai Schlair.
* auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
Closes: #547378
-- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400