useragent: Automatically choose whether to use LWPx::ParanoidAgent

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 40a9568499be29710966b8115f0286c99aa899f7..eb21955e9f0889f1c07f47c04e562931a8608a80 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,31 +7,18 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
-       add_underlay("openid-selector");
-       add_underlay("jquery");
-       hook(type => "checkconfig", id => "openid", call => \&checkconfig);
        hook(type => "getsetup", id => "openid", call => \&getsetup);
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",
                call => \&formbuilder_setup, last => 1);
-}
-
-sub checkconfig () {
-       if ($config{cgi}) {
-               # Intercept normal signin form, so the openid selector
-               # can be displayed.
-               # 
-               # When other auth hooks are registered, give the selector
-               # a reference to the normal signin form.
-               require IkiWiki::CGI;
-               my $real_cgi_signin;
-               if (keys %{$IkiWiki::hooks{auth}} > 1) {
-                       $real_cgi_signin=\&IkiWiki::cgi_signin;
-               }
-               inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-                       openid_selector($real_cgi_signin, @_);
-               });
-       }
+       IkiWiki::loadplugin("emailauth");
+       IkiWiki::loadplugin("loginselector");
+       IkiWiki::Plugin::loginselector::register_login_plugin(
+               "openid",
+               \&openid_setup,
+               \&openid_check_input,
+               \&openid_auth,
+       );
 }
 
 sub getsetup () {
@@ -55,38 +42,34 @@ sub getsetup () {
                },
 }
 
-sub openid_selector {
-       my $real_cgi_signin=shift;
-        my $q=shift;
-        my $session=shift;
-
-       my $openid_url=$q->param('openid_identifier');
-       my $openid_error;
+sub openid_setup ($$) {
+       my $q=shift;
+       my $template=shift;
 
-       if (! load_openid_module()) {
-               if ($real_cgi_signin) {
-                       $real_cgi_signin->($q, $session);
-                       exit;
+       if (load_openid_module()) {
+               my $openid_url=$q->param('openid_identifier');
+               if (defined $openid_url) {
+                       $template->param(openid_url => $openid_url);
                }
-               error(sprintf(gettext("failed to load openid module: "), @_));
+               return 1;
        }
-       elsif (defined $q->param("action") && $q->param("action") eq "verify") {
-               validate($q, $session, $openid_url, sub {
-                       $openid_error=shift;
-               });
+       else {
+               return 0;
        }
+}
 
-       my $template=IkiWiki::template("openid-selector.tmpl");
-       $template->param(
-               cgiurl => IkiWiki::cgiurl(),
-               (defined $openid_error ? (openid_error => $openid_error) : ()),
-               (defined $openid_url ? (openid_url => $openid_url) : ()),
-               ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
-       );
+sub openid_check_input ($) {
+       my $q=shift;
+       my $openid_url=$q->param('openid_identifier');
+       defined $q->param("action") && $q->param("action") eq "verify" && defined $openid_url && length $openid_url;
+}
 
-       IkiWiki::printheader($session);
-       print IkiWiki::cgitemplate($q, "signin", $template->output);
-       exit;
+sub openid_auth ($$$$) {
+       my $q=shift;
+       my $session=shift;
+       my $errordisplayer=shift;
+       my $openid_url=$q->param('openid_identifier');
+       validate($q, $session, $openid_url, $errordisplayer);
 }
 
 sub formbuilder_setup (@) {
@@ -104,7 +87,6 @@ sub formbuilder_setup (@) {
                        size => 1, force => 1,
                        fieldset => "login",
                        comment => $session->param("name"));
-               $form->field(name => "email", type => "hidden");
        }
 }
 
@@ -119,7 +101,9 @@ sub validate ($$$;$) {
        my $claimed_identity = $csr->claimed_identity($openid_url);
        if (! $claimed_identity) {
                if ($errhandler) {
-                       $errhandler->($csr->err);
+                       if (ref($errhandler) eq 'CODE') {
+                               $errhandler->($csr->err);
+                       }
                        return 0;
                }
                else {
@@ -156,8 +140,8 @@ sub validate ($$$;$) {
        $trust_root=$cgiurl if ! defined $trust_root;
 
        my $check_url = $claimed_identity->check_url(
-               return_to => "$cgiurl?do=postsignin",
-               trust_root => $trust_root,
+               return_to => auto_upgrade_https($q, "$cgiurl?do=postsignin"),
+               trust_root => auto_upgrade_https($q, $trust_root),
                delayed_return => 1,
        );
        # Redirect the user to the OpenID server, which will
@@ -223,7 +207,7 @@ sub auth ($$) {
        }
        elsif (defined $q->param('openid_identifier')) {
                # myopenid.com affiliate support
-               validate($q, $session, $q->param('openid_identifier'));
+               validate($q, $session, scalar $q->param('openid_identifier'));
        }
 }
 
@@ -235,14 +219,10 @@ sub getobj ($$) {
        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 
-       my $ua;
-       eval q{use LWPx::ParanoidAgent};
-       if (! $@) {
-               $ua=LWPx::ParanoidAgent->new;
-       }
-       else {
-               $ua=LWP::UserAgent->new;
-       }
+       # We pass the for_url parameter, even though it's undef, because
+       # that will make sure we crash if used with an older IkiWiki.pm
+       # that didn't automatically try to use LWPx::ParanoidAgent.
+       my $ua=useragent(for_url => undef);
 
        # Store the secret in the session.
        my $secret=$session->param("openid_secret");
@@ -258,10 +238,19 @@ sub getobj ($$) {
                ua => $ua,
                args => $q,
                consumer_secret => sub { return shift()+$secret },
-               required_root => $cgiurl,
+               required_root => auto_upgrade_https($q, $cgiurl),
        );
 }
 
+sub auto_upgrade_https {
+       my $q=shift;
+       my $url=shift;
+       if ($q->https()) {
+               $url=~s/^http:/https:/i;
+       }
+       return $url;
+}
+
 sub load_openid_module {
        # Give up if module is unavailable to avoid needing to depend on it.
        eval q{use Net::OpenID::Consumer};