passwordauth: avoid userinfo forgery via repeated email parameter

[git.ikiwiki.info.git] / IkiWiki / Plugin / 404.pm

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index bae9e15d1a67ea8705626d69dc69cdc486e68306..42cfa9e8aad04fc69b050df92b38a18905a33495 100644 (file)
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "cgi", id => '404',  call => \&cgi);
 
 sub import {
        hook(type => "cgi", id => '404',  call => \&cgi);

+       hook(type => "getsetup", id => '404',  call => \&getsetup);

        IkiWiki::loadplugin("goto");
 }
 
        IkiWiki::loadplugin("goto");
 }
 


@@ -21,6 +22,7 @@ sub getsetup () {
                        # server admin action too
                        safe => 0,
                        rebuild => 0,
                        # server admin action too
                        safe => 0,
                        rebuild => 0,

+                       section => "web",

                }
 }
 
                }
 }
 


@@ -69,7 +71,8 @@ sub cgi ($) {
 
        if (exists $ENV{REDIRECT_STATUS} && 
            $ENV{REDIRECT_STATUS} eq '404') {
 
        if (exists $ENV{REDIRECT_STATUS} && 
            $ENV{REDIRECT_STATUS} eq '404') {

-               my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+               my $page = cgi_page_from_404(
+                       Encode::decode_utf8($ENV{REDIRECT_URL}),

                        $config{url}, $config{usedirs});
                IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
        }
                        $config{url}, $config{usedirs});
                IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
        }