]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/CGI.pm
(no commit message)
[git.ikiwiki.info.git] / IkiWiki / CGI.pm
index 04f24b04f986c2618b0cbf619e09ba7dfbff58ee..cb83319e62ee893d92fd1d5f64695c23144d2614 100644 (file)
@@ -12,16 +12,17 @@ use Encode;
 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));
-       } else {
+       }
+       else {
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1));
        }
 }
 
-sub showform ($$$$;@) {
+sub prepform {
        my $form=shift;
        my $buttons=shift;
        my $session=shift;
@@ -34,13 +35,62 @@ sub showform ($$$$;@) {
                });
        }
 
+       return $form;
+}
+
+sub showform ($$$$;@) {
+       my $form=prepform(@_);
+       shift;
+       my $buttons=shift;
+       my $session=shift;
+       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 $topurl = defined $cgi ? $cgi->url : $config{url};
+
+       my $page="";
+       if (exists $params{page}) {
+               $page=delete $params{page};
+               $params{forcebaseurl}=urlabs(urlto($page), $topurl);
+       }
+       run_hooks(pagetemplate => sub {
+               shift->(
+                       page => $page,
+                       destpage => $page,
+                       template => $template,
+               );
+       });
+       templateactions($template, "");
+
+       $template->param(
+               dynamic => 1,
+               title => $title,
+               wikiname => $config{wikiname},
+               content => $content,
+               baseurl => urlabs(baseurl(), $topurl),
+               html5 => $config{html5},
+               %params,
+       );
+       
+       return $template->output;
 }
 
 sub redirect ($$) {
        my $q=shift;
-       my $url=shift;
+       eval q{use URI};
+       my $url=URI->new(urlabs(shift, $q->url));
        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }
@@ -51,7 +101,7 @@ sub redirect ($$) {
 }
 
 sub decode_cgi_utf8 ($) {
-       # decode_form_utf8 method is needed for 5.10
+       # decode_form_utf8 method is needed for 5.01
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
@@ -60,12 +110,25 @@ sub decode_cgi_utf8 ($) {
        }
 }
 
+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)) {
+        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 { safe_decode_utf8($_) } $form->field($f);
                        $form->field(name  => $f,
-                                    value => decode_utf8($form->field($f)),
+                                    value => \@value,
                                     force => 1,
                        );
                }
@@ -80,16 +143,17 @@ sub needsignin ($$) {
 
        if (! defined $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;
        }
 }
 
-sub cgi_signin ($$) {
+sub cgi_signin ($$;$) {
        my $q=shift;
        my $session=shift;
+       my $returnhtml=shift;
 
        decode_cgi_utf8($q);
        eval q{use CGI::FormBuilder};
@@ -102,16 +166,13 @@ sub cgi_signin ($$) {
                required => 'NONE',
                javascript => 0,
                params => $q,
-               action => $config{cgiurl},
+               action => cgiurl(),
                header => 0,
                template => {type => 'div'},
-               stylesheet => baseurl()."style.css",
+               stylesheet => 1,
        );
        my $buttons=["Login"];
        
-       if ($q->param("do") ne "signin" && !$form->submitted) {
-               $form->text(gettext("You need to log in first."));
-       }
        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        
@@ -126,6 +187,11 @@ sub cgi_signin ($$) {
                $form->validate;
        }
 
+       if ($returnhtml) {
+               $form=prepform($form, $buttons, $session, $q);
+               return $form->render(submit => $buttons);
+       }
+
        showform($form, $buttons, $session, $q);
 }
 
@@ -143,7 +209,7 @@ sub cgi_postsignin ($$) {
        }
        else {
                if ($config{sslcookie} && ! $q->https()) {
-                       error(gettext("probable misconfiguration: sslcookie is set, but you are attepting to login via http, not https"));
+                       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?"));
@@ -182,9 +248,9 @@ sub cgi_prefs ($$) {
                required => 'NONE',
                javascript => 0,
                params => $q,
-               action => $config{cgiurl},
+               action => cgiurl(),
                template => {type => 'div'},
-               stylesheet => baseurl()."style.css",
+               stylesheet => 1,
                fieldsets => [
                        [login => gettext("Login")],
                        [preferences => gettext("Preferences")],
@@ -215,11 +281,11 @@ sub cgi_prefs ($$) {
        
        if ($form->submitted eq 'Logout') {
                $session->delete();
-               redirect($q, $config{url});
+               redirect($q, baseurl(undef));
                return;
        }
        elsif ($form->submitted eq 'Cancel') {
-               redirect($q, $config{url});
+               redirect($q, baseurl(undef));
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
@@ -231,14 +297,20 @@ sub cgi_prefs ($$) {
                $form->text(gettext("Preferences saved."));
        }
        
-       showform($form, $buttons, $session, $q);
+       showform($form, $buttons, $session, $q,
+               prefsurl => "", # avoid showing the preferences link
+       );
 }
 
-sub cgi_custom_failure ($$) {
-       my $header=shift;
+sub cgi_custom_failure ($$$) {
+       my $q=shift;
+       my $httpstatus=shift;
        my $message=shift;
 
-       print $header;
+       print $q->header(
+               -status => $httpstatus,
+               -charset => 'utf-8',
+       );
        print $message;
 
        # Internet Explod^Hrer won't show custom 404 responses
@@ -252,16 +324,30 @@ sub check_banned ($$) {
        my $q=shift;
        my $session=shift;
 
+       my $banned=0;
        my $name=$session->param("name");
-       if (defined $name) {
-               if (grep { $name eq $_ } @{$config{banned_users}}) {
-                       $session->delete();
-                       cgi_savesession($session);
-                       cgi_custom_failure(
-                               $q->header(-status => "403 Forbidden"),
-                               gettext("You are banned."));
+       if (defined $name && 
+           grep { $name eq $_ } @{$config{banned_users}}) {
+               $banned=1;
+       }
+
+       foreach my $b (@{$config{banned_users}}) {
+               if (pagespec_match("", $b,
+                       ip => $session->remote_addr(),
+                       name => defined $name ? $name : "",
+               )) {
+                       $banned=1;
+                       last;
                }
        }
+
+       if ($banned) {
+               $session->delete();
+               cgi_savesession($session);
+               cgi_custom_failure(
+                       $q, "403 Forbidden",
+                       gettext("You are banned."));
+       }
 }
 
 sub cgi_getsession ($) {
@@ -277,7 +363,8 @@ sub cgi_getsession ($) {
                        { FileName => "$config{wikistatedir}/sessions.db" })
        };
        if (! $session || $@) {
-               error($@." ".CGI::Session->errstr());
+               my $error = $@;
+               error($error." ".CGI::Session->errstr());
        }
        
        umask($oldmask);
@@ -355,7 +442,7 @@ sub cgi (;$$) {
                        # 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");
@@ -387,7 +474,7 @@ sub cgierror ($) {
        my $message=shift;
 
        print "Content-type: text/html\n\n";
-       print misctemplate(gettext("Error"),
+       print cgitemplate(undef, gettext("Error"),
                "<p class=\"error\">".gettext("Error").": $message</p>");
        die $@;
 }