MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
9,877 Commits
34 Branches
365 Tags
188 MiB
Commit Graph

7790 Commits (9b6c0d31d9fd4add112c338f995014becb934fb0)

Author SHA1 Message Date
Alexandre Dulaunoy 702301565b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-25 17:54:01 +02:00
Alexandre Dulaunoy 269e75d573
chg: [misp-objects] forensic objects added 2018-10-25 17:53:28 +02:00
Raphaël Vinot 8018084194 chg: Bump misp-galaxy & taxonomies 2018-10-25 10:22:56 -04:00
Alexandre Dulaunoy 8363727674
Merge pull request #3799 from garanews/patch-1 
fix separate misspelling
 2018-10-25 09:54:30 +02:00
garanews aaa14a9ace
fix referred misspelling 
referred vs refered
 2018-10-25 09:48:12 +02:00
garanews 4501338233
fix separate misspelling 
separate vs seperate
 2018-10-25 09:12:17 +02:00
Alexandre Dulaunoy af0fb30869
chg: [misp-galaxy] updated to the latest version 2018-10-24 23:18:53 +02:00
Alexandre Dulaunoy fbebdc4a14
chg: [misp-objects] updated to the latest version (including many new objects) 2018-10-24 23:17:57 +02:00
iglocska e854428ec3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 23:04:27 +02:00
Steve Clement 13974fb206
Merge pull request #3726 from pettai/shibb 
add date_created for provisioned users
 2018-10-24 20:11:37 +09:00
chrisr3d fa462f5db5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 11:08:22 +02:00
chrisr3d 238cc35b33
fix: [stix import] Importing uuids for objects from external sources 2018-10-24 11:07:46 +02:00
chrisr3d c3a7fd27ff
fix: [stix import] Importing uuids for STIX files generated via MISP 2018-10-24 08:25:24 +02:00
Steve Clement 93dbc6f9ca chg: [tools] Changed testForBinExec as the x-sharedlib type is not only on OpenBSD, Debian has the same type when check if executable. 
chg: [tools] Added typeinfo to the return so you see in the UI what type it thinks it is. (In case you forced the parameter on the CLI)
 2018-10-24 09:22:47 +09:00
chrisr3d 58c48878ea
fix: [stix import] Improved uuid fetching 2018-10-23 16:40:47 +02:00
chrisr3d 9513c8437d
fix: [stix import] Better event & attribute distribution parsing 2018-10-23 16:37:13 +02:00
chrisr3d b8abc71b13 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-23 14:07:35 +02:00
chrisr3d ea71259176
fix: [stix import] Supporting DHS stix files with ais marking 2018-10-23 14:06:22 +02:00
chrisr3d 0df6120ea8
fix: [stix import] Fixed import of File Objects as single attribute 2018-10-23 14:05:04 +02:00
iglocska 1051ddca0e fix: [galaxy] added collection uuid capture 2018-10-23 14:03:35 +02:00
Alexandre Dulaunoy 835dd3be15
chg: [misp-objects] updated to the latest version 2018-10-22 21:05:06 +02:00
chrisr3d 90fd773fb6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-22 15:48:52 +02:00
chrisr3d 4803c3223c
fix: [stix framing] Fixed Related Package(s) xml field typo 2018-10-22 15:47:36 +02:00
chrisr3d 51dca41fbe
fix: [stix export] Fixed xml package string replacement 2018-10-22 14:58:10 +02:00
chrisr3d 58e8ea82cf
fix: [stix2 import] Avoiding errors when the imported file name is not specified 2018-10-22 14:11:21 +02:00
Alexandre Dulaunoy 264dcde45d
chg: [misp-galaxy] updated to the latest version 2018-10-22 14:06:17 +02:00
iglocska 2d0d14f92a fix: [view] Added uuids to galaxy cluster view 2018-10-22 10:40:10 +02:00
iglocska ae597c8358 new: [galaxy] Several changes 
- moved the current uuid field on cluster level to a new "collection_uuid" field to better represent the actual purpose
- added new uuid field that actually captures the cluster's uuid
- upgrade script is multi-execution safe
- added /galaxy_clusters/view to the API
- /galaxy_clusters/view can now be queried via the uuid instead of just the ID
 2018-10-22 10:36:13 +02:00
chrisr3d 337de16004 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-22 10:35:51 +02:00
chrisr3d e0deb68d7a
fix: [stix2 import] Fixed GalaxyCluster description 
- Since description is optionnal in some STIX 2.0
  objects, we test if the field is there before
  trying to use its value
 2018-10-22 10:30:15 +02:00
iglocska 5d6b7f564b fix: [routes] Added route for .csv parsing 2018-10-22 05:20:09 +02:00
iglocska 702d4360f6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-21 22:47:59 +02:00
iglocska 1187fb2a27 new: [API] Added CSV as return format for event index 2018-10-21 22:47:22 +02:00
iglocska 572b0d13a4 new: [API description] Describe how to run diagnostics on MISP via the API 2018-10-20 15:58:43 +02:00
Alexandre Dulaunoy 0a7bde6d50
Merge pull request #3779 from MISP/att&ckMatrixFix 
fix: #3769 Att&ck matrix now render multiple kill_chain by column.
 2018-10-20 09:44:26 +02:00
Andras Iklody 04fe1c0cf6
Merge pull request #3778 from tomking2/2.4 
Fixes Issue #3633 - Returned XML has application/json Content-Type header
 2018-10-19 14:46:42 +02:00
Sami Mokaddem 8ce06f7351 fix: #3769 Att&ck matrix now render multiple kill_chain by column. 2018-10-19 12:28:59 +02:00
iglocska 4f4737d22a new: [upgrade] Preparing the data for recovery after the object reference sync fix 
- update the timestamps of all events / objcts that are affected and are locked = 0
 2018-10-19 11:25:55 +02:00
Tom King 8925e88581 fix: Check if the format is xml or application/xml on __sendResponse 2018-10-19 09:54:51 +01:00
iglocska e5e9701fbb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-19 10:12:59 +02:00
iglocska bc06f07848 fix: [cleanup] Removed debug from the bug fixing session 2018-10-19 10:10:34 +02:00
Steve Clement cebca8bcb7 chg: [tools] Added x-sharedlib clause in testForBinExec if on OpenBSD. 2018-10-19 08:53:10 +09:00
iglocska 0b0432536a chg: [warninglist] warninglists updated, fixes #3775 2018-10-18 20:18:06 +02:00
iglocska 6b60f3fa5c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-18 20:13:27 +02:00
iglocska e419c80e9e fix: [internal] Sharing group capturing fixed, fixes #3573 
- As reported by @eCrimeLabs
 2018-10-18 20:12:24 +02:00
iglocska 6f9551e202 fix: [internal] Unneeded model initialisation for getDefaultAttachments_dir() 2018-10-18 20:10:11 +02:00
chrisr3d 91807f5052
fix: [stix2 import] Fixed MISP event info field when importing STIX2 without report object 2018-10-18 15:13:19 +02:00
chrisr3d f20b4f70cd
fix: [stix2 import] Fixed json dict monkey syntax error 2018-10-18 15:12:21 +02:00
iglocska a40aa1748e fix: [internal] getPythonVersion woes 2018-10-18 15:01:04 +02:00
iglocska c96be93e3c fix: [internal] Fix of wonky model function calls across the application for getting default attachment directories 2018-10-18 09:51:14 +02:00