sub printheader ($) {
my $session=shift;
- if ($config{sslcookie}) {
+ if (($ENV{HTTPS} && lc $ENV{HTTPS} ne "off") || $config{sslcookie}) {
print $session->header(-charset => 'utf-8',
-cookie => $session->cookie(-httponly => 1, -secure => 1));
}
my $cgi=shift;
printheader($session);
- print misctemplate($form->title, $form->render(submit => $buttons), @_);
+ print cgitemplate($cgi, $form->title,
+ $form->render(submit => $buttons), @_);
+}
+
+sub cgitemplate ($$$;@) {
+ my $cgi=shift;
+ my $title=shift;
+ my $content=shift;
+ my %params=@_;
+
+ my $template=template("page.tmpl");
+
+ my $page="";
+ if (exists $params{page}) {
+ $page=delete $params{page};
+ $params{forcebaseurl}=urlto($page);
+ }
+ run_hooks(pagetemplate => sub {
+ shift->(
+ page => $page,
+ destpage => $page,
+ template => $template,
+ );
+ });
+ templateactions($template, "");
+
+ my $baseurl = baseurl();
+
+ $template->param(
+ dynamic => 1,
+ title => $title,
+ wikiname => $config{wikiname},
+ content => $content,
+ baseurl => $baseurl,
+ html5 => $config{html5},
+ %params,
+ );
+
+ return $template->output;
}
sub redirect ($$) {
my $q=shift;
eval q{use URI};
- my $url=URI->new(shift);
+
+ my $topurl = $config{cgiurl};
+ if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
+ $topurl = $q->url;
+ }
+
+ my $url=URI->new(urlabs(shift, $topurl));
if (! $config{w3mmode}) {
print $q->redirect($url);
}
if ($] < 5.01) {
my $cgi = shift;
foreach my $f ($cgi->param) {
- $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+ $cgi->param($f, map { decode_utf8 $_ }
+ @{$cgi->param_fetch($f)});
}
}
}
+sub safe_decode_utf8 ($) {
+ my $octets = shift;
+ if (!Encode::is_utf8($octets)) {
+ return decode_utf8($octets);
+ }
+ else {
+ return $octets;
+ }
+}
+
sub decode_form_utf8 ($) {
if ($] >= 5.01) {
my $form = shift;
foreach my $f ($form->field) {
- my @value=map { decode_utf8($_) } $form->field($f);
+ my @value=map { safe_decode_utf8($_) } $form->field($f);
$form->field(name => $f,
value => \@value,
force => 1,
my $q=shift;
my $session=shift;
- if (! defined $session->param("name") ||
+ if (! length $session->param("name") ||
! userinfo_get($session->param("name"), "regdate")) {
- $session->param(postsignin => $ENV{QUERY_STRING});
+ $session->param(postsignin => $q->query_string);
cgi_signin($q, $session);
cgi_savesession($session);
exit;
required => 'NONE',
javascript => 0,
params => $q,
- action => $config{cgiurl},
+ action => cgiurl(),
header => 0,
template => {type => 'div'},
stylesheet => 1,
error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"));
}
else {
- error(gettext("login failed, perhaps you need to turn on cookies?"));
+ error(gettext("Login succeeded, but I don't remember why you were logging in, so you'll have to navigate back to whatever you were doing. (This should not normally happen. Perhaps you need to enable cookies?)"));
}
}
}
required => 'NONE',
javascript => 0,
params => $q,
- action => $config{cgiurl},
+ action => cgiurl(),
template => {type => 'div'},
stylesheet => 1,
fieldsets => [
return;
}
elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
- if (defined $form->field('email')) {
- userinfo_set($user_name, 'email', $form->field('email')) ||
+ my $email = $form->field('email');
+ if (defined $email) {
+ userinfo_set($user_name, 'email', $email) ||
error("failed to set email");
}
my $banned=0;
my $name=$session->param("name");
+ my $cloak=cloak($name) if defined $name;
if (defined $name &&
- grep { $name eq $_ } @{$config{banned_users}}) {
+ grep { $name eq $_ || $cloak eq $_ } @{$config{banned_users}}) {
$banned=1;
}
foreach my $b (@{$config{banned_users}}) {
if (pagespec_match("", $b,
ip => $session->remote_addr(),
- name => defined $name ? $name : "",
- )) {
+ name => defined $name ? $name : "")
+ || pagespec_match("", $b,
+ ip => cloak($session->remote_addr()),
+ name => defined $cloak ? $cloak : "")) {
$banned=1;
last;
}
{ FileName => "$config{wikistatedir}/sessions.db" })
};
if (! $session || $@) {
- error($@." ".CGI::Session->errstr());
+ my $error = $@;
+ error($error." ".CGI::Session->errstr());
}
umask($oldmask);
if (defined $session->param("name")) {
my $sid=$q->param('sid');
- if (! defined $sid || $sid ne $session->id) {
+ if (! defined $sid || $sid ne $session->id || ! length $session->param("name")) {
error(gettext("Your login session has expired."));
}
}
eval q{use CGI};
error($@) if $@;
+ no warnings "once";
$CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
+ use warnings;
if (! $q) {
binmode(STDIN);
}
# Auth hooks can sign a user in.
- if ($do ne 'signin' && ! defined $session->param("name")) {
+ if ($do ne 'signin' && ! length $session->param("name")) {
run_hooks(auth => sub {
shift->($q, $session)
});
- if (defined $session->param("name")) {
+ if (length $session->param("name")) {
# Make sure whatever user was authed is in the
# userinfo db.
if (! userinfo_get($session->param("name"), "regdate")) {
userinfo_setall($session->param("name"), {
- email => "",
+ email => defined $session->param("email") ? $session->param("email") : "",
password => "",
regdate => time,
}) || error("failed adding user");
sub cgierror ($) {
my $message=shift;
+ eval q{use HTML::Entities};
+ $message = encode_entities($message);
+
print "Content-type: text/html\n\n";
- print misctemplate(gettext("Error"),
+ print cgitemplate(undef, gettext("Error"),
"<p class=\"error\">".gettext("Error").": $message</p>");
- die $@;
+
+ die $message;
}
1