SimpleRisk 20240205-001 Release

Author: jsokol

simplerisk/includes/functions.php

@@ -10540,14 +10540,12 @@ function close_risk($risk_id, $user_id, $status, $close_reason, $note, $closure_
     // Get the new mitigation id
     $close_id = $db->lastInsertId();
 
-
-
     // Update the risk
     $stmt = $db->prepare("UPDATE risks SET status=:status,last_update=:date,close_id=:close_id WHERE id = :id");
 
     $stmt->bindParam(":id", $id, PDO::PARAM_INT);
     $stmt->bindParam(":status", $status, PDO::PARAM_STR, 50);
-    $stmt->bindParam(":date", $current_datetime, PDO::PARAM_STR);
+    $stmt->bindParam(":date", $closure_date, PDO::PARAM_STR);
     $stmt->bindParam(":close_id", $close_id, PDO::PARAM_INT);
     $stmt->execute();
 

simplerisk/includes/healthcheck.php

@@ -74,6 +74,9 @@ function simplerisk_health_check()
 	// Check the SimpleRisk Base URL
 	$check_simplerisk_base_url = check_simplerisk_base_url();
 
+    // Check the SimpleRisk Base URL DNS
+    $check_simplerisk_base_url_dns = check_simplerisk_base_url_dns();
+
 	// Check the SimpleRisk database connectivity
 	$check_database_connectivity = check_database_connectivity();
 
@@ -204,7 +207,7 @@ function simplerisk_health_check()
 	else health_check_bad("Extras");
 
 	// Connectivity Summary
-	if ($check_simplerisk_base_url['result'] === 1 && $check_database_connectivity['result'] === 1 && $check_api_connectivity['result'] === 1 && $check_web_connectivity_result === 1)
+	if ($check_simplerisk_base_url['result'] === 1 && $check_simplerisk_base_url_dns['result'] ===1 && $check_database_connectivity['result'] === 1 && $check_api_connectivity['result'] === 1 && $check_web_connectivity_result === 1)
 	{
 		health_check_good("Connectivity");
 	}
@@ -282,6 +285,7 @@ function simplerisk_health_check()
 	echo "    <div id=\"connectivity\" style=\"display: none;\" class=\"settings_tab\">\n";
 	echo "<b><u>Connectivity</u></b><br />";
 	display_health_check_results($check_simplerisk_base_url);
+    display_health_check_results($check_simplerisk_base_url_dns);
 	display_health_check_results($check_database_connectivity);
 	display_health_check_results($check_api_connectivity);
 	display_health_check_array_results($check_web_connectivity);
@@ -1098,6 +1102,55 @@ function check_php_max_input_vars()
 	}
 }
 
+/*******************************************
+ * FUNCTION: CHECK SIMPLERISK BASE URL DNS *
+ *******************************************/
+function check_simplerisk_base_url_dns()
+{
+    // Get the server name
+    $server_name = $_SERVER['SERVER_NAME'];
+
+    // Regular expression to match a domain
+    $domain_regex = "/^(?!\-)(?:(?:[a-zA-Z\d][a-zA-Z\d\-]{0,61})?[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}$/";
+
+    // If the server name is a domain
+    if (filter_var($server_name, FILTER_VALIDATE_DOMAIN))
+    {
+        // See if we can get a DNS record for the domain
+        $result = dns_get_record($server_name);
+
+        // If a result was not returned
+        if ($result === false)
+        {
+            return array("result" => 0, "text" => "The detected server name is a valid domain, but a DNS lookup was not successful.");
+        }
+        else
+        {
+            return array("result" => 1, "text" => "The detected server name is a valid domain and a DNS lookup was successful.");
+        }
+    }
+    // If the server name is an IP address
+    else if (filter_var($server_name, FILTER_VALIDATE_IP))
+    {
+        return array("result" => 1, "text" => "The detected server name is an IP address.");
+    }
+    else
+    {
+        // This is not a domain or IP and should be rejected
+        return array("result" => 0, "text" => "The detected server name is not a valid domain or IP address.");
+    }
+
+    // If the base URL stored in settings and the one we are using are the same
+    if ($simplerisk_base_url == $base_url)
+    {
+        return array("result" => 1, "text" => "Your SimpleRisk Base URL matches the URL you are using to connect to SimpleRisk.");
+    }
+    else
+    {
+        return array("result" => 0, "text" => "Your SimpleRisk Base URL does not match the URL you are using to connect to SimpleRisk.");
+    }
+}
+
 /*************************************************
  * FUNCTION: UNABLE TO COMMUNICATE WITH DATABASE *
  *************************************************/

simplerisk/includes/upgrade.php

@@ -169,6 +169,7 @@ function table_exists($table) {
 	"20231006-001",
 	"20231103-001",
 	"20240102-001",
+	"20240205-001",
 );
 
 /*************************
@@ -7118,6 +7119,40 @@ function upgrade_from_20231103001($db)
     echo "Finished SimpleRisk database upgrade from version " . $version_to_upgrade . " to version " . $version_upgrading_to . "<br />\n";
 }
 
+/***************************************
+ * FUNCTION: UPGRADE FROM 20240102-001 *
+ ***************************************/
+function upgrade_from_20240102001($db) {
+    // Database version to upgrade
+    $version_to_upgrade = '20240102-001';
+
+    // Database version upgrading to
+    $version_upgrading_to = '20240205-001';
+
+    echo "Beginning SimpleRisk database upgrade from version " . $version_to_upgrade . " to version " . $version_upgrading_to . "<br />\n";
+
+    // Set last_update to the closure's date if the last_update is invalid or empty.
+    echo "Fixing empty risk last update dates.<br />\n";
+    $stmt = $db->prepare("
+        UPDATE
+            `risks` r
+            LEFT JOIN `closures` c ON `c`.`id` = `r`.`close_id`
+        SET
+           `r`.`last_update` = `c`.`closure_date`
+        WHERE
+           `r`.`status`='Closed' AND (`r`.`last_update` = '0000-00-00 00:00:00' OR `r`.`last_update` IS NULL);
+    ");
+    $stmt->execute();
+
+    // To make sure page loads won't fail after the upgrade
+    // as this session variable is not set by the previous version of the login logic
+    $_SESSION['latest_version_app'] = latest_version('app');
+
+    // Update the database version
+    update_database_version($db, $version_to_upgrade, $version_upgrading_to);
+    echo "Finished SimpleRisk database upgrade from version " . $version_to_upgrade . " to version " . $version_upgrading_to . "<br />\n";
+}
+
 /******************************
  * FUNCTION: UPGRADE DATABASE *
  ******************************/

simplerisk/includes/version.php

@@ -4,6 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Application Version Date
-define('APP_VERSION', '20240102-001');
+define('APP_VERSION', '20240205-001');
 
 ?>

simplerisk/languages/af/lang.af.php

@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'Jy het nie toestemming om vraelyste te wysig nie',
     'NoPermissionForDeleteQuestionnaires' => 'Jy het nie toestemming om vraelyste uit te vee nie',
     'NoPermissionForSendQuestionnaires' => 'Jy het nie toestemming om vraelyste te stuur nie',
+    'MissingUser' => 'Vermiste gebruiker',
 
     '' => '',
 );

simplerisk/languages/ar/lang.ar.php

@@ -2344,7 +2344,7 @@
     'QuestionnaireNotCompleteEmailTemplate' => 'نموذج البريد الإلكتروني للاستبيان غير مكتمل',
     'RiskAssessmentQuestionnaireNotCompleted' => 'استبيان تقييم المخاطر لم يكتمل',
     'SaveAndSend' => 'حفظ وإرسال',
-    'AssociatedRisks' => 'المخاطر المرتبطة',
+    'AssociatedRisks' => 'المخاطر المصاحبة',
     'NoPermissionForAddAssessmentContacts' => 'ليس لديك إذن لإضافة جهات اتصال التقييم',
     'NoPermissionForEditAssessmentContacts' => 'ليس لديك إذن بتحرير جهات اتصال التقييم',
     'NoPermissionForDeleteAssessmentContacts' => 'ليس لديك إذن بحذف جهات اتصال التقييم',
@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'ليس لديك الإذن بتحرير الاستبيانات',
     'NoPermissionForDeleteQuestionnaires' => 'ليس لديك الإذن بحذف الاستبيانات',
     'NoPermissionForSendQuestionnaires' => 'ليس لديك الإذن بإرسال الاستبيانات',
+    'MissingUser' => 'مستخدم مفقود',
 
     '' => '',
 );

simplerisk/languages/bg/lang.bg.php

@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'Нямате разрешение за редактиране на въпросници',
     'NoPermissionForDeleteQuestionnaires' => 'Нямате разрешение за изтриване на въпросници',
     'NoPermissionForSendQuestionnaires' => 'Нямате разрешение да изпращате въпросници',
+    'MissingUser' => 'Липсващ потребител',
 
     '' => '',
 );

simplerisk/languages/bp/lang.bp.php

@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'Você não tem permissão para editar questionários',
     'NoPermissionForDeleteQuestionnaires' => 'Você não tem permissão para excluir questionários',
     'NoPermissionForSendQuestionnaires' => 'Você não tem permissão para enviar questionários',
+    'MissingUser' => 'Usuário ausente',
 
     '' => '',
 );

simplerisk/languages/ca/lang.ca.php

@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'No teniu permís per editar els qüestionaris',
     'NoPermissionForDeleteQuestionnaires' => 'No teniu permís per suprimir qüestionaris',
     'NoPermissionForSendQuestionnaires' => 'No teniu permís per enviar qüestionaris',
+    'MissingUser' => 'Usuari desaparegut',
 
     '' => '',
 );

simplerisk/languages/cs/lang.cs.php

@@ -2358,6 +2358,7 @@
     'NoPermissionForEditQuestionnaires' => 'Nemáte oprávnění upravovat dotazníky',
     'NoPermissionForDeleteQuestionnaires' => 'Nemáte oprávnění smazat dotazníky',
     'NoPermissionForSendQuestionnaires' => 'Nemáte oprávnění zasílat dotazníky',
+    'MissingUser' => 'Chybějící uživatel',
 
     '' => '',
 );