Commit f83b81b8 authored by mmn's avatar mmn

Change config webfinger/http_alias to fix/legacy_http

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!
parent 250d99d9
......@@ -83,6 +83,7 @@ $default =
'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
'fix' =>
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' =>
array('appname' => 'statusnet', # for syslog
......
......@@ -35,13 +35,6 @@ class WebFingerPlugin extends Plugin
const OAUTH_REQUEST_TOKEN_REL = 'http://apinamespace.org/oauth/request_token';
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)
{
$m->connect('.well-known/host-meta', array('action' => 'hostmeta'));
......
......@@ -37,7 +37,7 @@ abstract class WebFingerResource
// (because remote sites look for it) verify that they are still
// the same identity as they were on HTTP. Should NOT be used if
// you've run HTTPS all the time!
if (common_config('webfinger', 'http_alias')) {
if (common_config('fix', 'legacy_http')) {
foreach ($aliases as $alias=>$id) {
if (!strtolower(parse_url($alias, PHP_URL_SCHEME)) === 'https') {
continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment