tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

encryption key prepared before being used

This commit is contained in:
fbsanchez 2019-10-04 14:53:07 +02:00
parent bfe32a5aed
commit 647ce5706e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/bin/pandora_server
View File

@ -98,9 +98,6 @@ sub pandora_startup () {
# Grab config tokens shared with the console and not in the .conf # Grab config tokens shared with the console and not in the .conf
pandora_get_sharedconfig (\%Config, $DBH); pandora_get_sharedconfig (\%Config, $DBH);
# Generate the encryption key after reading the passphrase.
$Config{"encryption_key"} = enterprise_hook('pandora_get_encryption_key', [\%Config, $Config{"encryption_passphrase"}]);
# Kill any running server threads. # Kill any running server threads.
stop_server_threads(); stop_server_threads();
@ -212,6 +209,8 @@ sub pandora_crash () {
$full_error .= $error_line; $full_error .= $error_line;
} }
# Could crash before parse configuration.
$Config{'rb_product_name'} = 'PandoraFMS' unless defined($Config{'rb_product_name'}) && $Config{'rb_product_name'} ne '';
logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' unhandled error.', 1); logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' unhandled error.', 1);
# It's interesting show by console problems, not only in logs. This helps # It's interesting show by console problems, not only in logs. This helps

3
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -1206,6 +1206,9 @@ sub pandora_load_config {
} # end of loop for parameter # } # end of loop for parameter #
# Generate the encryption key after reading the passphrase.
$pa_config->{"encryption_key"} = enterprise_hook('pandora_get_encryption_key', [$pa_config, $pa_config->{"encryption_passphrase"}]);
# Set to RDBMS' standard port # Set to RDBMS' standard port
if (!defined($pa_config->{'dbport'})) { if (!defined($pa_config->{'dbport'})) {
if ($pa_config->{'dbengine'} eq "mysql") { if ($pa_config->{'dbengine'} eq "mysql") {