stop using REMOTE_ADDR

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index d75099ce9c0baa4e3127f442f9ba38d9157aced9..f4ba8db189c8bcb6e0c3592c55fee760430c73c8 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -40,6 +40,18 @@ 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 {
 }
 
 sub openid_selector {


@@ -62,17 +74,13 @@ 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(
                cgiurl => $config{cgiurl},
                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
 
        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")) : ()),
+               ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),

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


@@ -139,9 +147,15 @@ sub validate ($$$;$) {
                );
        }
 
                );
        }
 

+       my $cgiurl=$config{openid_cgiurl};
+       $cgiurl=$config{cgiurl} 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


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

+       
+       my $cgiurl=$config{openid_cgiurl};
+       $cgiurl=$config{cgiurl} 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,

        );
 }
 
        );
 }