X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ec965fc92cd41f597c6e8e88584b9a688407c8c6..618bbaee3815daffe329fc1e2d77f04fcd8392b8:/IkiWiki/Plugin/openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index dc0e0f48e..9355cd85a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,6 +26,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		openidsignup => {
 			type => "string",
@@ -56,7 +57,7 @@ sub formbuilder_setup (@) {
 		# OpenID fieldset.
 		$form->fieldsets("OpenID");
 
- 		$form->field(
+		$form->field(
 			name => "openid_url",
 			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			fieldset => "OpenID",
@@ -82,13 +83,14 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences") {
-		if (! defined $form->field(name => "name")) {
-			$form->field(name => "OpenID", disabled => 1,
-				value => $session->param("name"), 
-				size => 50, force => 1,
-				fieldset => "login");
-		}
+	elsif ($form->title eq "preferences" &&
+	       IkiWiki::openiduser($session->param("name"))) {
+		$form->field(name => "openid_url", disabled => 1,
+			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			value => $session->param("name"), 
+			size => 50, force => 1,
+			fieldset => "login");
+		$form->field(name => "email", type => "hidden");
 	}
 }
 
@@ -112,6 +114,26 @@ sub validate ($$$;$) {
 		}
 	}
 
+	# Ask for client to provide a name and email, if possible.
+	# Try sreg and ax
+	$claimed_identity->set_extension_args(
+		'http://openid.net/extensions/sreg/1.1',
+		{
+			optional => 'email,fullname,nickname',
+		},
+	);
+	$claimed_identity->set_extension_args(
+		'http://openid.net/srv/ax/1.0',
+		{
+			mode => 'fetch_request',
+			'required' => 'email,fullname,nickname,firstname',
+			'type.email' => "http://schema.openid.net/contact/email",
+			'type.fullname' => "http://axschema.org/namePerson",
+			'type.nickname' => "http://axschema.org/namePerson/friendly",
+			'type.firstname' => "http://axschema.org/namePerson/first",
+		},
+	);
+
 	my $check_url = $claimed_identity->check_url(
 		return_to => IkiWiki::cgiurl(do => "postsignin"),
 		trust_root => $config{cgiurl},
@@ -138,6 +160,29 @@ sub auth ($$) {
 		}
 		elsif (my $vident = $csr->verified_identity) {
 			$session->param(name => $vident->url);
+
+			my @extensions=grep { defined } (
+				$vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'),
+				$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
+			);
+			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});
+						last;
+					}
+				}
+				foreach my $field (qw{value.nickname nickname value.fullname fullname value.firstname}) {
+					if (exists $ext->{$field} &&
+					    defined $ext->{$field} &&
+					    length $ext->{$field}) {
+						$session->param(username => $ext->{$field});
+						last;
+					}
+				}
+			}
 		}
 		else {
 			error("OpenID failure: ".$csr->err);