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

Present http:// alias by default in WebFinger output 

because it might help us (and especially StatusNet sites) to recognize
profiles that have migrated from HTTP to HTTPS!
This commit is contained in:
Mikael Nordfeldth 2015-02-15 13:17:04 +01:00
parent c60b6bdb38
commit 396f1e92ca
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/WebFinger/WebFingerPlugin.php
View File

@ -31,6 +31,13 @@ if (!defined('GNUSOCIAL')) { exit(1); }
class WebFingerPlugin extends Plugin
{
public $http_alias = true;
public function initialize()
{
common_config_set('webfinger', 'http_alias', $this->http_alias);
}
public function onRouterInitialized($m)
{
$m->connect('.well-known/host-meta', array('action' => 'hostmeta'));

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

@ -34,7 +34,12 @@ abstract class WebFingerResource
$aliases = array();
// Add the URI as an identity, this is _not_ necessarily an HTTP url
$aliases[] = $this->object->getUri();
$uri = $this->object->getUri();
$aliases[] = $uri;
if (common_config('webfinger', 'http_alias')
&& strtolower(parse_url($uri, PHP_URL_SCHEME)) === 'https') {
$aliases[] = preg_replace('/^https:/', 'http:', $uri, 1);
}
try {
$aliases[] = $this->object->getUrl();