Merge pull request #10941 from nupplaphil/feat/worker_paradigm

[friendica.git] / src / Core / Installer.php

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index b2b84c6182eaa76e3618c87463e21d4470631972..96e73b993a28e881012320f5f22df023cfb9c0c8 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -23,7 +23,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
@@ -129,6 +129,10 @@ class Installer
                        $returnVal = false;
                }
 
+               if (!$this->checkTLS()) {
+                       $returnVal = false;
+               }
+
                if (!$this->checkKeys()) {
                        $returnVal = false;
                }
@@ -274,7 +278,7 @@ class Installer
                        $cmd = "$phppath -v";
                        $result = trim(shell_exec($cmd));
                        $passed2 = (strpos($result, "(cli)") !== false);
-                       list($result) = explode("\n", $result);
+                       [$result] = explode("\n", $result);
                        $help = "";
                        if (!$passed2) {
                                $help .= DI::l10n()->t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
@@ -553,11 +557,11 @@ class Installer
                $help = "";
                $error_msg = "";
                if (function_exists('curl_init')) {
-                       $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite");
+                       $fetchResult = DI::httpClient()->fetchFull($baseurl . "/install/testrewrite");
 
                        $url = Strings::normaliseLink($baseurl . "/install/testrewrite");
                        if ($fetchResult->getReturnCode() != 204) {
-                               $fetchResult = DI::httpRequest()->fetchFull($url);
+                               $fetchResult = DI::httpClient()->fetchFull($url);
                        }
 
                        if ($fetchResult->getReturnCode() != 204) {
@@ -580,6 +584,38 @@ class Installer
                return $status;
        }
 
+       /**
+        * TLS Check
+        *
+        * Tries to determine whether the connection to the server is secured
+        * by TLS or not. If not the user will be warned that it is higly
+        * encuraged to use TLS.
+        *
+        * @return bool (true) as TLS is not mandatory
+        */
+       public function checkTLS()
+       {
+               $tls = false;
+
+               if (isset($_SERVER['HTTPS'])) {
+                       if (($_SERVER['HTTPS'] == 1) || ($_SERVER['HTTPS'] == 'on')) {
+                               $tls = true;
+                       }
+               }
+               
+               if (!$tls) {
+                       $help = DI::l10n()->t('The detection of TLS to secure the communication between the browser and the new Friendica server failed.');
+                       $help .= ' ' . DI::l10n()->t('It is highly encouraged to use Friendica only over a secure connection as sensitive information like passwords will be transmitted.');
+                       $help .= ' ' . DI::l10n()->t('Please ensure that the connection to the server is secure.');
+                       $this->addCheck(DI::l10n()->t('No TLS detected'), $tls, false, $help);
+               } else {
+                       $this->addCheck(DI::l10n()->t('TLS detected'), $tls, false, '');
+               }
+
+               // TLS is not required
+               return true;
+       }
+
        /**
         * Imagick Check
         *
@@ -642,8 +678,8 @@ class Installer
        /**
         * Setup the default cache for a new installation
         *
-        * @param Cache  $configCache The configuration cache
-        * @param string $basePath    The determined basepath
+        * @param \Friendica\Core\Config\ValueObject\Cache $configCache The configuration cache
+        * @param string                                   $basePath    The determined basepath
         *
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */