MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
5,992 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

5992 Commits (2b6ee46e9ac412ac744b356f01b841c20a642e70)

Author SHA1 Message Date
Alexandre Dulaunoy 5ae3905f49 fix: misp-taxonomies updated to the latest version 2017-05-26 15:04:03 +02:00
Alexandre Dulaunoy 6182491f2a fix: misp-galaxy latest version updated 2017-05-26 15:03:37 +02:00
Alexandre Dulaunoy b650512cab fix: skip the import of mixbox for users of older stix libraries 
If you rely on old idgen from previous stix libraries, mixbox is not installed.
This completes the fix #2186 and should be fine for old and new stix libraries.

A partial lyric has been included in this commit to ease the pain to work ##comma##:

Money for nothin' and your stix for free
Money for nothin' and stix for free
 2017-05-26 14:25:03 +02:00
iglocska 8df85ee94e Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-26 13:05:44 +10:00
iglocska 426c1d8847 fix: Fixed a notice issue with the feed index if no cache has been generated yet 2017-05-26 13:05:10 +10:00
Andras Iklody d9b0c36165 Merge pull request #2211 from kajogo777/2205 
FIX #2205 attachTagToObject permissions so that tagger role are able …
 2017-05-23 01:48:23 +02:00
iglocska 604b3b056c fix: GUI bug/inconsistency (Explore remote server), fixes #2203 
- Removed the link from the published sign, it was indeed silly
 2017-05-23 01:42:36 +02:00
iglocska 66613dd38f fix: Fixed a few silly issues with the hids export 
- allow POSTed parameters
- simpler response always responds with txt type, won't complain about view not being set for incorrect accept headers
 2017-05-22 15:03:56 +02:00
iglocska ccde4a8770 fix: hids api threw error on empty result 2017-05-22 14:47:57 +02:00
iglocska 371652d99b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-22 14:32:18 +02:00
iglocska 56c079642d new: Added attribute JSONs to pubsub system 
- also made mispzmq a but more generic
 2017-05-22 14:30:58 +02:00
George 4c038bf2ae FIX #2205 attachTagToObject permissions so that tagger role are able to tag objects where obj.orgc_id != user.org_id fixes 2017-05-20 23:57:33 +02:00
Hendrik e9ca4869b5 Fix invalid newsread 2017-05-19 19:17:16 +02:00
Richard van den Berg 7b18dc19bb Also test for mixbox version 2017-05-19 15:22:48 +02:00
Alexandre Dulaunoy 956fa130c4 fix: MISP galaxy updated to the latest version 2017-05-18 20:49:09 +02:00
Andras Iklody c61b58ae73 Merge pull request #2200 from RichieB2B/ncsc-nl/openioc 
Several fixes for OpenIOC importer
 2017-05-18 17:24:29 +02:00
Richard van den Berg ac7b95380d Set OpenIOC attribute distribution to 'Inherit' by default 2017-05-18 17:10:44 +02:00
Richard van den Berg 865c5e0448 Accept RouteEntryItem strings 2017-05-18 17:03:52 +02:00
Richard van den Berg 79ad2ea6c9 Test for 'success' key, fixes #2198 2017-05-18 14:27:35 +02:00
Alexandre Dulaunoy 0193c15a4b fix: MISP galaxy updated to the latest version 2017-05-17 10:39:23 +02:00
Alexandre Dulaunoy d17f3d1d89 fix: update to the MISP galaxy latest version 2017-05-16 19:47:46 +02:00
Alexandre Dulaunoy bd82135698 Merge pull request #2190 from FloatingGhost/2.4 
Deal with the stupid errors STIX thinks it's ok to just throw
 2017-05-15 19:32:34 +02:00
Hannah Ward 6ec9ee12a1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-15 10:02:21 +01:00
Hannah Ward 3954cd6b4e
fix: Deal with all the weird and "wonderful" stix versions 
Tries to fix #2181
 2017-05-15 10:01:32 +01:00
Alexandre Dulaunoy ff0f760eb4 fix: misp-galaxy updated to the latest version 2017-05-14 16:56:41 +02:00
Andras Iklody 992f301988 Merge pull request #2186 from FloatingGhost/2.4 
fix: Move idgen call to mixbox
 2017-05-12 10:52:34 +02:00
Hannah Ward 7fbd2421ec
fix: Move idgen call to mixbox 2017-05-12 09:17:03 +01:00
iglocska 81141ed4e0 fix: Fixed an issue with the freetext importer failing if no tags were set 2017-05-12 06:51:52 +02:00
root c0ba6a1646 Changing some texts 2017-05-11 15:12:26 +02:00
Pablo Panero 8829e90547 newsread attribute fixed for user registration via sso 2017-05-11 14:49:42 +02:00
iglocska 4c4f9a4dbb chg: Allow for \t to be used as a CSV feed delimiter 2017-05-11 14:46:20 +02:00
root e489f431d9 Adding small diagnostic on Server Setting > Diagnostics page to check if some attachments 
referenced in database doesn't exist on filesystem.
 2017-05-11 14:11:08 +02:00
iglocska c6029b314a Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-11 10:49:50 +02:00
iglocska 314daa4551 new: Add instance uuid 2017-05-11 10:49:23 +02:00
Andras Iklody 332410defa Merge pull request #2179 from truckydev/2.4 
add possibility to define tags for import module.
 2017-05-11 10:24:08 +02:00
iglocska 680364225e fix: Fixed a condition where no proposals downloaded generated a warning in the debug log 2017-05-11 09:26:50 +02:00
iglocska 1d3a36c7c7 fix: Added default comment to event blacklists, fixes #2080 2017-05-11 09:22:20 +02:00
iglocska 468834b210 fix: Updated cakephp solving TLS 1.2 issues 2017-05-11 08:38:50 +02:00
Tristan METAYER e71045571c add possibility to define tags for import module. 
Add possibility to desable validation for String field when empty
 2017-05-10 19:51:27 +02:00
iglocska e34634201b fix: fixed an API vs documentation mismatch for the nids exports 2017-05-10 16:35:17 +02:00
iglocska c80621d2ef fix: Removed two duplicate fields from MYSQL.sql 2017-05-10 14:33:05 +02:00
iglocska 4ba1fb8fd8 fix: Added missing fields causing pulled events to not contain attributes, fixes #2171 2017-05-10 14:24:34 +02:00
iglocska 459766dbff fix: Fixed two small bugs 2017-05-10 02:51:19 +02:00
iglocska 3e02bbd478 fix: Don't show links to feeds on the event view to normal users 2017-05-09 17:22:53 +02:00
iglocska e18344b3f5 fix: several fixes to the feed overlay matrix 
- lookup was broken for csv/freetext feeds
- allow users to see the feeds if the admin allows it
 2017-05-09 16:35:59 +02:00
iglocska f0136d5774 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-09 14:26:02 +02:00
iglocska da3d841117 fix: Make redis optional (for now) 2017-05-09 14:22:17 +02:00
Alexandre Dulaunoy 9cb8d00b4a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-05-09 11:02:40 +02:00
Alexandre Dulaunoy c59ee781fa fix: PyMISP updated to the latest version 2017-05-09 11:02:09 +02:00
Andras Iklody eef8b55120 Merge pull request #2128 from deloittem/2.4 
Snort attribute generation rule now contains the initial msg field
 2017-05-09 10:46:47 +02:00