Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correctly determine protocol from port and configuration in PHP 

Fixes: #1283
This commit is contained in:
Kyle Robbertze 2021-08-06 11:13:00 +02:00
parent 579dfe5b9e
commit 5466cd8688
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
airtime_mvc/application/common/HTTPHelper.php
View File

@ -32,6 +32,7 @@ class Application_Common_HTTPHelper
$baseDir = $CC_CONFIG['baseDir']; $baseDir = $CC_CONFIG['baseDir'];
$basePort = $CC_CONFIG['basePort']; $basePort = $CC_CONFIG['basePort'];
$forceSSL = $CC_CONFIG['forceSSL']; $forceSSL = $CC_CONFIG['forceSSL'];
$configProtocol = $CC_CONFIG['protocol'];
if (empty($baseDir)) { if (empty($baseDir)) {
$baseDir = "/"; $baseDir = "/";
} }
@ -42,15 +43,22 @@ class Application_Common_HTTPHelper
$baseDir = $baseDir . "/"; $baseDir = $baseDir . "/";
} }
# Set in reverse order of preference. ForceSSL configuration takes absolute preference, then
# the protocol set in config. If neither are set, the port is used to determine the scheme
$scheme = "http"; $scheme = "http";
if ($forceSSL || ($secured && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')) { if ($secured && $basePort == "443") {
$scheme = "https"; $scheme = "https";
$basePort = "443"; //Airtime Pro compatibility hack }
if (!empty($configProtocol)) {
$scheme = $configProtocol;
}
if ($forceSSL) {
$scheme = "https";
} }
$portStr = ""; $portStr = "";
if (!(($scheme == "http" && $basePort == "80") if (($scheme == "http" && $basePort !== "80")
|| ($scheme == "https" && $basePort == "443"))) { || ($scheme == "https" && $basePort !== "443")) {
$portStr = ":${basePort}"; $portStr = ":${basePort}";
} }
$stationUrl = "$scheme://${baseUrl}${portStr}${baseDir}"; $stationUrl = "$scheme://${baseUrl}${portStr}${baseDir}";

1
airtime_mvc/application/configs/conf.php
View File

@ -32,6 +32,7 @@ class Config {
$CC_CONFIG['stationId'] = $values['general']['station_id']; $CC_CONFIG['stationId'] = $values['general']['station_id'];
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
$CC_CONFIG['forceSSL'] = isset($values['general']['force_ssl']) ? $values['general']['force_ssl'] : FALSE; $CC_CONFIG['forceSSL'] = isset($values['general']['force_ssl']) ? $values['general']['force_ssl'] : FALSE;
$CC_CONFIG['protocol'] = isset($values['general']['protocol']) ? $values['general']['protocol'] : '';
if (isset($values['general']['dev_env'])) { if (isset($values['general']['dev_env'])) {
$CC_CONFIG['dev_env'] = $values['general']['dev_env']; $CC_CONFIG['dev_env'] = $values['general']['dev_env'];
} else { } else {

12
airtime_mvc/build/airtime.example.conf
View File

@ -33,6 +33,17 @@
# on your webserver, relative to the base_url. # on your webserver, relative to the base_url.
# The default is /. # The default is /.
# #
# force_ssl: Use HTTPS for all API calls and internal links,
# even if the web server is not operating on port
# 443. This is useful for working behind a reverse
# proxy.
# The default is False.
#
# protocol: Set the specific protocol if required. This is
# useful when using http on port 443. Mutually
# exclusive with force_ssl.
# Default is empty.
#
# cache_ahead_hours: How many hours ahead of time the Airtime playout # cache_ahead_hours: How many hours ahead of time the Airtime playout
# engine (pypo) should cache scheduled media files. # engine (pypo) should cache scheduled media files.
# The default is 1. # The default is 1.
@ -54,6 +65,7 @@ base_url = localhost
base_port = 80 base_port = 80
base_dir = / base_dir = /
force_ssl = force_ssl =
protocol =
cache_ahead_hours = 1 cache_ahead_hours = 1
airtime_dir = airtime_dir =
station_id = station_id =