cloak user PII when making commits etc, and let cloaked PII be used in banned_users

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index d75099ce9c0baa4e3127f442f9ba38d9157aced9..cc4b4ba3d4949c737d0d2139729a25c971743ff1 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,30 +7,17 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
 use IkiWiki 3.00;
 
 sub import {

-       add_underlay("openid-selector");
-       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);
        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("loginselector");
+       IkiWiki::Plugin::loginselector::register_login_plugin(
+               "openid",
+               \&openid_setup,
+               \&openid_check_input,
+               \&openid_auth,
+       );

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -40,44 +27,48 @@ sub getsetup () {
                        rebuild => 0,
                        section => "auth",
                },
                        rebuild => 0,
                        section => "auth",
                },

+               openid_realm => {
+                       type => "string",
+                       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,
+               },

 }
 
 }
 

-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;
-               });
-       }
-       elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
-               $real_cgi_signin->($q, $session);
-               exit;
+       else {
+               return 0;

        }
        }

+}

 
 

-       my $template=IkiWiki::template("openid-selector.tmpl");
-       $template->param(
-               cgiurl => $config{cgiurl},
-               (defined $openid_error ? (openid_error => $openid_error) : ()),
-               (defined $openid_url ? (openid_url => $openid_url) : ()),
-               ($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
-       );
+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::misctemplate("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 (@) {
 }
 
 sub formbuilder_setup (@) {


@@ -91,10 +82,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 => length($session->param("name")), force => 1,
-                       fieldset => "login");
-               $form->field(name => "email", type => "hidden");
+                       value => "", 
+                       size => 1, force => 1,
+                       fieldset => "login",
+                       comment => $session->param("name"));

        }
 }
 
        }
 }
 


@@ -109,7 +100,9 @@ sub validate ($$$;$) {
        my $claimed_identity = $csr->claimed_identity($openid_url);
        if (! $claimed_identity) {
                if ($errhandler) {
        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 {
                        return 0;
                }
                else {


@@ -139,9 +132,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 => 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
                delayed_return => 1,
        );
        # Redirect the user to the OpenID server, which will


@@ -161,7 +160,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);


@@ -173,12 +172,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;
                                        }
                                }


@@ -186,11 +190,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);


@@ -198,7 +206,7 @@ sub auth ($$) {
        }
        elsif (defined $q->param('openid_identifier')) {
                # myopenid.com affiliate support
        }
        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'));

        }
 }
 
        }
 }
 


@@ -206,16 +214,17 @@ 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 $@;
 
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {
        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {

-               $ua=LWPx::ParanoidAgent->new;
+               $ua=LWPx::ParanoidAgent->new(agent => $config{useragent});

        }
        else {
        }
        else {

-               $ua=LWP::UserAgent->new;
+               $ua=useragent();

        }
 
        # Store the secret in the session.
        }
 
        # Store the secret in the session.


@@ -224,15 +233,27 @@ 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 => 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};
 sub load_openid_module {
        # Give up if module is unavailable to avoid needing to depend on it.
        eval q{use Net::OpenID::Consumer};