Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SQL auto-install. #1252

Merged
merged 3 commits into from
Nov 3, 2016
Merged

Fix SQL auto-install. #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd3b17e
Fix SQL auto-install. Cleanup Setup Page in case of absent signature…
crossan007 Nov 1, 2016
ea7cdd4
remove dead comments
crossan007 Nov 1, 2016
00b27b6
address localization for integrity checking
crossan007 Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions src/Include/LoadConfigs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,6 @@ function mysql_failure($message)
mysql_select_db($sDATABASE)
or mysql_failure("Could not connect to the MySQL database <strong>" . $sDATABASE . "</strong>. Please check the settings in <strong>Include/Config.php</strong>.<br/>MySQL Error: " . mysql_error());

$sql = "SHOW TABLES FROM `$sDATABASE`";
$tablecheck = mysql_num_rows(mysql_query($sql));

if (!$tablecheck) {
$systemService = new SystemService();
$setupQueries = dirname(__file__) . '/../mysql/install/Install.sql';
$systemService->playbackSQLtoDatabase($setupQueries);
$configQueries = dirname(__file__) . '/../mysql/upgrade/update_config.sql';
$systemService->playbackSQLtoDatabase($configQueries);
$version = new Version();
$version->setVersion($systemService->getInstalledVersion());
$version->setUpdateStart(new DateTime());
$version->setUpdateEnd(new DateTime());
$version->save();
}

// Initialize the session
session_name('CRM@' . $sRootPath);
session_start();
Expand Down Expand Up @@ -131,6 +115,25 @@ function mysql_failure($message)
$logger->pushHandler(new StreamHandler('/tmp/ChurchCRM.log'));
$serviceContainer->setLogger('defaultLogger', $logger);

$connection = Propel::getConnection();
$query = "SHOW TABLES FROM `$sDATABASE`";
$statement = $connection->prepare($query);
$resultset = $statement->execute();
$results = $statement->fetchAll(\PDO::FETCH_ASSOC);

if (count($results) == 0) {
$systemService = new SystemService();
$setupQueries = dirname(__file__) . '/../mysql/install/Install.sql';
$systemService->playbackSQLtoDatabase($setupQueries);
$configQueries = dirname(__file__) . '/../mysql/upgrade/update_config.sql';
$systemService->playbackSQLtoDatabase($configQueries);
$version = new Version();
$version->setVersion($systemService->getInstalledVersion());
$version->setUpdateStart(new DateTime());
$version->setUpdateEnd(new DateTime());
$version->save();
}

// Read values from config table into local variables
// **************************************************

Expand Down
8 changes: 4 additions & 4 deletions src/IntegrityCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
if(count($IntegrityCheckDetails->files) > 0 )
{
?>
<p><?= gettext("Files failing integrity check:") ?>
<p><?= gettext("Files failing integrity check") ?>:
<ul>
<?php
foreach ($IntegrityCheckDetails->files as $file)
{
?>
<li>FileName: <?= $file->filename ?>
<li><?= gettext("Filename")?>: <?= $file->filename ?>
<?php
if($file->status == "File Missing")
{
Expand All @@ -46,8 +46,8 @@
{
?>
<ul>
<li><?= gettext("Expected Hash:")?> <?= $file->expectedhash ?></li>
<li><?= gettext("Actual Hash:") ?> <?= $file->actualhash ?></li>
<li><?= gettext("Expected Hash")?>: <?= $file->expectedhash ?></li>
<li><?= gettext("Actual Hash") ?>: <?= $file->actualhash ?></li>
</ul>
<?php
}
Expand Down
36 changes: 21 additions & 15 deletions src/Service/SystemService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,37 +457,43 @@ function verifyApplicationIntegrity()
{
$CRMInstallRoot = dirname(__DIR__);
$signatureFile = $CRMInstallRoot."/signatures.json";
$signatureData = json_decode(file_get_contents($signatureFile));
$signatureFailures = array();

if (sha1(json_encode($signatureData->files)) == $signatureData->sha1)
if (file_exists($signatureFile))
{
foreach ($signatureData->files as $file)
$signatureData = json_decode(file_get_contents($signatureFile));
if (sha1(json_encode($signatureData->files)) == $signatureData->sha1)
{
if(file_exists($CRMInstallRoot."/".$file->filename))
foreach ($signatureData->files as $file)
{
$actualHash = sha1_file($CRMInstallRoot."/".$file->filename);
if ( $actualHash != $file->sha1 )
if(file_exists($CRMInstallRoot."/".$file->filename))
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"Hash Mismatch", "expectedhash"=>$file->sha1,"actualhash"=>$actualHash));
$actualHash = sha1_file($CRMInstallRoot."/".$file->filename);
if ( $actualHash != $file->sha1 )
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"Hash Mismatch", "expectedhash"=>$file->sha1,"actualhash"=>$actualHash));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. This status is used in logic in other places. The user-facing text is already gettext'd in IntegrityCheck.php

}
}
else
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"File Missing"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. This status is used in logic in other places. The user-facing text is already gettext'd in IntegrityCheck.php

}
}
else
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"File Missing"));
}
}
else
{
return array("status"=>"failure","message"=>gettext("Signature definition file signature failed validation"));
}
}
else
{
return array("status"=>"failure","message"=>"Signature Definition file signature failed validation");
return array("status"=>"failure","message"=>gettext("Signature definition File Missing"));
}

if(count($signatureFailures) > 0 )
{
return array("status"=>"failure","files"=>$signatureFailures);
return array("status"=>"failure","message"=>gettext("One or more files failed signature validation"),"files"=>$signatureFailures);
}
else
else
{
return array("status"=>"success");
}
Expand Down