Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e722c68ba8e49f2c5969d0d524acaf16cf1a0f3d..40a9568499be29710966b8115f0286c99aa899f7 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -8,8 +8,8 @@ use IkiWiki 3.00;
 
 sub import {
        add_underlay("openid-selector");
 
 sub import {
        add_underlay("openid-selector");

+       add_underlay("jquery");

        hook(type => "checkconfig", id => "openid", call => \&checkconfig);
        hook(type => "checkconfig", id => "openid", call => \&checkconfig);

-       hook(type => "getopt", id => "openid", call => \&getopt);

        hook(type => "getsetup", id => "openid", call => \&getsetup);
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",
        hook(type => "getsetup", id => "openid", call => \&getsetup);
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",


@@ -23,9 +23,9 @@ sub checkconfig () {
                # 
                # When other auth hooks are registered, give the selector
                # a reference to the normal signin form.
                # 
                # 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) {
                my $real_cgi_signin;
                if (keys %{$IkiWiki::hooks{auth}} > 1) {

-                       require IkiWiki::CGI;

                        $real_cgi_signin=\&IkiWiki::cgi_signin;
                }
                inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
                        $real_cgi_signin=\&IkiWiki::cgi_signin;
                }
                inject(name => "IkiWiki::cgi_signin", call => sub ($$) {


@@ -34,13 +34,6 @@ sub checkconfig () {
        }
 }
 
        }
 }
 

-sub getopt () {
-       eval q{use Getopt::Long};
-       error($@) if $@;
-       Getopt::Long::Configure('pass_through');
-       GetOptions("openidsignup=s" => \$config{openidsignup});
-}
-

 sub getsetup () {
        return
                plugin => {
 sub getsetup () {
        return
                plugin => {


@@ -48,11 +41,16 @@ sub getsetup () {
                        rebuild => 0,
                        section => "auth",
                },
                        rebuild => 0,
                        section => "auth",
                },

-               openidsignup => {
+               openid_realm => {

                        type => "string",
                        type => "string",

-                       example => "http://myopenid.com/",
-                       description => "an url where users can signup for an OpenID",
-                       safe => 1,
+                       description => "url pattern of openid realm (default is cgiurl)",
+                       safe => 0,
+                       rebuild => 0,
+               },
+               openid_cgiurl => {
+                       type => "string",
+                       description => "url to ikiwiki cgi to use for openid authentication (default is cgiurl)",
+                       safe => 0,

                        rebuild => 0,
                },
 }
                        rebuild => 0,
                },
 }


@@ -68,6 +66,7 @@ sub openid_selector {
        if (! load_openid_module()) {
                if ($real_cgi_signin) {
                        $real_cgi_signin->($q, $session);
        if (! load_openid_module()) {
                if ($real_cgi_signin) {
                        $real_cgi_signin->($q, $session);

+                       exit;

                }
                error(sprintf(gettext("failed to load openid module: "), @_));
        }
                }
                error(sprintf(gettext("failed to load openid module: "), @_));
        }


@@ -76,22 +75,17 @@ sub openid_selector {
                        $openid_error=shift;
                });
        }
                        $openid_error=shift;
                });
        }

-       elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
-               $real_cgi_signin->($q, $session);
-               exit;
-       }

 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(
 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(

-               cgiurl => $config{cgiurl},
+               cgiurl => IkiWiki::cgiurl(),

                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),

-               ($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
-               loginlabel => loginlabel(),
+               ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),

        );
 
        IkiWiki::printheader($session);
        );
 
        IkiWiki::printheader($session);

-       print IkiWiki::misctemplate("signin", $template->output);
+       print IkiWiki::cgitemplate($q, "signin", $template->output);

        exit;
 }
 
        exit;
 }
 


@@ -106,9 +100,10 @@ sub formbuilder_setup (@) {
               IkiWiki::openiduser($session->param("name"))) {
                $form->field(name => "openid_identifier", disabled => 1,
                        label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
               IkiWiki::openiduser($session->param("name"))) {
                $form->field(name => "openid_identifier", disabled => 1,
                        label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),

-                       value => $session->param("name"), 
-                       size => 50, force => 1,
-                       fieldset => "login");
+                       value => "", 
+                       size => 1, force => 1,
+                       fieldset => "login",
+                       comment => $session->param("name"));

                $form->field(name => "email", type => "hidden");
        }
 }
                $form->field(name => "email", type => "hidden");
        }
 }


@@ -154,9 +149,15 @@ sub validate ($$$;$) {
                );
        }
 
                );
        }
 

+       my $cgiurl=$config{openid_cgiurl};
+       $cgiurl=$q->url if ! defined $cgiurl;
+
+       my $trust_root=$config{openid_realm};
+       $trust_root=$cgiurl if ! defined $trust_root;
+

        my $check_url = $claimed_identity->check_url(
        my $check_url = $claimed_identity->check_url(

-               return_to => IkiWiki::cgiurl(do => "postsignin"),
-               trust_root => $config{cgiurl},
+               return_to => "$cgiurl?do=postsignin",
+               trust_root => $trust_root,

                delayed_return => 1,
        );
        # Redirect the user to the OpenID server, which will
                delayed_return => 1,
        );
        # Redirect the user to the OpenID server, which will


@@ -176,7 +177,7 @@ sub auth ($$) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {

-                       IkiWiki::redirect($q, $config{url});
+                       IkiWiki::redirect($q, IkiWiki::baseurl(undef));

                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);
                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);


@@ -188,12 +189,17 @@ sub auth ($$) {
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }

+                       my $nickname;

                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});
                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});

+                                               if (! defined $nickname &&
+                                                   $ext->{$field}=~/(.+)@.+/) {
+                                                       $nickname = $1;
+                                               }

                                                last;
                                        }
                                }
                                                last;
                                        }
                                }


@@ -201,11 +207,15 @@ sub auth ($$) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {

-                                               $session->param(username => $ext->{$field});
+                                               $nickname=$ext->{$field};

                                                last;
                                        }
                                }
                        }
                                                last;
                                        }
                                }
                        }

+                       if (defined $nickname) {
+                               $session->param(nickname =>
+                                       Encode::decode_utf8($nickname));
+                       }

                }
                else {
                        error("OpenID failure: ".$csr->err);
                }
                else {
                        error("OpenID failure: ".$csr->err);


@@ -221,6 +231,7 @@ sub getobj ($$) {
        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 

+       eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available

        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 
        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 


@@ -239,12 +250,15 @@ sub getobj ($$) {
                $secret=rand;
                $session->param(openid_secret => $secret);
        }
                $secret=rand;
                $session->param(openid_secret => $secret);
        }

+       
+       my $cgiurl=$config{openid_cgiurl};
+       $cgiurl=$q->url if ! defined $cgiurl;

 
        return Net::OpenID::Consumer->new(
                ua => $ua,
                args => $q,
                consumer_secret => sub { return shift()+$secret },
 
        return Net::OpenID::Consumer->new(
                ua => $ua,
                args => $q,
                consumer_secret => sub { return shift()+$secret },

-               required_root => $config{cgiurl},
+               required_root => $cgiurl,

        );
 }
 
        );
 }
 


@@ -258,8 +272,4 @@ sub load_openid_module {
        return 1;
 }
 
        return 1;
 }
 

-sub loginlabel {
-       return gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1);
-}
-

 1
 1