X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2FOpenIDPlugin.php;h=5236a3dc4ae90ce6e1cbf21c895fd00c8169a45b;hb=1663e2743bb295e04a0d0399d201b45668025e88;hp=ed6d6534c09dbdaff0ebef609fabd235cee9b628;hpb=4af466f1a609d2ef503bbc70d9efdcadda1d91f9;p=quix0rs-gnu-social.git diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index ed6d6534c0..5236a3dc4a 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -20,7 +20,7 @@ * @category Plugin * @package StatusNet * @author Evan Prodromou - * @author Craig Andrews + * @author Craig Andrews * @copyright 2009-2010 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -37,6 +37,8 @@ if (!defined('STATUSNET')) { * This class enables consumer support for OpenID, the distributed authentication * and identity system. * + * Depends on: WebFinger plugin for HostMeta-lookup (user@host format) + * * @category Plugin * @package StatusNet * @author Evan Prodromou @@ -66,11 +68,11 @@ class OpenIDPlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m URL mapper + * @param URLMapper $m URL mapper * * @return boolean hook return */ - function onStartInitializeRouter($m) + public function onStartInitializeRouter(URLMapper $m) { $m->connect('main/openid', array('action' => 'openidlogin')); $m->connect('main/openidtrust', array('action' => 'openidtrust')); @@ -123,17 +125,15 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onArgsInitialize($args) + function onArgsInitialize(array &$args) { if (common_config('site', 'openidonly')) { if (array_key_exists('action', $args)) { $action = trim($args['action']); if (in_array($action, array('login', 'register'))) { common_redirect(common_local_url('openidlogin')); - exit(0); } else if ($action == 'passwordsettings') { common_redirect(common_local_url('openidsettings')); - exit(0); } else if ($action == 'recoverpassword') { // TRANS: Client exception thrown when an action is not available. throw new ClientException(_m('Unavailable action.')); @@ -154,7 +154,7 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onEndPublicXRDS($action, &$xrdsOutputter) + function onEndPublicXRDS(Action $action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', @@ -174,37 +174,6 @@ class OpenIDPlugin extends Plugin $xrdsOutputter->elementEnd('XRD'); } - /** - * User XRDS output hook - * - * Puts the bits of code needed to discover OpenID endpoints. - * - * @param Action $action Action being executed - * @param XMLOutputter &$xrdsOutputter Output channel - * - * @return boolean hook return - */ - function onEndUserXRDS($action, &$xrdsOutputter) - { - $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'openid', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', - 'version' => '2.0')); - $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); - - //consumer - $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/return_to', - common_local_url('finishopenidlogin')); - - //provider - $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/signon', - common_local_url('openidserver'), - null, - null, - common_profile_url($action->user->nickname)); - $xrdsOutputter->elementEnd('XRD'); - } - /** * If we're in OpenID-only mode, hide all the main menu except OpenID login. * @@ -350,31 +319,14 @@ class OpenIDPlugin extends Plugin { switch ($cls) { - case 'OpenidloginAction': - case 'FinishopenidloginAction': - case 'FinishaddopenidAction': - case 'XrdsAction': - case 'PublicxrdsAction': - case 'OpenidsettingsAction': - case 'OpenidserverAction': - case 'OpenidtrustAction': - case 'OpenidadminpanelAction': - require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; - return false; - case 'User_openid': - require_once dirname(__FILE__) . '/User_openid.php'; - return false; - case 'User_openid_trustroot': - require_once dirname(__FILE__) . '/User_openid_trustroot.php'; - return false; case 'Auth_OpenID_TeamsExtension': case 'Auth_OpenID_TeamsRequest': case 'Auth_OpenID_TeamsResponse': require_once dirname(__FILE__) . '/extlib/teams-extension.php'; return false; - default: - return true; } + + return parent::onAutoload($cls); } /** @@ -425,24 +377,29 @@ class OpenIDPlugin extends Plugin } /** - * We include a element linking to the userxrds page, for OpenID - * client-side authentication. + * We include a element linking to the webfinger resource page, + * for OpenID client-side authentication. * * @param Action $action Action being shown * * @return void */ - function onEndShowHeadElements($action) + function onEndShowHeadElements(Action $action) { if ($action instanceof ShowstreamAction) { $action->element('link', array('rel' => 'openid2.provider', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid2.local_id', - 'href' => $action->profile->profileurl)); + 'href' => $action->getTarget()->getUrl())); $action->element('link', array('rel' => 'openid.server', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid.delegate', - 'href' => $action->profile->profileurl)); + 'href' => $action->getTarget()->getUrl())); + } + + if ($action instanceof SitestreamAction) { + $action->element('meta', array('http-equiv' => 'X-XRDS-Location', + 'content' => common_local_url('publicxrds'))); } return true; } @@ -457,9 +414,8 @@ class OpenIDPlugin extends Plugin */ function onRedirectToLogin($action, $user) { - if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { + if (common_config('site', 'openidonly') || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); - return false; } return true; } @@ -555,24 +511,9 @@ class OpenIDPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureTable('user_openid', - array(new ColumnDef('canonical', 'varchar', - '255', false, 'PRI'), - new ColumnDef('display', 'varchar', - '255', false, 'UNI'), - new ColumnDef('user_id', 'integer', - null, false, 'MUL'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); - $schema->ensureTable('user_openid_trustroot', - array(new ColumnDef('trustroot', 'varchar', - '255', false, 'PRI'), - new ColumnDef('user_id', 'integer', - null, false, 'PRI'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); + $schema->ensureTable('user_openid', User_openid::schemaDef()); + $schema->ensureTable('user_openid_trustroot', User_openid_trustroot::schemaDef()); + $schema->ensureTable('user_openid_prefs', User_openid_prefs::schemaDef()); /* These are used by JanRain OpenID library */ @@ -580,13 +521,13 @@ class OpenIDPlugin extends Plugin array( 'fields' => array( 'server_url' => array('type' => 'blob', 'not null' => true), - 'handle' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'default' => ''), // character set latin1, + 'handle' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'default' => ''), // character set latin1, 'secret' => array('type' => 'blob'), 'issued' => array('type' => 'int'), 'lifetime' => array('type' => 'int'), 'assoc_type' => array('type' => 'varchar', 'length' => 64), ), - 'primary key' => array(array('server_url', 255), 'handle'), + 'primary key' => array(array('server_url', 191), 'handle'), )); $schema->ensureTable('oid_nonces', array( @@ -596,7 +537,7 @@ class OpenIDPlugin extends Plugin 'salt' => array('type' => 'char', 'length' => 40), ), 'unique keys' => array( - 'oid_nonces_server_url_timestamp_salt_key' => array(array('server_url', 255), 'timestamp', 'salt'), + 'oid_nonces_server_url_timestamp_salt_key' => array(array('server_url', 191), 'timestamp', 'salt'), ), )); @@ -625,7 +566,7 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onEndAdminPanelNav($nav) + function onEndAdminPanelNav(Menu $nav) { if (AdminPanelAction::canAdmin('openid')) { @@ -674,10 +615,10 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OpenID', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:OpenID', 'rawdescription' => @@ -768,7 +709,7 @@ class OpenIDPlugin extends Plugin oid_assert_allowed($openid_url); $returnto = common_local_url( - 'ApiOauthAuthorize', + 'ApiOAuthAuthorize', array(), array( 'oauth_token' => $action->arg('oauth_token'), @@ -797,19 +738,47 @@ class OpenIDPlugin extends Plugin * Webfinger identity to services that support it. See * http://webfinger.org/login for an example. * - * @param XRD &$xrd Currently-displaying XRD object - * @param User $user The user that it's for + * @param XML_XRD $xrd Currently-displaying resource descriptor + * @param Profile $target The profile that it's for * * @return boolean hook value (always true) */ - function onEndXrdActionLinks(&$xrd, $user) + function onEndWebFingerProfileLinks(XML_XRD $xrd, Profile $target) + { + $xrd->links[] = new XML_XRD_Element_Link( + 'http://specs.openid.net/auth/2.0/provider', + $target->profileurl); + + return true; + } + + /** + * Add links in the user's profile block to their OpenID URLs. + * + * @param Profile $profile The profile being shown + * @param Array &$links Writeable array of arrays (href, text, image). + * + * @return boolean hook value (true) + */ + + function onOtherAccountProfiles($profile, &$links) { - $profile = $user->getProfile(); + $prefs = User_openid_prefs::getKV('user_id', $profile->id); + + if (empty($prefs) || !$prefs->hide_profile_link) { + + $oid = new User_openid(); - if (!empty($profile)) { - $xrd->links[] = array('rel' => 'http://specs.openid.net/auth/2.0/provider', - 'href' => $profile->profileurl); + $oid->user_id = $profile->id; + + if ($oid->find()) { + while ($oid->fetch()) { + $links[] = array('href' => $oid->display, + 'text' => _('OpenID'), + 'image' => $this->path("icons/openid-16x16.gif")); + } + } } return true;