MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
12,186 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

12186 Commits (24658f3bc7a685797d456e4ba508d763b023e8bc)

Author SHA1 Message Date
Steve Clement 24658f3bc7
chg: [doc] Added plyara to kali installer, amended RHEL misp-modules (#4787) 
chg: [doc] Added plyara to kali installer, amended RHEL misp-modules
 2019-06-20 13:31:03 +10:00
Steve Clement 7eabb893c3
chg: [doc] Added plyara to kali installer, amended RHEL misp-modules 2019-06-20 11:57:38 +09:00
iglocska 59b877d022
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-19 14:09:25 +02:00
iglocska c06aa1fd79
fix: [API] Simple worker management added 
- /servers/startWorker/[queue]
- /servers/stopWorker/[pid]
- /servers/getWorkers
 2019-06-19 14:08:06 +02:00
Andras Iklody ba6fe46d6e
Merge pull request #4769 from cvandeplas/2.4 
fix: [js] fixes #4678 and javascript errors
 2019-06-19 07:37:54 +01:00
iglocska 9975e9e437
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-18 17:51:46 +02:00
iglocska 5b1697667f
new: [UI] Filter the object template index using the quick search 2019-06-18 17:51:25 +02:00
mokaddem 5c10a02bf0 fix: [object:proposeValidTemplate] Support only_full_group_by sql mode. 
Fix #4746
 2019-06-18 15:50:48 +02:00
iglocska 80975bf7d3
fix: [UI] Enrichment hover should also work after sorting / changing the event attribute context, etc 2019-06-18 14:42:31 +02:00
Christophe Vandeplas 9f8e22e96c fix: [js] fixes #4678 and javascript errors 2019-06-18 13:46:32 +02:00
iglocska 599641672e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-18 10:55:07 +02:00
iglocska 007377129f
new: [API] On-demand inclusion of attribute relations via the event view endpoint 
- new URL param, includeGranularCorrelations:1 added

                                 |\    /|
                              ___| \,,/_/
                           ---__/ \/    \
                          __--/     (D)  \
                          _ -/    (_      \
                         // /       \_ / ==\
   __-------_____--___--/           / \_ O o)
  /                                 /   \==/
 /                                 /
||          )                   \_/\
||         /              _      /  |
| |      /--______      ___\    /\  :
| /   __-  - _/   ------    |  |   \ \
 |   -  -   /                | |     \ )
 |  |   -  |                 | )     | |
  | |    | |                 | |    | |
  | |    < |                 | |   |_/
  < |    /__\                <  \
  /__\                       /___\
 2019-06-18 10:51:16 +02:00
Andras Iklody 1470d21813
Merge pull request #4674 from juju4/devel-globalstrict 
strict typing - snuffleupagus tests
 2019-06-18 09:29:12 +01:00
Andras Iklody 9fca396bb4
Merge pull request #4741 from StefanKelm/2.4 
Update EventBlacklistsController.php
 2019-06-18 09:28:30 +01:00
iglocska a507642a5a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-18 09:58:23 +02:00
iglocska c097f001dc
new: [security] Made certain settings modifiable via the CLI only 
- some settings are too risky to be exposed, even to site admins, so made them CLI accessible only
 2019-06-18 09:57:27 +02:00
Steve Clement 53bddddb8e
chg: [tools] ask_o () wants -e (for colorz) (#4764) 
chg: [tools] ask_o () wants -e (for colorz)
 2019-06-18 02:25:00 +10:00
Steve Clement 6ef2d69c10
chg: [tools] ask_o () wants -e (for colorz) 2019-06-18 01:23:26 +09:00
chrisr3d fc528d9315
fix: [stix import] Fixed address objects parsing 2019-06-17 09:49:53 +02:00
chrisr3d 139eab9fe9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-17 09:16:47 +02:00
chrisr3d 62a1bd8aa3
new: [stix import] Parsing observable compositions from external STIX files 2019-06-17 09:15:59 +02:00
iglocska 39a7077096
new: [server settings] Added option to disable the write collision safe rotating config.php handler 2019-06-17 00:43:00 +02:00
iglocska 98aca016e0
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-16 19:15:48 +02:00
iglocska c42c5fe927
fix: [security] Fixed an RCE vulnerability with user controled entries being fed to file_exists 
- phar protocol paths for php file instructions can lead to RCE via meta-data deserialization
- mitigated by the functionalities enabling this being only accessible to site admins

- Reported by Dawid Czarnecki
 2019-06-16 19:11:35 +02:00
Steve Clement 959f4becf3
Merge branch '2.4' into tools 2019-06-15 12:03:24 +09:00
Steve Clement 683c1a8485
chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot. (#4751) 
chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot.
 2019-06-15 13:03:07 +10:00
Steve Clement bcde82a77d
chg: [installer] Regen Installer 2019-06-15 11:59:45 +09:00
Steve Clement d383a3dff8
chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot. 2019-06-15 11:58:32 +09:00
Steve Clement 736f3824ba
fix: [shell] ask_o () needed some quotes, regenerated installer. (#4750) 
fix: [shell] ask_o () needed some quotes, regenerated installer.
 2019-06-15 12:36:52 +10:00
Steve Clement e64d16d124
fix: [shell] ask_o () needed some quotes, regenerated installer. 2019-06-15 11:35:27 +09:00
Steve Clement 3b460366f2
chg: [doc] Added more bits to GPG key. (#4749) 
chg: [doc] Added more bits to GPG key.
 2019-06-15 12:27:43 +10:00
Steve Clement f215a66506
chg: [doc] Added more bits to GPG key. 2019-06-15 11:24:00 +09:00
Steve Clement c2c01810ca
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard. (#4748) 
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard.
 2019-06-15 00:15:22 +10:00
Steve Clement 1340a1853f
Merge branch '2.4' into tools 2019-06-14 23:14:07 +09:00
Steve Clement ef1235ba69
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums. (#4747) 
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums.
 2019-06-15 00:13:36 +10:00
Steve Clement 5cb723b37c
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard. 2019-06-14 23:11:38 +09:00
Steve Clement 60f85f4449
Merge branch '2.4' into guides 2019-06-14 22:55:39 +09:00
Steve Clement 20987df620
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums. 2019-06-14 22:53:10 +09:00
chrisr3d 57766f03e1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-13 19:43:59 +02:00
chrisr3d 447a7b2a30
fix: [stix import] Better handling of missing python libraries 2019-06-13 19:41:57 +02:00
StefanKelm 2757d58f44
Update edit.ctp 
Clarification that "Fetch GnuPG key" actually connects to the MIT key server
 2019-06-13 16:00:29 +02:00
StefanKelm 22345a747d
Update EventBlacklistsController.php 
(minor) aligns the text with app/Controller/Component/BlackListComponent.php
 2019-06-13 14:57:10 +02:00
iglocska 5d611c39ff
fix: [ajaxTypes] copy pasta fixed 2019-06-13 14:19:47 +02:00
iglocska 99884f371d
chg: [reusability] Further modifications - have an on-demand static mode for ajaxTags 2019-06-13 14:18:06 +02:00
iglocska 58b5e36fe3
chg: [reusability] modified ajaxTags to massage the data a bit for code-reuse 2019-06-13 14:15:55 +02:00
iglocska add2719c99
chg: [VERSION] bump 2019-06-13 09:36:04 +02:00
Alexandre Dulaunoy 41d6e332f3
chg: [misp-galaxy] updated to the latest version 2019-06-13 09:27:02 +02:00
Steve Clement ac4b86c275
chg: [installer] Updated Installer and chksums to latest (#4740) 
chg: [installer] Updated Installer and chksums to latest
 2019-06-13 10:10:41 +10:00
Steve Clement 70af77c40f
chg: [installer] Updated Installer and chksums to latest. 2019-06-13 09:09:34 +09:00
Steve Clement 62d7d7498a
Merge branch '2.4' into guides 2019-06-13 09:09:27 +09:00