MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,751 Commits
34 Branches
364 Tags
186 MiB
Commit Graph

1674 Commits (7ac9cae7b6aa21eb7a8c4d492dc0e507ab4cb14a)

Author SHA1 Message Date
Jakub Onderka 15767eae0d chg: [internal] Faster removing galaxy cluster tags from attributes 2020-05-23 17:30:00 +02:00
Jakub Onderka 20b1a30647 fix: [internal] Fix notice in PHP7.4 when loading events attrs by ajax 2020-05-23 17:16:30 +02:00
chrisr3d 89c590edc0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-20 01:18:46 +02:00
Jakub Onderka e9dc6e36f4
new: [UI] Add event ID to page table 
With more tabs, navigation between tabs with different events can be pain, when all of them has the same title.
 2020-05-19 21:20:31 +02:00
Jakub Onderka 59e635c974 fix: [internal] Remove duplicate code that cause error in PHP 7.4 2020-05-19 17:37:41 +02:00
chrisr3d 285cc2dea0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-18 11:05:52 +02:00
Golbark c244c5c21a fix: allow_disabling_correlation not taken into account 2020-05-15 09:05:50 +02:00
mokaddem 3bc2b2c50a
chg: [clusterRelations:networkGenerator] Moved function in `Lib/Tools` 2020-05-12 10:29:52 +02:00
mokaddem 36e1e37469
fix: [events:view] Fixed cluster_relations filename and distribution 
info
 2020-05-12 10:08:13 +02:00
mokaddem abac1f5d84
chg: [events:relations_graph] Added Referencing Clusters 2020-05-11 16:55:18 +02:00
mokaddem 3acf2bd4cf
chg: [clusterRelations:networkGraphs] Improved UI by highlighting root 
nodes
 2020-05-11 15:14:29 +02:00
mokaddem 089081a77d
new: [events:view] Added Cluster relationship network graph 2020-05-11 11:32:45 +02:00
chrisr3d 5e83761f83 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-07 11:47:55 +02:00
Steve Clement 833af7c114
Merge pull request #5207 from JakubOnderka/patch-33 
fix: [internal] Just site admin can force when saving freetext
 2020-04-30 18:21:04 +09:00
mokaddem 8525dda7f8
Merge remote-tracking branch 'origin/2.4' into eventTimeline-sightings 2020-04-30 08:38:39 +02:00
chrisr3d 6adc0f2777 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-28 17:56:36 +02:00
mokaddem 94bf826841
Merge remote-tracking branch 'origin/2.4' into JakubOnderka-event_loading_speedup 2020-04-28 11:39:51 +02:00
mokaddem 2ad846fbfb
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 10:01:19 +02:00
mokaddem ffad8d9189
chg: [events:view] Support of `extended` for posted data 2020-04-28 10:00:36 +02:00
Christophe Vandeplas 5495140c3b
fix: [event] fixes missing correlations with combined types (#5832) 
* fix: [event] fixes missing correlations with combined types

also some other missing variable bug
 2020-04-28 10:00:09 +02:00
Jakub Onderka f0ada41963 chg: [internal] Speed up of loading event page 2020-04-27 16:00:28 +02:00
mokaddem 93bd5eddba
chg: [event:timeline] Added Sightings visualisation 2020-04-23 10:08:34 +02:00
chrisr3d 4ffb45eafc Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-16 17:55:31 +02:00
iglocska 7991016039
fix: [API] event index queries refactored 
- fixed ID lookups to be more graceful (IN() instead of OR-d statements)
- removed default sorting which is the default anyway but introduces a massive overhead
 2020-04-14 18:00:43 +02:00
mokaddem dd1be03597
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-04-09 14:26:48 +02:00
chrisr3d 3ec127bcbe Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-08 16:44:03 +02:00
mokaddem d5f5552d91
chg: [events:exports] Migrated majority of export type to use restSearch 2020-04-06 11:49:39 +02:00
mokaddem 0d7199cb08
fix: [events:export-csv] Default to_ids to be 1 2020-04-06 10:14:45 +02:00
chrisr3d 8163857417 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-03 14:56:19 +02:00
iglocska f028313029
fix: [event index] org filter correctly accepts array in addition to pipe delimited values 
- fixes pull org filters
 2020-03-30 08:56:30 +02:00
mokaddem 04dcdebb1f
new: [galaxyCluster] Initial import of Galaxy2.0 codebase - WiP 2020-03-12 10:26:09 +01:00
chrisr3d 8e199ccc32 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-28 22:51:21 +01:00
Steve Clement 5660467f84
fix: [i18n] Various edits and small __('') addeage. 2020-02-27 10:43:04 +09:00
chrisr3d 5ab8a18d11 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-26 17:12:48 +01:00
iglocska aaafd95c74
fix: [sync] allow for both the minimal and searchminimal keywords to be used on the event index 
- until now due to a bug only searchminimal was used
- sync negotiation uses minimal as the key
- this should greatly speed up the negotiation phase
 2020-02-25 16:48:05 +01:00
chrisr3d 50d0fa1011 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-14 20:30:02 +01:00
Jakub Onderka 3770886bb8
fix: [internal] Remove unused function 2020-02-13 15:57:58 +01:00
chrisr3d 089fbb6231
fix: [stix import] Some strings are defined in a cleaner way 2020-01-22 15:39:06 +01:00
mokaddem 2a5112cc1e
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 2020-01-17 09:20:49 +01:00
Andras Iklody 59ff6d9f6e
Merge pull request #5504 from tomking2/bug/first_recorded_change 
fix: Incorrect directionality for oldest_timestamp comparisons
 2020-01-14 10:05:57 +01:00
Tom King ef4b663b8c fix: Incorrect directionality for oldest_timestamp comparisons 2020-01-14 08:08:04 +00:00
chrisr3d c08914eee9
fix: [modules] Making sure the module format is set 
- Making sure the module format is not empty is
  better than only making sure the variable is set
 2020-01-06 16:44:58 +01:00
iglocska 08edba87e6
fix: [STIX] import fixed 
________________   ___/-\___     ___/-\___     ___/-\___
     / /             ||  |---------|   |---------|   |---------|
    / /              ||   |       |     | | | | |     |   |   |
   / /             __||   | STIX  |     | | | | |     | | | | |
  / /   \\        I  ||   |       |     | | | | |     | | | | |
 (-------------------||   | | | | |     | | | | |     | | | | |
 ||               == ||   |_______|     |_______|     |_______|
 ||   TAXII       | =============================================
 ||          ____    |                                ____      |
( | o      / ____ \                                 / ____ \    |)
 ||      / / . . \ \                              / / . . \ \   |
[ |_____| | .   . | |____________________________| | .   . | |__]
          | .   . |                                | .   . |
           \_____/                  -cfbd-          \_____/
 2019-12-19 16:17:05 +01:00
mokaddem 3a45d473b2
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 2019-12-19 10:44:43 +01:00
iglocska eb50b68708
fix: [UI] adding attack-like galaxy clusters to tag collections was slow 
- was generating a heatmap out of all event metadata each time for no good reason
 2019-12-18 15:07:41 +01:00
mokaddem be8d4048a0
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 2019-12-16 15:05:05 +01:00
Andras Iklody 45d88bb9ef
Merge pull request #5464 from zaphodef/fix/empty_error_panel 
fix: Don't show an empty error when there is no error
 2019-12-16 13:57:36 +01:00
mokaddem 7797aeed94
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 
Not a simple merge. Needed to fix forms and simplified how
form_seen_input works
 2019-12-16 13:36:01 +01:00
chrisr3d dcebfac103 Merge branch 'add_attribute' of https://github.com/MISP/MISP into 2.4 2019-12-13 11:18:23 +01:00
Pierre-Jean Grenier e934eede67 fix: Don't show an empty error when there is no error 2019-12-12 17:06:53 +01:00
chrisr3d 47540c206a
fix: [event add view] Avoided setting the action variable 
- That is available from the view side within $this->request->params
 2019-12-11 10:59:15 +01:00
iglocska b6bb2bb576
new: [UI] first implementation of the modal forms 2019-12-11 10:03:43 +01:00
mokaddem a1fdea754d
Merge branch 'zoidberg-timeline' into zoidberg-final 2019-12-06 15:40:51 +01:00
mokaddem adb83afe73
fix: [event:view] Correctly display `Edit Event` when Editing instead of 
`Add Event`
 2019-12-03 16:17:31 +01:00
iglocska 1c5afa49ed
new: [refactor] Massive internal refactor and cleanup of deprecated APIs 
- new centralised restSearch function in AppController as entry point via all controllers
- new component handling restSearch related support functions, such as parameter mapping
- hollowed out all deprecated export functions on the event/attribute controller
  - replaced with a new functionality that remaps them to restSearch
  - all functionality should be maintained with all additional advantages introduced with restsearch
- additional cleanup (some unused functions removed)
 2019-11-29 10:11:30 +01:00
iglocska 642306640e
new: [API] refactored deprecated APIs to use the legacy system 2019-11-26 19:03:02 +01:00
iglocska bd17bdfb6b
fix: [UI] includeSightingdb flag not set correctly in the event attribute index 2019-11-26 12:34:22 +01:00
iglocska dbc229c83c
new: [sync] Added sighting sync publish button to the event view 2019-11-25 16:21:42 +01:00
iglocska 95f17d6acd
fix: [sync] Some minor changes to the sighting push 
- correctly handle anonymisation
- only push sightings, not rest of the event (decide on sender side)
- handle receiving sanitised sightings
 2019-11-25 14:32:22 +01:00
Richard van den Berg dd963c2e21 Sync sightings on push, pull and push on add 2019-11-22 21:53:51 +01:00
iglocska 846b1989c8
fix: [API] fixed notice errors for compact() in PHP 7.3+ 2019-11-18 15:58:06 +01:00
iglocska 7d7af8eb65
fix: [tagging] Events will be unpublished when a local tag is removed #5363 2019-11-13 14:07:12 +01:00
iglocska 936a7faca0
chg: [UI] Small refactor of the event add/edit views 
- added new flag to form elements for the generator: stayInLine:1 - skip linebreak after field
- removed edit view
- modified add view to work as both add/edit
 2019-11-13 09:38:46 +01:00
chrisr3d 222dd10977
fix: [UI] With the correct field name, it works better ;-) 
- threat_level_id is the name of the field, and
  now the hover description works :D
 2019-11-12 14:57:57 +01:00
chrisr3d 5ed87a6f78
fix: [UI] Passing the distribution, threat level & analysis description for the edit event view 2019-11-12 14:54:41 +01:00
chrisr3d f750d211af
fix: Just an indent fix for the eyes 2019-11-12 14:52:10 +01:00
chrisr3d 832f53a04b
chg: [UI] Using generic form in the add event view 2019-11-11 23:35:53 +01:00
iglocska d24f23b5bd
Merge branch '2.4' into sightingdb 2019-11-06 21:22:00 +01:00
iglocska c4f1d4d15e
new: [SightingDB] Added integration with SightingDB 
- Added configuration tool
- Added lookups from the event view
- Added includeSightingdb flag for the restSearch searches
- Added SightingDB search tool
- Added SightingDB connection test tool
 2019-11-06 21:20:04 +01:00
mokaddem f58770a90a
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-timeline 2019-11-05 13:51:03 +01:00
mokaddem be8f6f0bb0
fix: [Tag:exclusive] Code clean up 2019-11-04 15:46:53 +01:00
mokaddem 0222b8c090
chg: [tag:exclusive] Added support of local while checking for 
exclusivity
 2019-11-04 14:55:43 +01:00
mokaddem 1aaa590e30
chg: [event:view] Added notice and improved inconsistency text message 2019-11-04 13:41:53 +01:00
mokaddem 213e8b5049
new: [tags] Preminilary support of exclusive tags based on taxonomy data 2019-11-04 11:54:22 +01:00
chrisr3d 7a51733e40
fix: [stix export] Making stix json download return json instead of xml 2019-10-15 10:07:32 +02:00
mokaddem b44b369eec
Merge remote-tracking branch 'origin/2.4' into zoidberg-timeline 2019-10-02 14:35:00 +02:00
mokaddem bb3cf85776
Merge branch '2.4' into zoidberg-timeline 2019-10-02 11:23:04 +02:00
iglocska 8f5f3ed08a
fix: [debug] Removed internal breakpoint that was left in 2019-09-29 21:17:08 +02:00
iglocska 480e3b2969
Merge branch 'dev_session' into 2.4 2019-09-29 20:23:00 +02:00
chrisr3d 1784b5d76f
fix: [stix 1/2 import] Making the publish checkbox work as expected 
- Publishing as exxpected when the option is
  checked AND the user has the right to publish
 2019-09-28 02:35:22 +02:00
iglocska 946602a696
new: [User settings] Added user settings system 
- set settings / user
- settings can be set by user themselves or their org admin / site admin
- added first setting: publish_alert_filter
- accepts boolean branched filter options
  - supports deep logical trees
  - OR/NOT/AND
  - currently supports filtering on tags and the creator organisation
 2019-09-25 11:50:54 +02:00
Jakub Onderka 08c9337e6c
fix: [internal] Just site admin can force when saving freetext 2019-09-23 18:31:44 +02:00
chrisr3d b3ded21b39
fix: [import modules] Avoiding issues with empty module parameter 2019-09-17 16:02:41 +02:00
iglocska 5002e536ff
chg: [API] /events/view now accepts the deleted parameter via posted parameters too 2019-09-13 15:34:12 +02:00
mokaddem 377e748771
fix: [event] typo 2 2019-09-12 11:40:23 +02:00
mokaddem 48c89ea333
chg: [event] applying few PSR2 rules 2019-09-12 10:18:52 +02:00
mokaddem 1d378fd7bd
Merge remote-tracking branch 'origin/2.4' into decaying 2019-09-06 16:21:17 +02:00
mokaddem 519ec416ea
fix: [event:view] Toggle boolean buttons 2019-09-06 11:22:14 +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
iglocska 8630384f56
fix: [export] Add a proper filename to the event restsearch API's output to make downloading events a bit more convenient, fixes #4905 2019-08-30 15:39:48 +02:00
mokaddem a5d06d1333
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-08-29 10:52:18 +02:00
Pierre-Jean Grenier 14314ebd75 fix: contact reporter via API 2019-08-28 14:07:55 +02:00
mokaddem fd30141cdf
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-08-27 08:20:42 +02:00
iglocska e4708c0b6c
fix: [UI] Multi select and deletion of events fixed, #5046 2019-08-23 11:56:50 +02:00
mokaddem ed98d73be7
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-08-22 15:33:09 +02:00
Pierre-Jean Grenier 9f983ed071 chg: /events/contact/{event_id} can now be properly called from API 2019-08-21 17:53:04 +02:00
mokaddem cd5c9f7d1d
Merge remote-tracking branch 'origin/2.4' into decaying 2019-08-20 15:00:38 +02:00
Pierre-Jean Grenier d6d91c56f3 fix: Import modules using 'misp_standard' format can be called via REST API 2019-08-19 16:44:49 +02:00
iglocska 50db8c9a45
new: [API] Allow posting freetext data for ingestion via the event uuid instead of ID, fixes #4995 2019-08-14 15:17:25 +02:00
iglocska 519e110f9f
new: [internal / API] new component added to handle repeatable code across all controllers (toolbox controller) 
- added UUID -> ID lookup function and integrated it across several functions
- fixes #4990
- fixes #4999
- fixes #4993
- fixes #4991
- fixes #4989
- fixes #4987
 2019-08-14 15:01:31 +02:00
mokaddem 6ba45b27f8
Merge remote-tracking branch 'origin/2.4' into decaying 2019-08-13 16:32:58 +02:00
mokaddem bd1aacafea
new: [event:view] Added support of decay score 2019-08-12 16:34:26 +02:00
iglocska a4462f717e
fix: [API] /events/delete now accepts UUID as parameter 2019-08-11 21:22:38 +02:00
iglocska e5cfd152cf
fix: [local tags] Host org non admin users should be able to tag data owned by others, partially fixes #4925 2019-08-02 16:53:30 +02:00
iglocska 1d47e37f5c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-08-02 14:39:15 +02:00
iglocska 7b9b58356c
new: [sync] Event index cleaned up, total count of listd events added as X-Result-Count header 2019-08-02 14:38:28 +02:00
iglocska 220842edff
fix: [API] Freetext import now correctly handles the response of non-background processed tasks 2019-07-31 15:57:25 +02:00
iglocska ebf054e0d0
fix: [API] Adding attributes via the freetext importer using the API resulted in several issues 
- adhereToWarninglists was not correctly adhered to
- the response didn't reflect what was saved, only what was pushed to be saved (excluding removals by warnintlists, several attributes added by adding more than one valid type, etc)

fixes #4881
 2019-07-29 16:15:00 +02:00
mokaddem e50f624894
fix: [tag:local] Allow users (with correct authorization) to detach 
tags
 2019-07-19 15:28:13 +02:00
mokaddem 2c57c1138e
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-timeline 2019-07-11 09:59:57 +02:00
iglocska ce7dc6ecb0
fix: [CLI] admin->setDatabaseVersion fixed 2019-07-08 15:46:29 +02:00
iglocska b45b55e854
fix: [tmpdir] fixed invalid file path 2019-07-08 12:51:37 +02:00
iglocska b9839b8ffe
fix: [internal] upload sample had a hard coded tmp path that would fail to the php fallback if MISP is not installed in /var/www/MISP 2019-07-08 11:53:30 +02:00
iglocska d82176b5ed
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-07-08 11:45:18 +02:00
iglocska 2a059f7b31
new: [tags] Local tags feature added 
- Create tags locally if you are a host org user that allows in-place tagging for sync / export filtering
- Events are NOT modified using these tags
- Local tags always get stripped before syncing
- Local tags allow host org users to violate the ownership model of MISP
- galaxies, attack matries also included

- some sync fixes
 2019-07-08 11:39:41 +02:00
chrisr3d f651a030aa Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-07-02 22:08:11 +02:00
chrisr3d b40582679d
chg: [enrichment] Reusing the new function fetchInitialObject 
- New function that is exactly the copy paste of
  what is removed in this commit and replaced by
  the function call
 2019-07-02 22:05:38 +02:00
mokaddem d2b42b95ed
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-timeline 2019-07-02 15:52:35 +02:00
mokaddem 5b6b4777f2
fix: [events] Create massive dummy events 2019-07-02 11:44:05 +02:00
iglocska 9293a15e2f
Merge branch 'module_rework2' into 2.4 2019-07-01 09:51:07 +02:00
mokaddem 2ea4916051 Merge branch '2.4' of github.com:MISP/MISP into zoidberg-timeline 2019-06-24 09:06:11 +02:00
Andras Iklody 69febf087a
Merge pull request #4570 from mokaddem/relatedEventUI 
Related event ui
 2019-06-21 19:06:38 +01:00
chrisr3d faf7abc8e5 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-21 12:15:01 +02:00
mokaddem 93e85e6d7a fix: [event:addTag] User can add multiple tag collection at once 2019-06-21 12:10:59 +02:00
mokaddem 96bc938ae1 fix: [relatedEvent:view] catch if number of correlation cannot be found 2019-06-21 11:42:21 +02:00
mokaddem 9274522177 chg: [relatedEvent:view] Display the number of unique correlation 2019-06-21 11:21:43 +02:00
chrisr3d 084b6e0786 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-20 14:44:33 +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
chrisr3d b7b4002fc7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 14:16:39 +02:00
mokaddem e7f3d0d9df new: [timeline/*-seen] Initial import of the timeline code from the 
zoidberg branch
 2019-06-13 09:16:34 +02:00
mokaddem 66ee8ef12c chg: [galaxyMatrix] Added check if event not found 2019-06-12 10:03:31 +02:00
mokaddem 43a038b0a5 chg: [galaxyMatrix] Improved `getTagScores` to allow with and without 
ACL tag score fetching
 2019-06-12 09:56:54 +02:00
mokaddem 49357e9c84 fix: [event:galaxyMatrix] Apply ACL on the galaxy matrix scores (event 
view)
 2019-06-12 09:11:08 +02:00
mokaddem 52ae153c0e Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-11 15:56:10 +02:00
chrisr3d ccee18b8c7
add: [enrichment view] Displaying events metadata & number of returned attributes 2019-06-11 13:51:53 +02:00
chrisr3d 831f7575bd Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-07 15:32:39 +02:00
iglocska 3bcaab013e
new: [cleanup] Added admin tool to remove all published empty events 
- part of the solution to the empty event sync issue introduced in 2.4.107
- skips the event blacklisting
 2019-06-04 19:45:28 +02:00
iglocska 2590b27334
fix: [sync] Temporary fix for empty events showing up in syncs when pulling from a new instance via an outdated one 2019-06-04 13:54:47 +02:00
chrisr3d 25f6c41444 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-03 18:45:45 +10:00
iglocska c9860c2a44
fix: [UI] Event lock concatinating quoted empty strings 2019-06-03 08:03:41 +02:00
iglocska d9153f8bb8
fix: [sync] Further fixes to the deleted flag changes breakig things 2019-05-31 09:19:51 +02:00
chrisr3d 543dc04d7a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-23 14:45:07 +02:00
iglocska 93220608f1
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-23 11:26:11 +02:00
iglocska 02a3a9a384
new: [API] Added object_relation as a filter for both the event/attribute restSearch functions 2019-05-23 07:56:23 +02:00
mokaddem c9a3b96b7b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-22 16:15:55 +02:00
mokaddem b73ed846ab fix: [event:view] Correctly support the new `deleted` parameter behavior 2019-05-22 16:15:18 +02:00
mokaddem 94332afbf6 fix: [restSearche] Correctly interpret the `deleted` parameter on 
`event` and `attribute` scope.
-- Pair programming with @iglocksa
 2019-05-22 16:08:27 +02:00
chrisr3d e974a651b2 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-21 16:41:54 +02:00
iglocska c84ae1cdc4
fix: [STIX] STIX upload fixed for API use 2019-05-21 15:05:35 +02:00
mokaddem 4fbe857f90 chg: [galaxyMatrix] Added sorting by score. Fix #4608 2019-05-13 15:07:38 +02:00
chrisr3d 11da6855ce Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-10 16:22:51 +02:00
iglocska 5ee6013dff fix: [API] Some fixes for the restsearch -> attack export 2019-05-10 14:41:50 +02:00
iglocska e899eb8b9d new: [ATT&CK] Added new export system for restsearch for ATT&CK 
- Return the ATT&CK matrix data as HTML via the API
- Directly viewable via the REST client

- Greetings from the ATT&CK workshop @ Eurocontrol
 2019-05-10 14:25:38 +02:00
iglocska 6150d9e4a6 new: [API] Added includeWarninglistHits as a possible filter for the event level restsearch 2019-05-09 17:14:25 +02:00
chrisr3d e3788408f7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-07 10:09:29 +02:00
mokaddem b192a6ce28 chg: [event:view] Added button to quickly extend an event. Fix #4481. 2019-05-06 15:38:08 +02:00
chrisr3d 34092b599f Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-02 11:57:29 +02:00
chrisr3d 42ea1bdbbe
chg: [enrichment] Import modules now support new modules format 
- Import module results are sent to the new view
  (same as for expansion modules) whenever they
  support objects import
- Function handling the results right after they
  are returned from the module has also been moved
  to Model/Event and is used for both expansion &
  import modules
 2019-05-02 11:49:17 +02:00
chrisr3d e2561f0022
fix: [enrichment] Setting importComment value before going to the view 
- Saving a variable & will avoid issues when reusing
  the view for import modules
 2019-05-02 11:45:43 +02:00
Steve Clement 4b77fe35f8
Merge branch '2.4' into fix-i18n 2019-05-01 18:03:28 +09:00
chrisr3d b9e050622b Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-30 10:03:05 +02:00
iglocska 18104c0a08 fix: [required taxonomies] not firing via regular publishing only via publish (no email), fixes #4546 2019-04-30 09:56:16 +02:00
4ekin 9bb8933445 fix: Fixed i18n strings in Event controller, model and view 2019-04-29 16:14:14 +03:00
4ekin 14feb57e2f fix: Typos in controllers 2019-04-29 16:12:55 +03:00
chrisr3d 68019b63c9
fix: [enrichment] Removed possibility to display freetext result in the new module results view 2019-04-25 16:28:42 +02:00
chrisr3d b38b703dc7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-25 09:13:12 +02:00
chrisr3d 7e55c28c92
wip: [enrichment] Passing initial object references as well 
- Also testing if the initial object found is not empty
 2019-04-17 11:56:35 +02:00
chrisr3d 3368121940
wip: [enrichment] Passing the initial object within the request data 
- Makes its parsing easier afterwards
 2019-04-17 10:50:50 +02:00
chrisr3d 6539021027
fix: [enrichment] Simplified tests if not empty 
- In those specific cases, we can simply skip
  testing if something is set or equals 0, '' or
  false, since it is all implied in 'empty'
 2019-04-16 14:26:18 +02:00
mokaddem 6e2635a346 chg: [event:view] Increase tag colleciton efficiency 2019-04-16 14:14:51 +02:00
mokaddem 16453a3433 chg: [event:view] Major performance improvement for large event. 
Due to the introduction of the event filtering widget, attributes were
fetched 2 additional times.
 2019-04-16 11:02:52 +02:00
chrisr3d 142992988a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-15 16:08:02 +02:00
iglocska 8613ed1bed chg: [download as] updated - now works on non published events in all cases and uses restsearch whenever possible. Fixes #4468 2019-04-14 21:25:37 +02:00
chrisr3d 89af7cda24
chg: [enrichment] Passing the initial object to the form 
- If the attribute we query the module on is an
  object attribute, we want to have this object
  information se we do not add or overwrite
  attributes already here
 2019-04-12 23:36:47 +02:00
chrisr3d 7b4c09a249
wip: [enrichment] Capturing objects & attributes 2019-04-08 19:07:13 +02:00
chrisr3d 0727192c01
fix: [enrichment] Fixed handleModuleResults input variable name 2019-04-04 23:29:13 +02:00
chrisr3d d6e8a74d49
fix: [enrichment] Fixed missing merge conflict 2019-04-04 16:40:32 +02:00
chrisr3d e238e5e3ec Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-04 16:35:14 +02:00
chrisr3d df59c69134 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 16:25:14 +02:00
chrisr3d dabb87bf4b
wip: [enrichment] Removed debug calls 
- Before having new modules fully operational, let
  us at least not keep only 2 debugs within an
  exposed function
 2019-04-04 16:22:02 +02:00
iglocska 251836ff97 fix: [UI] First recorded change fixed to not be copy pasta of the last change's timestamp 2019-04-04 15:00:05 +02:00
chrisr3d 041ee4d5da
fix: [enrichment] Avoiding errors on distribution and sharing group data 
- Making sure we do have a value for distribution
  and sharing group
- Avoid translating distribution levels into their
  human meaning because the output process capturing
  data from the form will anyway use the numeric
  values. Readable values are btw displayed in the
  form for users confort
- Also sanitized data displayed
 2019-04-04 14:21:10 +02:00
chrisr3d 8983ddf009
fix: [enrichment] Testing if an object has attributes before looping over them 2019-04-04 14:20:00 +02:00
chrisr3d 590a18656d
add: [enrichment] Added MISP Objects distribution in the view 2019-04-03 22:44:21 +02:00
chrisr3d ba5ec4ee46
fix: [enrichment] Set potentially missing category, ids & distribution values before going to the view 
- Set the default values in the controller's side instead of the view's side
 2019-03-29 18:27:40 +01:00
Steve Clement b2191c9927
Merge pull request #4252 from mokaddem/sightingFiltering 
Sighting filtering
 2019-03-28 14:50:15 +01:00
iglocska 5e7e0817ad Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 16:27:19 +01:00
iglocska bf841282ce new: [export] Replaced the old non-cached export page 
- uses restsearch
- similar UI to the cached exports
 2019-03-25 16:26:29 +01:00
chrisr3d 32b5ab676e
wip: [enrichment view] Test returning data from the new form 2019-03-22 22:31:56 +01:00
chrisr3d ecbe782709
wip: [enrichment view] Made IDS, comment and distribution changeable 
- Applied on each attribute and object attribute
  returned as part of the module results
 2019-03-21 17:40:48 +01:00
Andras Iklody 8fc80d09c0
Merge pull request #4346 from mokaddem/matrixOnGalaxyLevel 
new: [cluster] Display heatmap on the Att&ck Matrix for all tagged data.
 2019-03-20 15:08:34 +01:00
mokaddem 016893210d new: [cluster] Display heatmap on the Att&ck Matrix for all tagged data. 
fix #4344
 2019-03-20 14:30:05 +01:00
chrisr3d 4f7a034a91 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-20 11:45:54 +01:00
chrisr3d c6e7e9284b
fix: [enrichment] Set distributions & sgs for all the possible views 2019-03-20 11:28:32 +01:00
iglocska f3d2b1d15a new: [tagging] Stop pre-populating forms for tagging / attaching of galaxies 
- avoids any potential CSRF issues, the form is fetched just in time for the submission
 2019-03-20 11:21:40 +01:00
chrisr3d 465e69f84b
fix: [enrichment] Fixed variable name typo 2019-03-20 11:18:22 +01:00
iglocska 7141f70b20 Merge branch 'kafka' into 2.4 2019-03-19 17:23:05 +01:00
iglocska 6efd909bfe new: [Required taxonomies] 
- Flip taxonomies into required mode to ensure that events cannot be published without at least one tag from each required taxonomy to be set
 2019-03-19 15:59:31 +01:00
chrisr3d 5dcd4dba47
fix: [enrichment] Fixed $event variable handling + monkey typo 2019-03-18 18:17:55 +01:00
chrisr3d 81a0cd2974
wip: [enrichment] Handling module results and passing it to the view 
- Work in progress on the view right now
 2019-03-18 18:05:18 +01:00
Nikos Filippakis 9d59b10368 Publish events to Kafka 
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-18 15:53:22 +01:00
mokaddem f78734d92e chg: removed duplicate 2019-03-18 13:41:52 +01:00
mokaddem 52e2b9dea7 Merge branch '2.4' of github.com:MISP/MISP into sightingFiltering 2019-03-18 13:37:53 +01:00
Alexandre Dulaunoy ae2c513b62
Merge pull request #4309 from mokaddem/extendedDistributionGraph 
Improvement on distribution visualization
 2019-03-15 16:05:17 +01:00
mokaddem b8334521d3 chg: Updated comments 2019-03-15 11:52:37 +01:00
chrisr3d 23f8d6b668
wip: [enrichment] Capturing attributes & objects returned by modules 2019-03-15 11:31:14 +01:00
chrisr3d b71ec87021
fix: [enrichment] Added missing data field in attribute in case of attachement type attribute 2019-03-15 11:28:42 +01:00
mokaddem 7ce6ef34de Merge branch '2.4' of github.com:MISP/MISP into extendedDistributionGraph 2019-03-15 10:59:38 +01:00
mokaddem 3bd56a102f fix: [eventFiltering] quickfilter on value does not filter on wrong category 
anymore
 2019-03-15 10:50:16 +01:00
mokaddem 8a5cce8cb3 chg: [distributionNetwork] Improved consistency in event index and 
improved UX - WiP
 2019-03-12 10:47:16 +01:00
mokaddem 968d578e38 chg: [distributionNetwork] Integration with event index - WiP 2019-03-12 08:15:49 +01:00
chrisr3d 0bb088bf00
wip: [enrichment] Started changing enrichment modules 
- Passing full attributes to the new modules
- No changes for the currently used modules
- Using a parameter to specify which format to use
- Current format used if no parameter is set
/!\ WIP, more to be updated soon /!\
 2019-03-11 23:33:26 +01:00
iglocska f145f40057 new: [API] Add pagination related parameters to event index, fixes #4270 2019-03-05 15:11:49 +01:00
iglocska bb837afba6 fix: [API] hacky fix to capitalisation issues between the old /events/index camelcased parameters and the newer lowercased one, fixes #3855 2019-03-04 09:09:35 +01:00
mokaddem 823078f834 new: [eventFiltering] Added support of sighting filtering 2019-03-01 11:54:29 +01:00
iglocska 4e5fcbcbc2 fix: [UI] Contributor list fixed 2019-02-28 08:30:17 +01:00
mokaddem af735901fd new: [eventview] Shows number of object in the event 2019-02-26 16:33:37 +01:00
mokaddem 4daca2c4de chg: [eventMatrix] Added description of the cluster title and set 
default score to 0
 2019-02-26 09:07:21 +01:00
iglocska c754e3b967 new: [API] restsearch returns more information about the export system used via headers 2019-02-18 14:33:43 +01:00
mokaddem 1feb96b034 new: [eventFiltering] Added support of toIDS 2019-02-15 16:28:04 +01:00
mokaddem a77e08548e Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-15 15:58:03 +01:00
mokaddem 7e64a9d1c4 Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-15 15:22:46 +01:00
mokaddem 97b9e14a32 chg: simplified condition 2019-02-15 15:03:03 +01:00
mokaddem 7a2010fb0e chg: [galaxy_matrix] TEMPORARY - Merge scores of both deprecated and mitre-attack 
galaxy namespace for the matrix view.

This commit aims to still have correct scores in the galaxy_matrix until the fixMitreTags functions is not live and running
 2019-02-15 14:41:55 +01:00
mokaddem 9fa063cbe8 chg: [galaxy_matrix] renamed view_matrix into view_galaxy_matrix 2019-02-15 09:41:17 +01:00
mokaddem 12ed3457e8 chg: [galaxy_matrix] cleanup in variable names to be more generic 2019-02-15 09:24:52 +01:00
mokaddem 2bb6e7e83e chg: removed test code 2019-02-14 11:46:52 +01:00
mokaddem 205912fecc chg: [eventFiltering] IU/UX Improvements 2019-02-13 14:59:49 +01:00
mokaddem 5516b4f603 new: [eventFiltering] Added support of server and feed hits filtering 2019-02-13 11:30:05 +01:00
mokaddem 965184da24 Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-13 08:48:27 +01:00
mokaddem 42e26f62fe Merge branch '2.4' of github.com:MISP/MISP into udpatedMatrix 2019-02-12 14:02:31 +01:00
mokaddem a5653e86ea new: [matrix] Replaced the Att&ck matrix by a generic matrix viewer, 
allowing custom matrix to be displayed.
Also added the external id to the chosen input.
 2019-02-12 13:59:51 +01:00
mokaddem 2dc34ab84c chg: [attackMatrix] Improved layout + fixed bug (carret on scale do not 
go out of bound anymore)
 2019-02-12 11:06:05 +01:00
mokaddem 431529c81c chg: [attackMatrix] UI: improved color scale - WiP 2019-02-11 17:54:29 +01:00
Christophe Vandeplas 67efc70bf5 fix: [style] consistent space indentation 2019-02-10 13:08:55 +01:00
mokaddem a4dd22bd4a chg: [eventFiltering] Started integration of tag filtering - WiP 2019-02-08 10:21:21 +01:00
iglocska 9a1ddd760f fix: [API] Events add/edit return correct error code on failure 2019-02-06 18:04:05 +01:00
iglocska ebf51eca39 new: [UI] Added change tracking sparkline to the event view 2019-02-06 17:47:22 +01:00
iglocska 890a0f1985 fix: [restsearch] download as a first parameter should default to json 2019-02-05 14:23:14 +01:00
mokaddem 213b8f994e fix: [distributionGraph] restaured filtering capabilities. 
Broken since the new event filtering tool
 2019-02-04 16:19:11 +01:00
mokaddem 1db4567692 Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-04 10:00:12 +01:00
mokaddem 04bb28dccd chg: [eventFiltering] display the number of active rules 2019-02-01 16:18:34 +01:00
mokaddem fe3cd9d814 chg: [eventFiltering] Improved detection of advanced filtering 2019-02-01 15:36:59 +01:00
iglocska 0d8bc39278 fix: [restsearch] CSV special parameters added to the URL parameters 2019-02-01 15:21:11 +01:00
mokaddem 1b8ff623fd Merge remote-tracking branch 'origin/2.4' into eventFiltering 2019-02-01 15:18:15 +01:00
iglocska 35676fecf2 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-01 14:47:14 +01:00
mokaddem f8efffe830 chg: [eventFiltering] WIP - UI displays all elements 2019-02-01 11:35:01 +01:00
chrisr3d 45a0377fb4
fix: [stix 1&2 export] Switched attachment parameter to make it work 
- When using the url to query restSearch, withAttachements
  is the correct parameter to use instead of includeAttachements
  which works btw well with the rest Client anyway
 2019-02-01 10:54:46 +01:00
chrisr3d d6af2a7d04
fix: [stix 1&2 export] Using the restSearch API instead of the old download one 2019-02-01 10:25:09 +01:00
mokaddem bd47e9c38d chg: [eventFiltering] WIP - fixed filtering bugs and improved warning 
filtering
 2019-02-01 09:46:41 +01:00