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

Change config webfinger/http_alias to fix/legacy_http

Browse Source 
Set $config['fix']['legacy_http'] to perform some actions that are
needed if your site used to be served over http but now has upgraded
to https!
This commit is contained in:
Mikael Nordfeldth 2016-03-23 15:21:02 +01:00
parent 250d99d997
commit f83b81b8c4
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/default.php
View File

@ -83,6 +83,7 @@ $default =
'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL 'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
'fix' => 'fix' =>
array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'legacy_http' => false, // set this to true if you have upgraded your site from http=>https
), ),
'syslog' => 'syslog' =>
array('appname' => 'statusnet', # for syslog array('appname' => 'statusnet', # for syslog

7
plugins/WebFinger/WebFingerPlugin.php
View File

@ -35,13 +35,6 @@ class WebFingerPlugin extends Plugin
const OAUTH_REQUEST_TOKEN_REL = 'http://apinamespace.org/oauth/request_token'; const OAUTH_REQUEST_TOKEN_REL = 'http://apinamespace.org/oauth/request_token';
const OAUTH_AUTHORIZE_REL = 'http://apinamespace.org/oauth/authorize'; const OAUTH_AUTHORIZE_REL = 'http://apinamespace.org/oauth/authorize';
public $http_alias = false;
public function initialize()
{
common_config_set('webfinger', 'http_alias', $this->http_alias);
}
public function onRouterInitialized($m) public function onRouterInitialized($m)
{ {
$m->connect('.well-known/host-meta', array('action' => 'hostmeta')); $m->connect('.well-known/host-meta', array('action' => 'hostmeta'));

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

@ -37,7 +37,7 @@ abstract class WebFingerResource
// (because remote sites look for it) verify that they are still // (because remote sites look for it) verify that they are still
// the same identity as they were on HTTP. Should NOT be used if // the same identity as they were on HTTP. Should NOT be used if
// you've run HTTPS all the time! // you've run HTTPS all the time!
if (common_config('webfinger', 'http_alias')) { if (common_config('fix', 'legacy_http')) {
foreach ($aliases as $alias=>$id) { foreach ($aliases as $alias=>$id) {
if (!strtolower(parse_url($alias, PHP_URL_SCHEME)) === 'https') { if (!strtolower(parse_url($alias, PHP_URL_SCHEME)) === 'https') {
continue; continue;