MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' into develop

pull/8099/head
Luciano Righetti 2022-01-14 12:19:53 +01:00
parent 203cfb2caa e01cd6e622
commit 2b7736e3e5
7 changed files with 824 additions and 823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/Locale/default.pot
View File

@ -1460,13 +1460,13 @@ msgid "Event Report %s %s deleted"
msgstr "" msgstr ""
#: Controller/EventReportsController.php:133;136 #: Controller/EventReportsController.php:133;136
#: Controller/GalaxyClustersController.php:721;731 #: Controller/GalaxyClustersController.php:722;732
#: View/Objects/group_attributes_into_object.ctp:129 #: View/Objects/group_attributes_into_object.ctp:129
msgid "hard" msgid "hard"
msgstr "" msgstr ""
#: Controller/EventReportsController.php:133;136 #: Controller/EventReportsController.php:133;136
#: Controller/GalaxyClustersController.php:721;731 #: Controller/GalaxyClustersController.php:722;732
#: View/Objects/group_attributes_into_object.ctp:129 #: View/Objects/group_attributes_into_object.ctp:129
msgid "soft" msgid "soft"
msgstr "" msgstr ""
@ -1476,7 +1476,7 @@ msgid "Event Report %s could not be %s deleted.%sReasons: %s"
msgstr "" msgstr ""
#: Controller/EventReportsController.php:141;165;212;242;262;298 #: Controller/EventReportsController.php:141;165;212;242;262;298
#: Controller/GalaxyClustersController.php:745 #: Controller/GalaxyClustersController.php:746
#: Controller/GalaxyElementsController.php:83 #: Controller/GalaxyElementsController.php:83
#: Controller/TaxonomiesController.php:531 #: Controller/TaxonomiesController.php:531
#: Controller/WarninglistsController.php:434 #: Controller/WarninglistsController.php:434
@ -2343,100 +2343,100 @@ msgstr ""
msgid "Galaxy cluster relationship could not be deleted." msgid "Galaxy cluster relationship could not be deleted."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:203 #: Controller/GalaxyClustersController.php:204
msgid "This cluster is not published. Users will not be able to use it" msgid "This cluster is not published. Users will not be able to use it"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:220;224 #: Controller/GalaxyClustersController.php:221;225
msgid "Invalid galaxy" msgid "Invalid galaxy"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:283;284;391;392 #: Controller/GalaxyClustersController.php:284;285;392;393
msgid "Invalid JSON" msgid "Invalid JSON"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:314;427 #: Controller/GalaxyClustersController.php:315;428
msgid "Galaxy cluster saved" msgid "Galaxy cluster saved"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:446 #: Controller/GalaxyClustersController.php:447
#: View/GalaxyClusters/add.ctp:72 #: View/GalaxyClusters/add.ctp:72
msgid "Valid JSON array or comma separated" msgid "Valid JSON array or comma separated"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:447 #: Controller/GalaxyClustersController.php:448
msgid "Valid JSON array composed from Object of the form {key: keyname, value: actualValue}" msgid "Valid JSON array composed from Object of the form {key: keyname, value: actualValue}"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:470 #: Controller/GalaxyClustersController.php:471
msgid "You can't publish a galaxy cluster that is already published" msgid "You can't publish a galaxy cluster that is already published"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:473 #: Controller/GalaxyClustersController.php:474
msgid "Default galaxy cluster cannot be published" msgid "Default galaxy cluster cannot be published"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:479 #: Controller/GalaxyClustersController.php:480
msgid "Publish job queued. Job ID: %s" msgid "Publish job queued. Job ID: %s"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:486 #: Controller/GalaxyClustersController.php:487
msgid "Could not publish galaxy cluster" msgid "Could not publish galaxy cluster"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:493 #: Controller/GalaxyClustersController.php:494
msgid "Galaxy cluster published" msgid "Galaxy cluster published"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:516 #: Controller/GalaxyClustersController.php:517
msgid "You can't unpublish a galaxy cluster that is not published" msgid "You can't unpublish a galaxy cluster that is not published"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:519 #: Controller/GalaxyClustersController.php:520
msgid "Default galaxy cluster cannot be unpublished" msgid "Default galaxy cluster cannot be unpublished"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:525 #: Controller/GalaxyClustersController.php:526
msgid "Could not unpublish galaxy cluster" msgid "Could not unpublish galaxy cluster"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:532 #: Controller/GalaxyClustersController.php:533
msgid "Galaxy cluster unpublished" msgid "Galaxy cluster unpublished"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:719 #: Controller/GalaxyClustersController.php:720
msgid "Galaxy cluster successfuly %s deleted%s." msgid "Galaxy cluster successfuly %s deleted%s."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:722 #: Controller/GalaxyClustersController.php:723
msgid " and added to the block list" msgid " and added to the block list"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:731 #: Controller/GalaxyClustersController.php:732
msgid "Galaxy cluster could not be %s deleted." msgid "Galaxy cluster could not be %s deleted."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:757 #: Controller/GalaxyClustersController.php:758
msgid "Galaxy cluster successfuly restored." msgid "Galaxy cluster successfuly restored."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:765 #: Controller/GalaxyClustersController.php:766
msgid "Galaxy cluster could not be %s restored." msgid "Galaxy cluster could not be %s restored."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:774 #: Controller/GalaxyClustersController.php:775
msgid "This function can only be reached via POST." msgid "This function can only be reached via POST."
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:917 #: Controller/GalaxyClustersController.php:918
msgid "Default galaxy cluster cannot be updated" msgid "Default galaxy cluster cannot be updated"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:920 #: Controller/GalaxyClustersController.php:921
msgid "Galaxy cluster is not a fork" msgid "Galaxy cluster is not a fork"
msgstr "" msgstr ""
#: Controller/GalaxyClustersController.php:951 #: Controller/GalaxyClustersController.php:952
msgid "Cluster updated to the newer version" msgid "Cluster updated to the newer version"
msgstr "" msgstr ""
@ -5964,7 +5964,7 @@ msgid "Event publish is not banned"
msgstr "" msgstr ""
#: Model/Event.php:7584 #: Model/Event.php:7584
msgid "Reason: Could not reach redis to chech republish emailing ban status." msgid "Reason: Could not reach redis to check republish emailing ban status."
msgstr "" msgstr ""
#: Model/Event.php:7597 #: Model/Event.php:7597
@ -8006,7 +8006,7 @@ msgid "User is not banned to sent email notification"
msgstr "" msgstr ""
#: Model/User.php:1481 #: Model/User.php:1481
msgid "Reason: Could not reach redis to chech user email notification ban status." msgid "Reason: Could not reach redis to check user email notification ban status."
msgstr "" msgstr ""
#: Model/User.php:1493 #: Model/User.php:1493

1579
app/Locale/th_TH/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

2
app/Model/AuditLog.php
View File

@ -180,7 +180,7 @@ class AuditLog extends AppModel
if (!isset($auditLog['ip']) && $this->logClientIp) { if (!isset($auditLog['ip']) && $this->logClientIp) {
$ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR'; $ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR';
if (isset($_SERVER[$ipHeader])) { if (isset($_SERVER[$ipHeader])) {
$auditLog['ip'] = inet_pton($_SERVER[$ipHeader]); // convert to binary form $auditLog['ip'] = utf8_encode(inet_pton($_SERVER[$ipHeader])); // convert to binary form
} }
} }

2
app/Model/Event.php
View File

@ -7581,7 +7581,7 @@ class Event extends AppModel
if ($redis === false) { if ($redis === false) {
$banStatus['error'] = true; $banStatus['error'] = true;
$banStatus['active'] = true; $banStatus['active'] = true;
$banStatus['message'] = __('Reason: Could not reach redis to chech republish emailing ban status.'); $banStatus['message'] = __('Reason: Could not reach redis to check republish emailing ban status.');
return $banStatus; return $banStatus;
} }
$redisKey = "misp:event_alert_republish_ban:{$event['Event']['uuid']}"; $redisKey = "misp:event_alert_republish_ban:{$event['Event']['uuid']}";

2
app/Model/User.php
View File

@ -1478,7 +1478,7 @@ class User extends AppModel
if ($redis === false) { if ($redis === false) {
$banStatus['error'] = true; $banStatus['error'] = true;
$banStatus['active'] = true; $banStatus['active'] = true;
$banStatus['message'] = __('Reason: Could not reach redis to chech user email notification ban status.'); $banStatus['message'] = __('Reason: Could not reach redis to check user email notification ban status.');
return $banStatus; return $banStatus;
} }

2
docs/INSTALL.ubuntu1804.md
View File

@ -105,7 +105,7 @@ installDepsPhp74 () {
libapache2-mod-php7.4 \ libapache2-mod-php7.4 \
php7.4 php7.4-cli \ php7.4 php7.4-cli \
php7.4-dev \ php7.4-dev \
php7.4-json php7.4-xml php7.4-mysql php7.4-opcache php7.4-readline php7.4-mbstring php7.4-zip \ php7.4-json php7.4-xml php7.4-mysql php7.4-opcache php7.4-readline php7.4-mbstring php7.4-zip php7.4-curl \
php7.4-redis php7.4-gnupg \ php7.4-redis php7.4-gnupg \
php7.4-intl php7.4-bcmath \ php7.4-intl php7.4-bcmath \
php7.4-gd php7.4-gd

2
docs/INSTALL.ubuntu2004.md
View File

@ -97,7 +97,7 @@ installDepsPhp74 () {
libapache2-mod-php7.4 \ libapache2-mod-php7.4 \
php7.4 php7.4-cli \ php7.4 php7.4-cli \
php7.4-dev \ php7.4-dev \
php7.4-json php7.4-xml php7.4-mysql php7.4-opcache php7.4-readline php7.4-mbstring php7.4-zip \ php7.4-json php7.4-xml php7.4-mysql php7.4-opcache php7.4-readline php7.4-mbstring php7.4-zip php7.4-curl \
php7.4-redis php7.4-gnupg \ php7.4-redis php7.4-gnupg \
php7.4-intl php7.4-bcmath \ php7.4-intl php7.4-bcmath \
php7.4-gd php7.4-gd