Page MenuHomePhabricator
Files F6120

21810-patch-against-r62177.patch
Public
Actions

Authored By
• bzimport
Nov 21 2014, 10:50 PM
Size
13 KB
Referenced Files
None
Subscribers
None

21810-patch-against-r62177.patch
View Options

Index: SpecialOpenIDLogin.body.php
===================================================================
--- SpecialOpenIDLogin.body.php (revision 245)
+++ SpecialOpenIDLogin.body.php (working copy)
@@ -39,7 +39,7 @@
* @param $par String or null
*/
function execute( $par ) {
- global $wgRequest, $wgUser, $wgOut;
+ global $wgRequest, $wgUser, $wgOut, $wgOpenIDConsumerForce;
wfLoadExtensionMessages( 'OpenID' );
@@ -70,6 +70,9 @@
if ( !is_null( $openid_url ) && strlen( $openid_url ) > 0 ) {
$this->login( $openid_url, $this->getTitle( 'Finish' ) );
+ } else if (!is_null ( $wgOpenIDConsumerForce )) {
+ // if a forced OpenID provider specified, bypass the form
+ $this->login( $wgOpenIDConsumerForce, $this->getTitle( 'Finish' ) );
} else {
$this->loginForm();
}
@@ -167,7 +170,7 @@
* @param $sreg Array: options get from OpenID
* @param $messagekey String or null: message name to display at the top
*/
- function chooseNameForm( $openid, $sreg, $messagekey = null ) {
+ function chooseNameForm( $openid, $sreg, $ax, $messagekey = null ) {
global $wgOut, $wgOpenIDOnly, $wgAllowRealName;
if ( $messagekey ) {
@@ -255,14 +258,20 @@
}
# These options won't exist if we can't get them.
- if ( array_key_exists( 'fullname', $sreg ) && $this->userNameOK( $sreg['fullname'] ) ) {
+ if ( array_key_exists( 'fullname', $sreg ) )
+ $fullname = $sreg['fullname'];
+
+ if ( array_key_exists( 'http://axschema.org/namePerson/first', $ax ) || array_key_exists( 'http://axschema.org/namePerson/last', $ax ) )
+ $fullname = $ax['http://axschema.org/namePerson/first'][0] . " " . $ax['http://axschema.org/namePerson/last'][0];
+
+ if ( $fullname && $this->userNameOK( $fullname ) ) {
$wgOut->addHTML(
Xml::openElement( 'tr' ) .
Xml::tags( 'td', array( 'class' => 'mw-label' ),
Xml::radio( 'wpNameChoice', 'full', !$def, array( 'id' => 'wpNameChoiceFull' ) )
) .
Xml::tags( 'td', array( 'class' => 'mw-input' ),
- Xml::label( wfMsg( 'openidchoosefull', $sreg['fullname'] ), 'wpNameChoiceFull' )
+ Xml::label( wfMsg( 'openidchoosefull', $fullname ), 'wpNameChoiceFull' )
) .
Xml::closeElement( 'tr' ) . "\n"
);
@@ -325,7 +334,7 @@
function chooseName() {
global $wgRequest, $wgUser, $wgOut;
- list( $openid, $sreg ) = $this->fetchValues();
+ list( $openid, $sreg, $ax ) = $this->fetchValues();
if ( is_null( $openid ) ) {
wfDebug( "OpenID: aborting in ChooseName because identity_url is missing\n" );
$this->clearValues();
@@ -350,7 +359,7 @@
);
if ( !$user ) {
- $this->chooseNameForm( $openid, $sreg, 'wrongpassword' );
+ $this->chooseNameForm( $openid, $sreg, $ax, 'wrongpassword' );
return;
}
@@ -359,17 +368,17 @@
if ( $wgRequest->getCheck( 'wpUpdateUserInfo' . $option ) )
$force[] = $option;
}
- $this->updateUser( $user, $sreg );
+ $this->updateUser( $user, $sreg, $ax );
} else {
- $name = $this->getUserName( $openid, $sreg, $choice, $nameValue );
+ $name = $this->getUserName( $openid, $sreg, $ax, $choice, $nameValue );
if ( !$name || !$this->userNameOK( $name ) ) {
wfDebug( "OpenID: Name not OK: '$name'\n" );
- $this->chooseNameForm( $openid, $sreg );
+ $this->chooseNameForm( $openid, $sreg, $ax );
return;
}
- $user = $this->createUser( $openid, $sreg, $name );
+ $user = $this->createUser( $openid, $sreg, $ax, $name );
}
if ( is_null( $user ) ) {
@@ -392,7 +401,7 @@
* form
*/
function finish() {
- global $wgOut, $wgUser;
+ global $wgOut, $wgUser, $wgOpenIDUseEmailAsNickname;
wfSuppressWarnings();
$consumer = $this->getConsumer();
@@ -427,6 +436,8 @@
$sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse( $response );
$sreg = $sreg_resp->contents();
+ $ax_resp = Auth_OpenID_AX_FetchResponse::fromSuccessResponse( $response );
+ $ax = $ax_resp->data;
wfRestoreWarnings();
if ( is_null( $openid ) ) {
@@ -438,16 +449,25 @@
$user = self::getUser( $openid );
if ( $user instanceof User ) {
- $this->updateUser( $user, $sreg ); # update from server
+ $this->updateUser( $user, $sreg, $ax ); # update from server
$wgUser = $user;
$this->displaySuccessLogin( $openid );
} else {
- $this->saveValues( $openid, $sreg );
- $this->chooseNameForm( $openid, $sreg );
+ // if we are hardcoding nickname, and a valid e-mail address was returned, create a user with this name
+ if ($wgOpenIDUseEmailAsNickname) {
+ $name = $this->getNameFromEmail( $openid, $sreg, $ax );
+ if ($name) {
+ $wgUser = $this->createUser( $openid, $sreg, $ax, $name );
+ $this->displaySuccessLogin( $openid );
+ }
+ } else {
+ $this->saveValues( $openid, $sreg, $ax );
+ $this->chooseNameForm( $openid, $sreg, $ax );
return;
}
}
}
+ }
/**
* Update some user's settings with value get from OpenID
@@ -456,20 +476,26 @@
* @param $sreg Array of options get from OpenID
* @param $force forces update regardless of user preferences
*/
- function updateUser( $user, $sreg, $force = false ) {
+ function updateUser( $user, $sreg, $ax, $force = false ) {
global $wgAllowRealName, $wgEmailAuthentication;
// Nick name
if ( $this->updateOption( 'nickname', $user, $force ) ) {
- // FIXME: only update if there's been a change
- if ( array_key_exists( 'nickname', $sreg ) )
+ if ( array_key_exists( 'nickname', $sreg ) && $sreg['nickname'] != $user->getOption( 'nickname' ) ) {
$user->setOption( 'nickname', $sreg['nickname'] );
}
+ }
// E-mail
if ( $this->updateOption( 'email', $user, $force ) ) {
+ // first check SREG, then AX; if both, AX takes higher priority
if ( array_key_exists( 'email', $sreg ) ) {
$email = $sreg['email'];
+ }
+ if ( array_key_exists ( 'http://axschema.org/contact/email', $ax ) ) {
+ $email = $ax['http://axschema.org/contact/email'][0];
+ }
+ if ($email) {
// If email changed, then email a confirmation mail
if ( $email != $user->getEmail() ) {
$user->setEmail( $email );
@@ -488,6 +514,8 @@
if ( $wgAllowRealName && ( $this->updateOption( 'fullname', $user, $force ) ) ) {
if ( array_key_exists( 'fullname', $sreg ) )
$user->setRealName( $sreg['fullname'] );
+ if ( array_key_exists( 'http://axschema.org/namePerson/first', $ax ) || array_key_exists( 'http://axschema.org/namePerson/last', $ax ) )
+ $user->setRealName($ax['http://axschema.org/namePerson/first'][0] . " " . $ax['http://axschema.org/namePerson/last'][0]);
}
// Language
@@ -514,8 +542,8 @@
*/
private function updateOption( $option, User $user, $force ) {
return $force === true || ( is_array( $force ) && in_array( $option, $force ) ) ||
- $user->getOption( 'openid-update-userinfo-on-login-' . $option ) ||
- $user->getOption( 'openid-update-userinfo-on-login' ); // Back compat with old option
+ $user->getOption( 'openid-update-on-login-' . $option ) ||
+ $user->getOption( 'openid-update-on-login' ); // Back compat with old option
}
/**
@@ -546,7 +574,7 @@
$wgOut->returnToMain( false, $returnto, $returntoquery );
}
- function createUser( $openid, $sreg, $name ) {
+ function createUser( $openid, $sreg, $ax, $name ) {
global $wgAuth;
$user = User::newFromName( $name );
@@ -570,7 +598,7 @@
$ssUpdate->doUpdate();
self::addUserUrl( $user, $openid );
- $this->updateUser( $user, $sreg, true );
+ $this->updateUser( $user, $sreg, $ax, true );
$user->saveSettings();
return $user;
}
@@ -595,13 +623,19 @@
# Methods to get the user name
# ----------------------------
- function getUserName( $openid, $sreg, $choice, $nameValue ) {
+ function getUserName( $openid, $sreg, $ax, $choice, $nameValue ) {
switch ( $choice ) {
case 'nick':
return ( ( array_key_exists( 'nickname', $sreg ) ) ? $sreg['nickname'] : null );
break;
case 'full':
- return ( ( array_key_exists( 'fullname', $sreg ) ) ? $sreg['fullname'] : null );
+ # check the SREG first; only return a value if non-null
+ $fullname = ( ( array_key_exists( 'fullname', $sreg ) ) ? $sreg['fullname'] : null );
+ if (!is_null($fullname))
+ return $fullname;
+ # try AX
+ $fullname = ( ( array_key_exists( 'http://axschema.org/namePerson/first', $ax ) || array_key_exists( 'http://axschema.org/namePerson/last', $ax ) ) ? $ax['http://axschema.org/namePerson/first'][0] . " " . $ax['http://axschema.org/namePerson/last'][0] : null );
+ return $fullname;
break;
case 'url':
return $this->toUserName( $openid );
@@ -624,6 +658,23 @@
}
}
+ function getNameFromEmail($openid, $sreg, $ax) {
+
+ # return the part before the @ in the e-mail address;
+ # look at AX, then SREG.
+ if ( array_key_exists ( 'http://axschema.org/contact/email', $ax ) ) {
+ $addr=explode( "@", $ax['http://axschema.org/contact/email'][0] );
+ if ( $addr )
+ return $addr[0];
+ }
+
+ if ( array_key_exists( 'email', $sreg ) ) {
+ $addr=explode( "@", $sreg['email'] );
+ if ( $addr )
+ return $addr[0];
+ }
+ }
+
/**
* We try to use an OpenID URL as a legal MediaWiki user name in this order
* 1. Plain hostname, like http://evanp.myopenid.com/
@@ -722,11 +773,12 @@
# Session stuff
# -------------
- function saveValues( $response, $sreg ) {
+ function saveValues( $response, $sreg, $ax ) {
$this->setupSession();
$_SESSION['openid_consumer_response'] = $response;
$_SESSION['openid_consumer_sreg'] = $sreg;
+ $_SESSION['openid_consumer_ax'] = $ax;
return true;
}
@@ -734,13 +786,15 @@
function clearValues() {
unset( $_SESSION['openid_consumer_response'] );
unset( $_SESSION['openid_consumer_sreg'] );
+ unset( $_SESSION['openid_consumer_ax'] );
return true;
}
function fetchValues() {
$response = isset( $_SESSION['openid_consumer_response'] ) ? $_SESSION['openid_consumer_response'] : null;
$sreg = isset( $_SESSION['openid_consumer_sreg'] ) ? $_SESSION['openid_consumer_sreg'] : null;
- return array( $response, $sreg );
+ $ax = isset( $_SESSION['openid_consumer_ax'] ) ? $_SESSION['openid_consumer_ax'] : null;
+ return array( $response, $sreg, $ax );
}
function returnTo() {
Index: README
===================================================================
--- README (revision 245)
+++ README (working copy)
@@ -234,6 +234,14 @@
OpenIDs you want to deny access to. This is mostly useful for
servers that are known to be bad. Example: "#^(http://)?example.com/#".
+* $wgOpenIDConsumerForce -- a single provider which will always be used,
+ bypassing the selection dialog and manual entry. Useful for team wikis
+ using a provider such as Google Apps for Your Domain.
+
+* $wgOpenIDUseEmailAsNickname -- designed for use with the above, parse
+ the e-mail address provided by your consumer and use the user component
+ as the MediaWiki username.
+
* $wgOpenIDServerForceAllowTrust -- an array of regular expressions
that match trust roots that you want to skip trust checks for when
the user logs in from those sites. A typical example would be a
Index: SpecialOpenID.body.php
===================================================================
--- SpecialOpenID.body.php (revision 245)
+++ SpecialOpenID.body.php (working copy)
@@ -27,6 +27,7 @@
require_once( "Auth/OpenID/Consumer.php" );
require_once( "Auth/OpenID/SReg.php" );
+require_once( "Auth/OpenID/AX.php" );
require_once( "Auth/OpenID/FileStore.php" );
class SpecialOpenID extends SpecialPage {
@@ -247,6 +248,24 @@
$auth_request->addExtension( $sreg_request );
}
+ // Create attribute request object. Depending on your endpoint, you can request many things:
+ // see http://code.google.com/apis/accounts/docs/OpenID.html#Parameters for parameters.
+ // Usage: make($type_uri, $count=1, $required=false, $alias=null)
+ $attribute[] = Auth_OpenID_AX_AttrInfo::make('http://axschema.org/contact/email', 1, 1, 'email');
+ $attribute[] = Auth_OpenID_AX_AttrInfo::make('http://axschema.org/namePerson/first', 1, 1, 'firstname');
+ $attribute[] = Auth_OpenID_AX_AttrInfo::make('http://axschema.org/namePerson/last', 1, 1, 'lastname');
+
+ // Create AX fetch request and add attributes
+ $ax_request = new Auth_OpenID_AX_FetchRequest;
+
+ foreach($attribute as $attr){
+ $ax_request->add($attr);
+ }
+
+ if ($ax_request) {
+ $auth_request->addExtension($ax_request);
+ }
+
$process_url = $this->scriptUrl( $finish_page );
if ( $auth_request->shouldSendRedirect() ) {
Index: OpenID.setup.php
===================================================================
--- OpenID.setup.php (revision 245)
+++ OpenID.setup.php (working copy)
@@ -92,6 +92,20 @@
$wgOpenIDConsumerDeny = array();
/**
+ * Force this server to only allow authentication against one server;
+ * hides the selection form entirely.
+ */
+$wgOpenIDConsumerForce = null;
+
+/**
+ * Use the part before the @ in any given e-mail address as the username
+ * if a nickname is not given by the OP.
+ * This works well with $wgOpenIDConsumerForce where all users have a unique
+ * e-mail address at the same domain.
+ */
+$wgOpenIDUseEmailAsNickname = false;
+
+/**
* Where to store transitory data.
* Supported types are 'file', 'memcached', 'db'.
*/

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5668
Default Alt Text
21810-patch-against-r62177.patch (13 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL