keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

implement SSL redirection policy (none, full, selfsign)

Browse source
This commit is contained in:
Friendika 2011-01-29 22:35:11 -08:00
parent 45bbf1cd3f
commit f970d9ab4d
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
boot.php
View file

@ -10,6 +10,16 @@ define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'DOWN_ARROW', '&#x21e9;' ); define ( 'DOWN_ARROW', '&#x21e9;' );
/**
* SSL redirection policies
*/
define ( 'SSL_POLICY_NONE', 0 );
define ( 'SSL_POLICY_FULL', 1 );
define ( 'SSL_POLICY_SELFSIGN' 2 );
/** /**
* log levels * log levels
*/ */
@ -273,7 +283,14 @@ class App {
if(strlen($this->baseurl)) if(strlen($this->baseurl))
return $this->baseurl; return $this->baseurl;
$this->baseurl = (($ssl) ? 'https' : $this->scheme) . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); $scheme = $this->scheme;
if(($ssl) || ($a->config['ssl_policy'] == SSL_POLICY_FULL))
$scheme = 'https';
if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
$scheme = 'https';
$this->baseurl = ( $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl; return $this->baseurl;
} }