(no commit message)

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f448db6ef8a213fa84d57f72ad236569c510d304..2c5b4a84d13ea5e36673f242ed30e51b7f441eab 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,18 +58,10 @@ sub cgitemplate ($$$;@) {
        
        my $template=template("page.tmpl");
 
        
        my $template=template("page.tmpl");
 

-       my $topurl = $config{url};
-       if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) {
-               $topurl = $cgi->url;
-       }
-

        my $page="";
        if (exists $params{page}) {
                $page=delete $params{page};
                $params{forcebaseurl}=urlto($page);
        my $page="";
        if (exists $params{page}) {
                $page=delete $params{page};
                $params{forcebaseurl}=urlto($page);

-               if (! $config{html5}) {
-                       $params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
-               }

        }
        run_hooks(pagetemplate => sub {
                shift->(
        }
        run_hooks(pagetemplate => sub {
                shift->(


@@ -81,9 +73,6 @@ sub cgitemplate ($$$;@) {
        templateactions($template, "");
 
        my $baseurl = baseurl();
        templateactions($template, "");
 
        my $baseurl = baseurl();

-       if (! $config{html5}) {
-               $baseurl = urlabs($baseurl, $topurl),
-       }

 
        $template->param(
                dynamic => 1,
 
        $template->param(
                dynamic => 1,


@@ -102,7 +91,7 @@ sub redirect ($$) {
        my $q=shift;
        eval q{use URI};
 
        my $q=shift;
        eval q{use URI};
 

-       my $topurl;
+       my $topurl = $config{cgiurl};

        if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
                $topurl = $q->url;
        }
        if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
                $topurl = $q->url;
        }


@@ -130,9 +119,7 @@ sub decode_cgi_utf8 ($) {
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;

-    # call decode_utf8 on >= 5.20 only if it's not already decoded,
-    # otherwise it balks, on < 5.20, always call it
-    if ($] < 5.02 || !Encode::is_utf8($octets)) {
+    if (!Encode::is_utf8($octets)) {

         return decode_utf8($octets);
     }
     else {
         return decode_utf8($octets);
     }
     else {


@@ -159,7 +146,7 @@ sub needsignin ($$) {
        my $q=shift;
        my $session=shift;
 
        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 => $q->query_string);
                cgi_signin($q, $session);
            ! userinfo_get($session->param("name"), "regdate")) {
                $session->param(postsignin => $q->query_string);
                cgi_signin($q, $session);


@@ -230,7 +217,7 @@ sub cgi_postsignin ($$) {
                        error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"));
                }
                else {
                        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?)"));

                }
        }
 }
                }
        }
 }


@@ -307,8 +294,9 @@ sub cgi_prefs ($$) {
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
                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");
                }
 
                                error("failed to set email");
                }
 


@@ -344,16 +332,19 @@ sub check_banned ($$) {
 
        my $banned=0;
        my $name=$session->param("name");
 
        my $banned=0;
        my $name=$session->param("name");

+       my $cloak=cloak($name) if defined $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(),
                $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;
                }
                        $banned=1;
                        last;
                }


@@ -400,7 +391,7 @@ sub checksessionexpiry ($$) {
 
        if (defined $session->param("name")) {
                my $sid=$q->param('sid');
 
        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."));
                }
        }
                        error(gettext("Your login session has expired."));
                }
        }


@@ -421,7 +412,9 @@ sub cgi (;$$) {
 
        eval q{use CGI};
        error($@) if $@;
 
        eval q{use CGI};
        error($@) if $@;

+       no warnings "once";

        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};

+       use warnings;

 
        if (! $q) {
                binmode(STDIN);
 
        if (! $q) {
                binmode(STDIN);


@@ -451,11 +444,11 @@ sub cgi (;$$) {
        }
        
        # Auth hooks can sign a user in.
        }
        
        # 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)
                });
                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")) {
                        # Make sure whatever user was authed is in the
                        # userinfo db.
                        if (! userinfo_get($session->param("name"), "regdate")) {


@@ -491,10 +484,14 @@ sub cgi (;$$) {
 sub cgierror ($) {
        my $message=shift;
 
 sub cgierror ($) {
        my $message=shift;
 

+       eval q{use HTML::Entities};
+       $message = encode_entities($message);
+

        print "Content-type: text/html\n\n";
        print cgitemplate(undef, gettext("Error"),
                "<p class=\"error\">".gettext("Error").": $message</p>");
        print "Content-type: text/html\n\n";
        print cgitemplate(undef, gettext("Error"),
                "<p class=\"error\">".gettext("Error").": $message</p>");

-       die $@;
+
+       die $message;

 }
 
 1
 }
 
 1