Changelog

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b6642619ac29330944da4af8b3e3c90ffcf21e9a..384af7e98965d520f58bd21ee87ccaceaa16ba48 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -100,9 +100,10 @@ sub formbuilder_setup (@) {
               IkiWiki::openiduser($session->param("name"))) {
                $form->field(name => "openid_identifier", disabled => 1,
                        label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
-                       value => $session->param("name"), 
-                       size => length($session->param("name")), force => 1,
-                       fieldset => "login");
+                       value => "", 
+                       size => 1, force => 1,
+                       fieldset => "login",
+                       comment => $session->param("name"));
                $form->field(name => "email", type => "hidden");
        }
 }
@@ -118,7 +119,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 {
@@ -155,8 +158,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
@@ -222,7 +225,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'));
        }
 }
 
@@ -237,10 +240,10 @@ sub getobj ($$) {
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {
-               $ua=LWPx::ParanoidAgent->new;
+               $ua=LWPx::ParanoidAgent->new(agent => $config{useragent});
        }
        else {
-               $ua=LWP::UserAgent->new;
+               $ua=useragent();
        }
 
        # Store the secret in the session.
@@ -257,10 +260,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};