MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
23,912 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

23912 Commits (efeafeae5bd6e970cf08a94df9e711e6c57c2cac)

Author SHA1 Message Date
Christian Studer efeafeae5b
add: [stix2 import] Added parameters used by `misp-stix` to handle the distribution value 2023-04-21 10:15:02 +02:00
Christian Studer 9a50d3324f
fix: [upload_stix] Properly showing and hiding the sharing groups selector 2023-04-21 09:52:17 +02:00
Christian Studer 334ddbc533
add: [stix2 import] Added `distribution` to the `upload_stix` form so we can pass its value to `misp-stix` 2023-04-20 20:37:02 +02:00
Christian Studer 6bb0168860
chg: [misp-stix] Bumped latest version 2023-04-20 20:14:02 +02:00
Christian Studer 7cd2415555
chg: [misp-stix] Bumped the latest version that supports the recent changes used to generate new galaxies and clusters 2023-04-19 16:43:18 +02:00
Christian Studer 0b5dfd0bd5 Merge branch '2.4' of github.com:MISP/MISP into misp-stix 2023-04-19 16:42:35 +02:00
Christian Studer 532284fdb1
add: [stix import] Supporting the STIX 2 objects import as Galaxies 2.0 
- Extracting the Galaxies & Clusters
- Using the `importGalaxyAndClusters` endpoint to
  handle the creation of new Galaxies & Clusters
- Passing the related tag names to have the
  clusters attached to the right data structures
 2023-04-19 16:38:37 +02:00
Christian Studer 0de2eea029
add: [upload_stix] Added the `galaxy_editor` permission condition on the `upload_stix` form to view the Galaxies 2.0 related checkbox 2023-04-19 16:36:04 +02:00
Christian Studer 148bc21b5c
fix: [stix2 import] Adding all the submodules dependencies to avoid issues with uninstalled python libraries and use the submodules directly instead 2023-04-19 16:34:28 +02:00
Christian Studer 1e1980a2ae
chg: [stix import] Updated the `upload_stix` form params to be inline with the support of multiple STIX 1 & 2 versions 2023-04-19 16:32:39 +02:00
Sami Mokaddem 6710d1179c
fix: [workflow:formatConvert] Make sure to include the __allTags when in converting from event scope 2023-04-19 16:25:45 +02:00
Sami Mokaddem ebb967ca77
fix: [workflow:tag_if] Correctly parse empty tag fields 2023-04-19 16:25:40 +02:00
Alexandre Dulaunoy cc32b321f2
chg: [misp-galaxy] updated 2023-04-19 11:33:21 +02:00
Christian Studer 093e7708a6
fix: [misp-stix] Bumped latest version with some quick fixes 2023-04-16 00:12:29 +02:00
Christian Studer 81a5f6e2e2 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2023-04-16 00:11:29 +02:00
Alexandre Dulaunoy 4c142e5e70
chg: [misp-galaxy] updated to the latest version 2023-04-14 16:26:07 +02:00
Christian Studer 576558b270
fix: [stix2 import] Fixed the STIX version value used to describe the uploaded STIX file 2023-04-13 16:37:50 +02:00
Christian Studer 8bd7e4cbb7
fix: [stix2 import] Changed the test to check the `misp-stix` conversion return message 2023-04-13 15:44:26 +02:00
Christian Studer a260fa3e83
wip: [stix2 import] Using `misp-stix` to import STIX 2 content 
- Changed the related view used to upload the
  STIX 2 files
- Added 2 parameters to choose to import Galaxies
  as tag or with a complete Galaxy content parsing
  (which will be implemented soon), and another
  one for admins to debug the errors and warnings
  messages sent by `misp-stix`
 2023-04-13 15:30:17 +02:00
Christian Studer 0d5d05dadd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2023-04-13 14:55:32 +02:00
Sami Mokaddem f62b61f208
chg: Bumped version 2023-04-13 11:06:46 +02:00
Christian Studer cbfa1705d4
chg: [misp-stix] Bumped the latest version 2023-04-13 10:38:32 +02:00
Christian Studer 34cea95b28 Merge branch 'develop' of github.com:MISP/MISP into develop 2023-04-13 10:37:58 +02:00
Christian Studer 90adb242b7 Merge branch '2.4' of github.com:MISP/MISP into develop 2023-04-13 10:37:51 +02:00
Christian Studer 00de27ecbf Merge branch '2.4' of github.com:MISP/MISP into 2.4 2023-04-13 10:36:53 +02:00
Sami Mokaddem 76868d1e64
fix: [workflow:tag_if] Correctly compare cluster tags 2023-04-13 10:15:16 +02:00
Sami Mokaddem 32c819aabb
Merge branch 'develop' of github.com:MISP/MISP into chg-acl-event-add-simplification 2023-04-13 09:42:39 +02:00
Luciano Righetti af0b17a1d3 fix: unset id and uuid of object attributes if regenerateUUIDs is checked when populating event with a MISP json fixes #9012 2023-04-13 09:28:10 +02:00
Raphaël Vinot bc82b38db0 chg: [PyMISP] Bump 2023-04-12 15:59:34 +02:00
Alexandre Dulaunoy d1c72888a6
chg: [misp-warninglists] updated to the latest version 2023-04-12 15:57:38 +02:00
Alexandre Dulaunoy 75ecfc1cd5
chg: [misp-taxonomies] updated to the latest version 2023-04-12 15:57:09 +02:00
Alexandre Dulaunoy 1285140737
chg: [misp-objects] updated to the latest version 2023-04-12 15:56:37 +02:00
Alexandre Dulaunoy 3ed527683e
chg: [misp-galaxy] updated 2023-04-12 15:56:12 +02:00
Luciano Righetti b90308dd67
Merge pull request #8980 from righel/ignore-dup-attrs 
[new]: add breakOnDuplicate option to attributes/add
 2023-04-12 15:50:55 +02:00
Luciano Righetti 93f1daeb32
Merge pull request #9009 from righel/fix-openioc-import 
fix: fix openioc import
 2023-04-12 15:10:57 +02:00
Luciano Righetti 478d1c6440 fix: fix "'sharing_group_id' doesn't have a default value error" error when importing OpenIOC file 2023-04-12 14:54:15 +02:00
Luciano Righetti e88a64db52 fix: disable csrf checks for events/saveFreeText when CustomAuth is enabled, fixes #8991 2023-04-12 11:18:27 +02:00
Alexandre Dulaunoy ed62c2e8aa
Merge branch '2.4' into develop 2023-04-11 10:02:54 +02:00
Alexandre Dulaunoy ff67d081f8
chg: [misp-galaxy] updated to the latest version 2023-04-11 10:02:29 +02:00
Alexandre Dulaunoy 5bc4aff8e0
chg: [misp-galaxy] updated 2023-04-11 10:02:03 +02:00
Alexandre Dulaunoy 9788a38eb0
Merge pull request #8989 from dnso86/fix-cake-optimisetables-query 
Fix typo in OPTIMIZE MySQL commands
 2023-04-08 12:00:32 +02:00
Luciano Righetti db47d7f285 chg: move breakOnDuplicate check to Attribute::captureAttribute 2023-04-07 15:29:36 +02:00
Luciano Righetti e62e1b00db fix: handle when a batch of attributes is sent and only a subset has breakOnDuplicate=false 2023-04-07 11:28:16 +02:00
Sami Mokaddem fb806590f9
chg: [event:_add] Simplified ACL test checking whether a user can create the event 
- Simplifed code
- Removed extremely old condition `$data['Event']['orgc'] != user['Organisation']['name']` that's not relevant anymore
- Make sure that Orgc.uuid takes precedence over Event.orgc_id
 2023-04-06 15:51:50 +02:00
Luciano Righetti 4acc24580d fix: remove unused line 2023-04-06 15:38:52 +02:00
Sami Mokaddem 362156daca
fix: [event:viewAttribute] Reset pagination state when using a filter on the attribute table 
- This will certainly make @rommelfs happy :)
 2023-04-06 15:24:15 +02:00
Sami Mokaddem 336f9787af
Merge branch 'pr-8983' into develop 2023-04-06 15:09:54 +02:00
Sami Mokaddem 3503845e2b
Merge branch '2.4' of github.com:MISP/MISP into develop 2023-04-06 15:09:16 +02:00
Christophe Vandeplas 74b9d62dc7 fix: [galaxy] Clarify supported format of webui galaxy import 2023-04-05 02:17:39 +02:00
Christophe Vandeplas 125e9852d9 chg: [workflow-module:send_mail] add send_log_mail for org admin as rcpts 2023-04-01 05:11:13 +02:00