X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b8dcaf91d02c1d8754032c60f8d713261dafffe4..7481329bdd11d81c4b3e85a446ab1e4bfcc298c8:/IkiWiki/Plugin/openid.pm?ds=inline

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index d75099ce9..fae9fb77f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -40,6 +40,18 @@ sub getsetup () {
 			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 {
@@ -62,17 +74,13 @@ sub openid_selector {
 			$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) : ()),
-		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
+		($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
 	);
 
 	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(
-		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
@@ -173,12 +187,17 @@ sub auth ($$) {
 					$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});
+						if (! defined $nickname &&
+						    $ext->{$field}=~/(.+)@.+/) {
+							$nickname = $1;
+						}
 						last;
 					}
 				}
@@ -186,11 +205,15 @@ sub auth ($$) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
-						$session->param(username => $ext->{$field});
+						$nickname=$ext->{$field};
 						last;
 					}
 				}
 			}
+			if (defined $nickname) {
+				$session->param(nickname =>
+					Encode::decode_utf8($nickname));
+			}
 		}
 		else {
 			error("OpenID failure: ".$csr->err);
@@ -224,12 +247,15 @@ sub getobj ($$) {
 		$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 },
-		required_root => $config{cgiurl},
+		required_root => $cgiurl,
 	);
 }