mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into decaying
mokaddem
commit
73babe7bf7
|
|
@ -37,12 +37,6 @@
|
|||
path = Plugin/DebugKit
|
||||
url = https://github.com/cakephp/debug_kit.git
|
||||
branch = 2.2
|
||||
[submodule "INSTALL/Crypt_GPG"]
|
||||
path = INSTALL/dependencies/Crypt_GPG
|
||||
url = https://github.com/pear/Crypt_GPG
|
||||
[submodule "INSTALL/Console_CommandLine"]
|
||||
path = INSTALL/dependencies/Console_CommandLine
|
||||
url = https://github.com/pear/Console_CommandLine
|
||||
[submodule "INSTALL/dependencies/Net_GeoIP"]
|
||||
path = INSTALL/dependencies/Net_GeoIP
|
||||
url = https://github.com/pear/Net_GeoIP
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ install:
|
|||
- sudo apt-get -y update
|
||||
# Travis lacks entropy.
|
||||
- sudo apt-get -y install haveged
|
||||
- sudo apt-get -y install python3 python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-pear php-redis php-gnupg php-gd
|
||||
- sudo apt-get -y install python3 python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-redis php-gnupg php-gd
|
||||
- sudo apt-get -y dist-upgrade
|
||||
- sudo pip3 install --upgrade pip setuptools requests pyzmq
|
||||
- sudo pip3 install --upgrade -r requirements.txt
|
||||
|
|
|
|||
|
|
@ -763,7 +763,6 @@ installDepsPhp70 () {
|
|||
php php-cli \
|
||||
php-dev \
|
||||
php-json php-xml php-mysql php-opcache php-readline php-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
|
||||
|
|
@ -785,7 +784,6 @@ installDepsPhp73 () {
|
|||
php7.3 php7.3-cli \
|
||||
php7.3-dev \
|
||||
php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
}
|
||||
|
|
@ -1137,7 +1135,6 @@ installDepsPhp73 () {
|
|||
php7.3 php7.3-cli \
|
||||
php7.3-dev \
|
||||
php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
}
|
||||
|
|
@ -1153,7 +1150,6 @@ installDepsPhp72 () {
|
|||
php php-cli \
|
||||
php-dev \
|
||||
php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
|
||||
|
|
@ -1174,7 +1170,6 @@ installDepsPhp70 () {
|
|||
php php-cli \
|
||||
php-dev \
|
||||
php-json php-xml php-mysql php-opcache php-readline php-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
|
||||
|
|
@ -1324,10 +1319,6 @@ installCore () {
|
|||
|
||||
# install plyara
|
||||
$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
|
||||
|
||||
# Install Crypt_GPG and Console_CommandLine
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
}
|
||||
|
||||
installCake () {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
75d9de9742ccb2383d044f6a19fed73ea2909f9d INSTALL.sh
|
||||
6f5260ea0b7af730f4b94007e5046f661e3c2585 INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
c5f790fc1c13af0b95490cc2136324b9dd9930af1b4c0afb6da4687b47c58e23 INSTALL.sh
|
||||
babd4491825edd02153d7d09624f1668c452ee14279872f367c5729dd51171bc INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
5c2aaba9cafc88f5f81dafa7717e95daaec671ddd9aa32ed2ce0daf7654c2a11eab59271802590566f1cdd285a485673 INSTALL.sh
|
||||
0cf66499a027baaf5b52aba19270a7f6e5fbc7d99df225a9049bf9c35c35f9c4316a59ef92ec544ef2f23eea416897b0 INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
dcb06c97ca3d4528b41c81f9d6933de235260e5fcfcc28c5fdd2fb19a287b421e492c3ae5ab3896ee3119309f7539be4b1a03422510721dae3f20d07ec2cc415 INSTALL.sh
|
||||
cfc7e4b1749ad8ed2d75fd3e7d984bb48ab253559c4a37318568dfc175fad40612a05bb59d3672dc3de88b651bd18e8b959457c4ae9c72eff2c0a7418e51fce8 INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -74,26 +74,6 @@
|
|||
- "/opt/misp-server/tmp"
|
||||
- "/opt/misp-server/backup"
|
||||
|
||||
######### PEAR: CRYPTPGP #########
|
||||
- name: Configure PEAR proxy
|
||||
shell: "{{ item }}"
|
||||
args:
|
||||
creates: /home/misp/ansible/ansible_shell_pear_configure_proxy.log
|
||||
with_items:
|
||||
- "pear config-set http_proxy http://{{proxy_host}}:{{proxy_port}} > /home/misp/ansible/ansible_shell_pear_configure_proxy.log"
|
||||
|
||||
- name: Configure PEAR tmp
|
||||
shell: "{{ item }}"
|
||||
args:
|
||||
creates: /home/misp/ansible/ansible_shell_pear_configure_tmp.log
|
||||
with_items:
|
||||
- pear config-set temp_dir /opt/misp-server/tmp/ > /home/misp/ansible/ansible_shell_pear_configure_tmp.log
|
||||
|
||||
- name: Install CryptGPG
|
||||
pear:
|
||||
name: Crypt_GPG
|
||||
state: present
|
||||
|
||||
######### MISP REPOSITORY #########
|
||||
|
||||
- name: Clone MISP repository
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 40fca1d3dabbbb23e13b333bd5c615ca19d7d73f
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit bf07ab51207446ed33ea0075083df9bbc2358617
|
||||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15325,7 +15325,7 @@ msgstr "Synkroniser bruger for"
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15821,7 +15821,7 @@ msgstr ""
|
|||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
#: View/Users/edit.ctp:23
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15355,8 +15355,8 @@ msgstr "Synchroniser l'utilisateur pour"
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Coller ici la clé GnuPG de l’utilisateur, ou essayer de le récupérer depuis le serveur de clés du MIT en cliquant sur « Fetch GnuPG key » ci-dessous."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Coller ici la clé GnuPG de l’utilisateur, ou essayer de le récupérer depuis le serveur de clés du CIRCL en cliquant sur « Fetch GnuPG key » ci-dessous."
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
#: View/Users/admin_edit.ctp:66
|
||||
|
|
|
|||
|
|
@ -12464,7 +12464,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -13164,7 +13164,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15347,8 +15347,8 @@ msgstr "同期ユーザー用"
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "ユーザーの GnuPG キーをここに貼り付けるか、下の \"GnuPG キーを取得\"をクリックして MIT キーサーバーから取得します。"
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "ユーザーの GnuPG キーをここに貼り付けるか、下の \"GnuPG キーを取得\"をクリックして CIRCL キーサーバーから取得します。"
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
#: View/Users/admin_edit.ctp:66
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15945,8 +15945,8 @@ msgstr "Synkroniser brukeren for"
|
|||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
#: View/Users/edit.ctp:23
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Lim inn brukerens GnuPG-nøkkel her, eller prøv å hente den fra MIT-nøkkelserveren ved å klikke på \"Hent GnuPG-nøkkel\" nedenfor."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Lim inn brukerens GnuPG-nøkkel her, eller prøv å hente den fra CIRCL-nøkkelserveren ved å klikke på \"Hent GnuPG-nøkkel\" nedenfor."
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
#: View/Users/admin_edit.ctp:66
|
||||
|
|
|
|||
|
|
@ -13159,7 +13159,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -15332,8 +15332,8 @@ msgstr "Синхронизировать пользователя"
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Вставьте GnuPG ключ пользователя сюда или нажмите кнопку \"Получить GnuPG ключ\" для получения ключа с сервера MIT."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr "Вставьте GnuPG ключ пользователя сюда или нажмите кнопку \"Получить GnuPG ключ\" для получения ключа с сервера CIRCL."
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
#: View/Users/admin_edit.ctp:66
|
||||
|
|
|
|||
|
|
@ -15316,7 +15316,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -13159,7 +13159,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -12464,7 +12464,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -13159,7 +13159,7 @@ msgstr ""
|
|||
|
||||
#: View/Users/admin_add.ctp:70
|
||||
#: View/Users/admin_edit.ctp:64
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
|
||||
msgstr ""
|
||||
|
||||
#: View/Users/admin_add.ctp:72
|
||||
|
|
|
|||
|
|
@ -4330,8 +4330,17 @@ class Server extends AppModel
|
|||
if (Configure::read('GnuPG.email') && Configure::read('GnuPG.homedir')) {
|
||||
$continue = true;
|
||||
try {
|
||||
require_once 'Crypt/GPG.php';
|
||||
$gpg = new Crypt_GPG(array('homedir' => Configure::read('GnuPG.homedir'), 'gpgconf' => Configure::read('GnuPG.gpgconf'), 'binary' => (Configure::read('GnuPG.binary') ? Configure::read('GnuPG.binary') : '/usr/bin/gpg')));
|
||||
if (!class_exists('Crypt_GPG')) {
|
||||
if (!stream_resolve_include_path('Crypt/GPG.php')) {
|
||||
throw new Exception("Crypt_GPG is not installed");
|
||||
}
|
||||
require_once 'Crypt/GPG.php';
|
||||
}
|
||||
$gpg = new Crypt_GPG(array(
|
||||
'homedir' => Configure::read('GnuPG.homedir'),
|
||||
'gpgconf' => Configure::read('GnuPG.gpgconf'),
|
||||
'binary' => Configure::read('GnuPG.binary') ?: '/usr/bin/gpg'
|
||||
));
|
||||
} catch (Exception $e) {
|
||||
$gpgStatus = 2;
|
||||
$continue = false;
|
||||
|
|
|
|||
|
|
@ -306,8 +306,7 @@ class User extends AppModel
|
|||
|
||||
// we have a clean, hopefully public, key here
|
||||
try {
|
||||
require_once 'Crypt/GPG.php';
|
||||
$gpg = new Crypt_GPG(array('homedir' => Configure::read('GnuPG.homedir'), 'gpgconf' => Configure::read('GnuPG.gpgconf'), 'binary' => (Configure::read('GnuPG.binary') ? Configure::read('GnuPG.binary') : '/usr/bin/gpg')));
|
||||
$gpg = $this->initializeGpg();
|
||||
try {
|
||||
$keyImportOutput = $gpg->importKey($check['gpgkey']);
|
||||
if (!empty($keyImportOutput['fingerprint'])) {
|
||||
|
|
@ -379,7 +378,7 @@ class User extends AppModel
|
|||
return preg_match($regex, $value);
|
||||
}
|
||||
|
||||
public function identicalFieldValues($field=array(), $compareField=null)
|
||||
public function identicalFieldValues($field = array(), $compareField = null)
|
||||
{
|
||||
foreach ($field as $key => $value) {
|
||||
$v1 = $value;
|
||||
|
|
@ -450,10 +449,9 @@ class User extends AppModel
|
|||
{
|
||||
if (!$gpg) {
|
||||
try {
|
||||
require_once 'Crypt/GPG.php';
|
||||
$gpg = new Crypt_GPG(array('homedir' => Configure::read('GnuPG.homedir'), 'gpgconf' => Configure::read('GnuPG.gpgconf'), 'binary' => (Configure::read('GnuPG.binary') ? Configure::read('GnuPG.binary') : '/usr/bin/gpg')));
|
||||
$gpg = $this->initializeGpg();
|
||||
} catch (Exception $e) {
|
||||
$result[2] ='GnuPG is not configured on this system.';
|
||||
$result[2] = 'GnuPG is not configured on this system.';
|
||||
$result[0] = true;
|
||||
return $result;
|
||||
}
|
||||
|
|
@ -499,7 +497,6 @@ class User extends AppModel
|
|||
|
||||
public function verifyGPG($id = false)
|
||||
{
|
||||
require_once 'Crypt/GPG.php';
|
||||
$this->Behaviors->detach('Trim');
|
||||
$results = array();
|
||||
$conditions = array('not' => array('gpgkey' => ''));
|
||||
|
|
@ -513,7 +510,7 @@ class User extends AppModel
|
|||
if (empty($users)) {
|
||||
return $results;
|
||||
}
|
||||
$gpg = new Crypt_GPG(array('homedir' => Configure::read('GnuPG.homedir'), 'gpgconf' => Configure::read('GnuPG.gpgconf'), 'binary' => (Configure::read('GnuPG.binary') ? Configure::read('GnuPG.binary') : '/usr/bin/gpg')));
|
||||
$gpg = $this->initializeGpg();
|
||||
foreach ($users as $k => $user) {
|
||||
$results[$user['User']['id']] = $this->verifySingleGPG($user, $gpg);
|
||||
}
|
||||
|
|
@ -1057,7 +1054,7 @@ class User extends AppModel
|
|||
'fingerprint' => chunk_split($parts[1], 4, ' '),
|
||||
'key_id' => substr($parts[1], -8),
|
||||
'date' => date('Y-m-d', $parts[4]),
|
||||
'uri' => 'pks/lookup?op=get&search=0x' . $parts[1],
|
||||
'uri' => '/pks/lookup?op=get&search=0x' . $parts[1],
|
||||
);
|
||||
|
||||
} else if ($parts[0] === 'uid' && !empty($temp)) {
|
||||
|
|
@ -1217,9 +1214,9 @@ class User extends AppModel
|
|||
public function verifyPassword($user_id, $password)
|
||||
{
|
||||
$currentUser = $this->find('first', array(
|
||||
'conditions' => array('User.id' => $user_id),
|
||||
'recursive' => -1,
|
||||
'fields' => array('User.password')
|
||||
'conditions' => array('User.id' => $user_id),
|
||||
'recursive' => -1,
|
||||
'fields' => array('User.password')
|
||||
));
|
||||
if (empty($currentUser)) {
|
||||
return false;
|
||||
|
|
@ -1253,4 +1250,31 @@ class User extends AppModel
|
|||
$this->save($admin);
|
||||
return $authKey;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Crypt_GPG
|
||||
* @throws Exception
|
||||
*/
|
||||
private function initializeGpg()
|
||||
{
|
||||
if (!class_exists('Crypt_GPG')) {
|
||||
if (!stream_resolve_include_path('Crypt/GPG.php')) {
|
||||
throw new Exception("Crypt_GPG is not installed.");
|
||||
}
|
||||
require_once 'Crypt/GPG.php';
|
||||
}
|
||||
|
||||
$homedir = Configure::read('GnuPG.homedir');
|
||||
if ($homedir === null) {
|
||||
throw new Exception("Configuration option 'GnuPG.homedir' is not set, Crypt_GPG cannot be initialized.");
|
||||
}
|
||||
|
||||
$options = array(
|
||||
'homedir' => $homedir,
|
||||
'gpgconf' => Configure::read('GnuPG.gpgconf'),
|
||||
'binary' => Configure::read('GnuPG.binary') ?: '/usr/bin/gpg',
|
||||
);
|
||||
|
||||
return new Crypt_GPG($options);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
<?php
|
||||
if (($isAclAdmin && (($user['User']['org_id'] == $me['org_id'])) || ('1' == $me['id'])) || ($isSiteAdmin)):
|
||||
?>
|
||||
<span role="button" tabindex="0" aria-label="Initiate password refresh" title="<?php echo __('Initiate password refresh');?>" class="fa fa-sync useCursorPointer" onClick="initiatePasswordReset('<?php echo $user['User']['id']; ?>');" title="<?php echo __('Create new credentials and inform user');?>" role="button" tabindex="0" aria-label="<?php echo __('Create new credentials and inform user');?>"></span>
|
||||
<span role="button" tabindex="0" class="fa fa-sync useCursorPointer" onClick="initiatePasswordReset('<?php echo $user['User']['id']; ?>');" title="<?php echo __('Create new credentials and inform user');?>" role="button" tabindex="0" aria-label="<?php echo __('Create new credentials and inform user');?>"></span>
|
||||
<?php
|
||||
echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $user['User']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit'), 'aria-label' => __('Edit')));
|
||||
echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $user['User']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete'), 'aria-label' => __('Delete')), __('Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead.', $user['User']['id']));
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
?>
|
||||
</div>
|
||||
<?php
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the MIT key server by clicking on "Fetch GnuPG key" below.')));
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the CIRCL key server by clicking on "Fetch GnuPG key" below.')));
|
||||
?>
|
||||
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch the user\'s GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
?>
|
||||
</div>
|
||||
<?php
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the MIT key server by clicking on "Fetch GnuPG key" below.')));
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the CIRCL key server by clicking on "Fetch GnuPG key" below.')));
|
||||
?>
|
||||
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch the user\'s GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
?>
|
||||
<div class="input clear"></div>
|
||||
<?php
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the MIT key server by clicking on "Fetch GnuPG key" below.')));
|
||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the CIRCL key server by clicking on "Fetch GnuPG key" below.')));
|
||||
?>
|
||||
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
"prefer-stable": true,
|
||||
"minimum-stability": "dev",
|
||||
"require": {
|
||||
"kamisama/cake-resque": "4.1.2"
|
||||
"kamisama/cake-resque": "4.1.2",
|
||||
"pear/crypt_gpg": "1.6.3"
|
||||
},
|
||||
"suggest": {
|
||||
"elasticsearch/elasticsearch": "For logging to elasticsearch",
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ class StixParser():
|
|||
attributes = []
|
||||
for type_, value in zip(types, values):
|
||||
if 'hashes' in type_:
|
||||
hash_type = type_.split('.')[1]
|
||||
hash_type = type_.split('.')[1].strip("'").replace('-', '').lower()
|
||||
attributes.append({'type': hash_type, 'value': value,
|
||||
'object_relation': hash_type, 'to_ids': True})
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -216,11 +216,6 @@ installCoreRHEL () {
|
|||
# Make git ignore filesystem permission differences
|
||||
$SUDO_WWW git config core.filemode false
|
||||
|
||||
# Install packaged pears
|
||||
sudo $RUN_PHP -- pear channel-update pear.php.net
|
||||
sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
|
||||
# Create a python3 virtualenv
|
||||
$SUDO_WWW $RUN_PYTHON -- virtualenv -p python3 $PATH_TO_MISP/venv
|
||||
sudo mkdir /usr/share/httpd/.cache
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ yumInstallCoreDeps () {
|
|||
sudo systemctl enable --now redis.service
|
||||
|
||||
PHP_INI=/etc/php.ini
|
||||
sudo yum install php php-fpm php-devel php-pear \
|
||||
sudo yum install php php-fpm php-devel \
|
||||
php-mysqlnd \
|
||||
php-mbstring \
|
||||
php-xml \
|
||||
|
|
@ -200,11 +200,6 @@ installCoreRHEL () {
|
|||
# Make git ignore filesystem permission differences
|
||||
$SUDO_WWW git config core.filemode false
|
||||
|
||||
# Install packaged pears
|
||||
sudo $RUN_PHP -- pear channel-update pear.php.net
|
||||
sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
|
||||
# Create a python3 virtualenv
|
||||
$SUDO_WWW virtualenv-3 -p python3 $PATH_TO_MISP/venv
|
||||
sudo mkdir /usr/share/httpd/.cache
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ installDepsPhp72 () {
|
|||
php php-cli \
|
||||
php-dev \
|
||||
php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
|
||||
|
|
@ -190,10 +189,6 @@ installCore () {
|
|||
|
||||
# install plyara
|
||||
$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
|
||||
|
||||
# Install Crypt_GPG and Console_CommandLine
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
}
|
||||
# <snippet-end 1_mispCoreInstall.sh>
|
||||
```
|
||||
|
|
|
|||
|
|
@ -605,7 +605,6 @@ installDepsPhp70 () {
|
|||
php php-cli \
|
||||
php-dev \
|
||||
php-json php-xml php-mysql php-opcache php-readline php-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
|
||||
|
|
@ -629,7 +628,6 @@ installDepsPhp73 () {
|
|||
php7.3 php7.3-cli \
|
||||
php7.3-dev \
|
||||
php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \
|
||||
php-pear \
|
||||
php-redis php-gnupg \
|
||||
php-gd
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,11 +145,6 @@ $SUDO_WWW git submodule update --init --recursive
|
|||
# Make git ignore filesystem permission differences for submodules
|
||||
$SUDO_WWW git submodule foreach --recursive git config core.filemode false
|
||||
|
||||
# Install packaged pears
|
||||
sudo $RUN_PHP "pear channel-update pear.php.net"
|
||||
sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml"
|
||||
sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml"
|
||||
|
||||
# Create a python3 virtualenv
|
||||
$SUDO_WWW $RUN_PYTHON "virtualenv -p python3 $PATH_TO_MISP/venv"
|
||||
sudo mkdir /var/www/.cache
|
||||
|
|
|
|||
|
|
@ -137,11 +137,6 @@ $SUDO_WWW git submodule foreach --recursive git config core.filemode false
|
|||
# Make git ignore filesystem permission differences
|
||||
$SUDO_WWW git config core.filemode false
|
||||
|
||||
# Install packaged pears
|
||||
sudo $RUN_PHP "pear channel-update pear.php.net"
|
||||
sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml"
|
||||
sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml"
|
||||
|
||||
# Create a python3 virtualenv
|
||||
$SUDO_WWW $RUN_PYTHON "virtualenv -p python3 $PATH_TO_MISP/venv"
|
||||
sudo mkdir /usr/share/httpd/.cache
|
||||
|
|
|
|||
|
|
@ -180,10 +180,6 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic
|
|||
|
||||
# install plyara
|
||||
$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
|
||||
|
||||
# Install Crypt_GPG and Console_CommandLine
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
```
|
||||
|
||||
### 4/ CakePHP
|
||||
|
|
|
|||
|
|
@ -205,10 +205,6 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic
|
|||
|
||||
# install plyara
|
||||
$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
|
||||
|
||||
# Install Crypt_GPG and Console_CommandLine
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
|
||||
sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
|
||||
```
|
||||
|
||||
### 4/ CakePHP
|
||||
|
|
|
|||
|
|
@ -172,8 +172,6 @@ function installMISPonTsurugi() {
|
|||
a2dissite 000-default
|
||||
a2ensite default-ssl
|
||||
|
||||
pear channel-update pear.php.net
|
||||
pear install Crypt_GPG
|
||||
pecl channel-update pecl.php.net
|
||||
|
||||
yes '' |pecl install redis
|
||||
|
|
|
|||
Loading…
Reference in New Issue