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

13006 Commits (91e43787e04ca9618a97650170027337cbd8b317)

Author SHA1 Message Date
iglocska 91e43787e0
chg: [version] bump 2019-09-09 13:06:31 +02:00
iglocska e89d1a267d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-09 13:03:09 +02:00
iglocska 75acd63c46
fix: [security] Fix to a vulnerability related to the server index 
- along with various support tools
- more information coming soon
 2019-09-09 13:00:21 +02:00
Sami Mokaddem 936a745135
Merge pull request #5119 from JakubOnderka/patch-24 
fix: [UI] Removed duplicate button title in userIndexTable.ctp
 2019-09-09 09:26:37 +02:00
Andras Iklody 65be5dfc03
Merge pull request #5120 from JakubOnderka/gpg-composer 
Install Crypt_GPG by composer
 2019-09-08 22:20:14 +02:00
Alexandre Dulaunoy bd7f7b7b3a
Merge pull request #5103 from JakubOnderka/circl-key-server-description 
fix: [UI] GPG keys are fetched from CIRCL keyserver
 2019-09-08 09:20:15 +02:00
Jakub Onderka 4b1645a54e fix: Throw exception when GnuGP homedir is not set 2019-09-07 00:01:55 +02:00
Jakub Onderka becee3b772 chg: Install crypt_gpg by composer 2019-09-06 22:00:56 +02:00
Jakub Onderka 863e38807d chg: Allow to load Crypt_GPG from composer 2019-09-06 21:31:16 +02:00
Jakub Onderka a0733e6429
fix: [UI] Removed duplicate button title in userIndexTable.ctp 2019-09-06 18:48:33 +02:00
chrisr3d eebeeb9804 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 17:07:30 +02:00
chrisr3d 9d3e340b52
fix: [stix2 import] Fixed hash patterns import for external STIX files 2019-09-06 17:06:38 +02:00
Andras Iklody 22d4216c9e
Merge pull request #5117 from JakubOnderka/patch-23 
fix: [UI] Fetching GPG keys
 2019-09-06 16:31:41 +02:00
Jakub Onderka f63cfc9c5a
fix: [UI] Fetching GPG keys 
This error was introduced in 600e540516
 2019-09-06 15:56:01 +02:00
iglocska 36ef32392e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 15:55:41 +02:00
iglocska 5e1a26afa0
fix: [internal] orgs restricted to a domain displayed incorrectly 
- afterfind messes up the keys by reusing the same var for an inner loop
 2019-09-06 15:54:58 +02:00
Andras Iklody 3e3f8c7dfd
Merge pull request #5116 from JakubOnderka/patch-22 
chg: [user] Remove unused private method
 2019-09-06 14:12:56 +02:00
Jakub Onderka 6f4b99026e
chg: [user] Remove unused private method 2019-09-06 13:59:47 +02:00
iglocska b2e026b9ef
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 11:08:17 +02:00
iglocska 41f5c88c74
fix: [sync] Fixed major performance blocker 
- fix based on the insights of @RichieB2B, the hero we need, not the one we deserve
- added orgc_uuid to the minimal event index
- added handlers for it on the pull side
- when pulling from old instances the new functionality is skipped, resulting in the behaviour we had pre-patch
- both sides of the sync are encouraged to update, especially if the slow pulls are causing issues
 2019-09-06 10:59:48 +02:00
Andras Iklody 15d38ed898
Merge pull request #5115 from RichieB2B/ncsc-nl/speedup-pull 
Speedup pull
 2019-09-06 09:52:54 +02:00
Andras Iklody 11f717002d
Merge pull request #5112 from JakubOnderka/fix-feed-get-manifest 
fix: [feed] Fetching event manifest
 2019-09-05 20:17:27 +02:00
Jakub Onderka 7904509fde fix: [feed] Fetching event manifest 2019-09-05 19:16:26 +02:00
Richard van den Berg e53ec5b0c8 Log reason for event download failure 2019-09-05 15:29:23 +02:00
Richard van den Berg 9ebd5f21be Log all errors from server pull 2019-09-05 15:22:38 +02:00
Richard van den Berg c2b0172549 Loose a find when adding existing event 2019-09-05 10:42:08 +02:00
Jakub Onderka 2ea4b37368 fix: [UI] GPG keys are fetched from CIRCL keyserver 2019-09-04 18:09:49 +02:00
chrisr3d d783e0d039 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-04 16:21:37 +02:00
chrisr3d a19029c8ec
fix: [stix2 import] Dealing with the case of named pipe attribute being imported from custom object 2019-09-04 16:20:39 +02:00
chrisr3d dc98e1bc56
fix: [stix2 export] Avoid fails with named pipe export as custom object 2019-09-04 16:20:05 +02:00
Andras Iklody 0cb0aa1dac
Merge pull request #5101 from JakubOnderka/patch-20 
chg: [user] Use machine readable format for fetching PGP keys
 2019-09-04 15:36:34 +02:00
Andras Iklody 62a9c73c9e
Merge pull request #5052 from JakubOnderka/error-handling 
Better error handling for fetching feeds
 2019-09-04 15:35:03 +02:00
Andras Iklody d1e45e72e2
Merge pull request #5102 from JakubOnderka/patch-21 
fix: [UI] Remove rest of unused code
 2019-09-04 15:33:58 +02:00
Jakub Onderka dc0cf472d3
fix: [UI] Remove rest of unused code 
Inner code was removed in 3f03ceb229
 2019-09-04 14:52:12 +02:00
Jakub Onderka 600e540516
chg: [user] Use machine readable format for fetching PGP keys 2019-09-04 13:10:37 +02:00
chrisr3d 6b2eaa9fe2
add: [stix import] Importing pipe objects as named pipe attribute 2019-09-04 11:32:21 +02:00
chrisr3d 3d5981bcb0
add: [stix export] Exporting named pipe attributes 2019-09-04 11:20:54 +02:00
Jakub Onderka a45575a44d chg: [feed] Error handling for saveFreetextFeedData 2019-09-03 17:24:06 +02:00
mokaddem 3f03ceb229
fix: [server] on-demand action does not redirect to the updateProgress 
page anywmore
 2019-09-03 15:14:40 +02:00
chrisr3d 48e8d30a9a
chg: [stix2] Bumped latest STIX2 python library changes 2019-09-03 14:08:25 +02:00
Jakub Onderka 7d438673c1 chg: [feed] Handle exceptions for ServerShell::enqueueFeedCache 2019-09-02 20:37:18 +02:00
Jakub Onderka 38e2c1cfc2 fix: [feed] Use own solution how to redirect when fetching feeds 2019-09-02 19:52:41 +02:00
Jakub Onderka d5e3be18b5 chg: [feed] Throw exception if feed filter rules is not valid JSON 2019-09-02 19:52:41 +02:00
Jakub Onderka de2b143748 chg: [feed] Better error handling for cacheFeedInitiator method 2019-09-02 19:52:41 +02:00
Jakub Onderka d7809df2d0 chg: [feed] More accurate progress logging for downloadFromFeed 2019-09-02 19:52:41 +02:00
Jakub Onderka 6c878ff31c chg: [feed] Better exception logging 2019-09-02 19:52:41 +02:00
Jakub Onderka 35d67c261e chg: [feed] New method Feed::jobProgress 2019-09-02 17:51:37 +02:00
Jakub Onderka 77fe7e10fc chg: [feed] New private method Feed::isFeedLocal 2019-09-02 17:51:37 +02:00
Jakub Onderka 49df6ccd1a chg: [feed] Use Feed::feedGetUri in Feed::getFreetextFeed 2019-09-02 17:51:37 +02:00
Jakub Onderka 18eb86ff32 chg: [feed] Feed::getNewEventUuids always return array with 'add' and 'edit' fields 2019-09-02 17:51:37 +02:00