GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make WebFinger fancyurlfix configurable

This commit is contained in:
Mikael Nordfeldth 2016-02-21 20:05:32 +01:00
parent ce803f6d06
commit c67b89e56b
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/WebFinger/WebFingerPlugin.php
View File

@ -36,10 +36,12 @@ class WebFingerPlugin extends Plugin
const OAUTH_AUTHORIZE_REL = 'http://apinamespace.org/oauth/authorize'; const OAUTH_AUTHORIZE_REL = 'http://apinamespace.org/oauth/authorize';
public $http_alias = false; public $http_alias = false;
public $fancyurlfix = true; // adds + interprets some extra aliases related to 'index.php/' URLs
public function initialize() public function initialize()
{ {
common_config_set('webfinger', 'http_alias', $this->http_alias); common_config_set('webfinger', 'http_alias', $this->http_alias);
common_config_set('webfinger', 'fancyurlfix', $this->fancyurlfix);
} }
public function onRouterInitialized($m) public function onRouterInitialized($m)
@ -104,6 +106,7 @@ class WebFingerPlugin extends Plugin
$user = User::getByUri($resource); $user = User::getByUri($resource);
$profile = $user->getProfile(); $profile = $user->getProfile();
} catch (NoResultException $e) { } catch (NoResultException $e) {
if (common_config('webfinger', 'fancyurlfix')) {
try { try {
try { // if it's a /index.php/ url try { // if it's a /index.php/ url
// common_fake_local_fancy_url can throw an exception // common_fake_local_fancy_url can throw an exception
@ -117,11 +120,17 @@ class WebFingerPlugin extends Plugin
$user = User::getByUri($alt_url); $user = User::getByUri($alt_url);
$profile = $user->getProfile(); $profile = $user->getProfile();
} catch (Exception $e) { } catch (Exception $e) {
// apparently we didn't get any matches with that, so continue...
}
}
}
}
// if we still haven't found a match...
if (!$profile instanceof Profile) {
// if our rewrite hack didn't work, try to get something by profile URL // if our rewrite hack didn't work, try to get something by profile URL
$profile = Profile::getKV('profileurl', $resource); $profile = Profile::getKV('profileurl', $resource);
} }
}
}
if ($profile instanceof Profile) { if ($profile instanceof Profile) {
$target = new WebFingerResource_Profile($profile); $target = new WebFingerResource_Profile($profile);

4
plugins/WebFinger/lib/webfingerresource.php
View File

@ -47,6 +47,7 @@ abstract class WebFingerResource
// getUrl failed because no valid URL could be returned, just ignore it // getUrl failed because no valid URL could be returned, just ignore it
} }
if (common_config('webfinger', 'fancyurlfix')) {
/** /**
* Here we add some hacky hotfixes for remote lookups that have been taught the * Here we add some hacky hotfixes for remote lookups that have been taught the
* (at least now) wrong URI but it's still obviously the same user. Such as: * (at least now) wrong URI but it's still obviously the same user. Such as:
@ -55,8 +56,6 @@ abstract class WebFingerResource
* - https://site.example/index.php/user/1 even if the client requests https://site.example/user/1 * - https://site.example/index.php/user/1 even if the client requests https://site.example/user/1
* - https://site.example/index.php/user/1 even if the client requests https://site.example///index.php/user/1 * - https://site.example/index.php/user/1 even if the client requests https://site.example///index.php/user/1
*/ */
foreach(array_keys($aliases) as $alias) { foreach(array_keys($aliases) as $alias) {
try { try {
// get a "fancy url" version of the alias, even without index.php/ // get a "fancy url" version of the alias, even without index.php/
@ -76,6 +75,7 @@ abstract class WebFingerResource
// Apparently we couldn't rewrite that, the $alias was as the function wanted it to be // Apparently we couldn't rewrite that, the $alias was as the function wanted it to be
} }
} }
}
// return a unique set of aliases by extracting only the keys // return a unique set of aliases by extracting only the keys
return array_keys($aliases); return array_keys($aliases);