nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3127 from annando/bugfix-ssl-issues

Browse source 
Bugfix: The SSL policy setting was not respected
This commit is contained in:
Tobias Diekershoff 2017-01-30 08:46:25 +01:00 committed by GitHub
parent 0b04e0383c ae849954cc
commit 63e71ff297
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
boot.php
View file

@ -572,7 +572,6 @@ class App {
private $scheme; private $scheme;
private $hostname; private $hostname;
private $baseurl;
private $db; private $db;
private $curl_code; private $curl_code;
@ -800,8 +799,6 @@ class App {
* - Host name is determined either by system.hostname or inferred from request * - Host name is determined either by system.hostname or inferred from request
* - Path is inferred from SCRIPT_NAME * - Path is inferred from SCRIPT_NAME
* *
* Caches the result (depending on $ssl value) for performance.
*
* Note: $ssl parameter value doesn't directly correlate with the resulting protocol * Note: $ssl parameter value doesn't directly correlate with the resulting protocol
* *
* @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
@ -814,17 +811,9 @@ class App {
return self::$a->get_baseurl($ssl); return self::$a->get_baseurl($ssl);
} }
// Arbitrary values, the resulting url protocol can be different
$cache_index = $ssl ? 'https' : 'http';
// Cached value found, nothing to process
if (isset($this->baseurl[$cache_index])) {
return $this->baseurl[$cache_index];
}
$scheme = $this->scheme; $scheme = $this->scheme;
if (Config::get('system', 'ssl_policy') === SSL_POLICY_FULL) { if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
$scheme = 'https'; $scheme = 'https';
} }
@ -840,12 +829,10 @@ class App {
} }
if (Config::get('config', 'hostname') != '') { if (Config::get('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname'); $this->hostname = Config::get('config', 'hostname');
} }
$this->baseurl[$cache_index] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); return $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl[$cache_index];
} }
/** /**
@ -858,8 +845,6 @@ class App {
function set_baseurl($url) { function set_baseurl($url) {
$parsed = @parse_url($url); $parsed = @parse_url($url);
$this->baseurl = [];
if($parsed) { if($parsed) {
$this->scheme = $parsed['scheme']; $this->scheme = $parsed['scheme'];