From c72ef605b9f9136ee5dfd669db8bfa3e44105115 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Sep 2017 10:40:32 +0100 Subject: [PATCH] Fixed server crash when a garbage timezone value is set in php.ini, fallback to auto-detection --- src/pocketmine/PocketMine.php | 67 ++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 33179006d..8165359e9 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -186,40 +186,51 @@ namespace pocketmine { $logger = new MainLogger(\pocketmine\DATA . "server.log"); $logger->registerStatic(); - if(!ini_get("date.timezone")){ + do{ + $timezone = ini_get("date.timezone"); + if($timezone !== ""){ + /* + * This is here so that people don't come to us complaining and fill up the issue tracker when they put + * an incorrect timezone abbreviation in php.ini apparently. + */ + if(strpos($timezone, "/") === false){ + $default_timezone = timezone_name_from_abbr($timezone); + if($default_timezone !== false){ + ini_set("date.timezone", $default_timezone); + date_default_timezone_set($default_timezone); + break; + }else{ + //Bad php.ini value, try another method to detect timezone + $logger->warning("Timezone \"$timezone\" could not be parsed as a valid timezone from php.ini, falling back to auto-detection"); + } + }else{ + date_default_timezone_set($timezone); + break; + } + } + if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){ //Success! Timezone has already been set and validated in the if statement. //This here is just for redundancy just in case some program wants to read timezone data from the ini. ini_set("date.timezone", $timezone); - }else{ - //If system timezone detection fails or timezone is an invalid value. - if($response = Utils::getURL("http://ip-api.com/json") - and $ip_geolocation_data = json_decode($response, true) - and $ip_geolocation_data['status'] !== 'fail' - and date_default_timezone_set($ip_geolocation_data['timezone']) - ){ - //Again, for redundancy. - ini_set("date.timezone", $ip_geolocation_data['timezone']); - }else{ - ini_set("date.timezone", "UTC"); - date_default_timezone_set("UTC"); - $logger->warning("Timezone could not be automatically determined. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file."); - } + break; } - }else{ - /* - * This is here so that people don't come to us complaining and fill up the issue tracker when they put - * an incorrect timezone abbreviation in php.ini apparently. - */ - $timezone = ini_get("date.timezone"); - if(strpos($timezone, "/") === false){ - $default_timezone = timezone_name_from_abbr($timezone); - ini_set("date.timezone", $default_timezone); - date_default_timezone_set($default_timezone); - }else{ - date_default_timezone_set($timezone); + + if($response = Utils::getURL("http://ip-api.com/json") //If system timezone detection fails or timezone is an invalid value. + and $ip_geolocation_data = json_decode($response, true) + and $ip_geolocation_data['status'] !== 'fail' + and date_default_timezone_set($ip_geolocation_data['timezone']) + ){ + //Again, for redundancy. + ini_set("date.timezone", $ip_geolocation_data['timezone']); + break; } - } + + ini_set("date.timezone", "UTC"); + date_default_timezone_set("UTC"); + $logger->warning("Timezone could not be automatically determined or was set to an invalid value. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file."); + }while(false); + function detect_system_timezone(){ switch(Utils::getOS()){