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 cb9f66e973 fix [internal] Removed unused EventsController::viewEventGraph method 2020-10-18 22:22:10 +02:00
Jakub Onderka 014ad0ef61 fix [internal] Removed unused EventsController::__fetchEvent method 2020-10-18 22:20:42 +02:00
Jakub Onderka 240b3434e0 chg: [internal] Speedup sending module results 2020-10-15 22:06:17 +02:00
Jakub Onderka 6770ba8222 chg: [internal] Faster loading od Distribution graph 2020-10-14 10:20:14 +02:00
Jakub Onderka 72d0b873c8 chg: [UI] Optimise loading contributors orgs 2020-10-13 16:08:22 +02:00
Jakub Onderka 2a9feb7cd3
Merge pull request #6417 from JakubOnderka/fetch-event-optimisation 
Fetch event optimisation
 2020-10-12 08:17:39 +02:00
Jakub Onderka 0e80b9f498 fix: [freetext] Do not load event page twice when saving freetext 2020-10-11 12:36:00 +02:00
Jakub Onderka 897c2dc225 chg: [internal] Do not fetch event reports for view 2020-10-10 14:27:07 +02:00
Jakub Onderka c46db527f6 chg: [internal] Optimise event fetching 2020-10-10 14:23:55 +02:00
Jakub Onderka 00a6d904a6 fix: [UI] Do not hide some errors 2020-10-09 23:10:41 +02:00
Jakub Onderka 1ac2896d3a fix: [internal] Check if module has defined userConfig 2020-10-09 23:10:41 +02:00
mokaddem b628e15eb9
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-10-09 14:54:47 +02:00
Jakub Onderka c29729a9a4
Merge pull request #6388 from JakubOnderka/attribute-search-optim 
chg: [internal] Much faster attribute search
 2020-10-06 13:26:02 +02:00
Jakub Onderka 4a7eded184 chg: [internal] Much faster attribute search 2020-10-06 10:46:43 +02:00
mokaddem 22ced01083
chg: [events] Simplified attribute_count condition for `minimal` filter 
parameter
 2020-10-05 09:49:56 +02:00
Jakub Onderka 617c7ef475 chg: [internal] Clean up EventsController::view code 2020-10-04 13:16:33 +02:00
Jakub Onderka e379a218ea chg: [internal] Remove not necessary GalaxyCluster initialization 2020-10-04 13:02:44 +02:00
Jakub Onderka 7173663c19 chg: [internal] Move getting missing tlds list to model 2020-10-03 10:17:05 +02:00
Jakub Onderka bbb08e4074 new: [warninglist] Cache warninglist results 2020-10-03 10:17:05 +02:00
mokaddem 02725982cc
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-10-01 10:38:28 +02:00
mokaddem 8087004922
chg: [events:index] Minimal searches returns events having event reports 
and no attributes
 2020-09-29 08:05:13 +02:00
Jakub Onderka 03b5af1f78
Merge pull request #6344 from JakubOnderka/misp-file-import 
Misp file import error message
 2020-09-26 19:34:55 +02:00
Jakub Onderka 8416f9d9a6 fix: [UI] Show error for user if file for import is invalid 2020-09-26 13:17:28 +02:00
Jakub Onderka 804525a20e chg: [internal] Move addMISPExportFile from controller to model 2020-09-26 13:02:19 +02:00
Jakub Onderka 88d45d869e fix: [UI] Show proper menu when using even import module 2020-09-25 09:13:59 +02:00
mokaddem 7d3748f403
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-09-23 18:17:54 +02:00
Jakub Onderka aa613d0369 chg: [UI] Show event creator for users within event org 2020-09-22 17:10:58 +02:00
mokaddem eb84b3344f
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-09-22 12:08:12 +02:00
Jakub Onderka d88cc19a21 chg: [mail] Simplified mail generation 2020-09-21 13:17:00 +02:00
iglocska 94c37871da
fix: [recovery] various fixes 
- to_ids fixed
- background processing made optional
- first/last seen format conversion altering the data's format for the recovery script fixed
- added capture of object first/last seen to the recovery script
 2020-09-19 18:35:15 +02:00
mokaddem c3ef75fcba
chg: [events:recover_event] Adapt flash message if mock query requested 2020-09-18 15:49:48 +02:00
iglocska 09e2b56260
fix: [merge issue] resolved 2020-09-18 13:55:53 +02:00
iglocska d7b93b46ab
Merge branch 'event_recovery' of github.com:MISP/MISP into event_recovery 2020-09-18 13:53:40 +02:00
iglocska c8b61175e8
new: [recovery] script added mock method among other changes 
- also added proposals
- add/accept/discard should be fully supported now
 2020-09-18 13:42:52 +02:00
mokaddem ca61d45441
chg: [event] Forced usage of worker for event recovery 2020-09-16 10:33:05 +02:00
mokaddem f86ad11bd1
chg: [events] Usage of `fix_login` in restoreDeletedEvents 2020-09-16 10:01:31 +02:00
iglocska 19d52f312a
new: [recovery] added event deletion recovery tool 2020-09-15 23:54:59 +02:00
iglocska 5d3dee3ba2
fix: [tag filters] fixed a bug introduced with the previous filter fix, resulting in multiple OR tags being ignored as a valid filter 2020-09-12 11:54:49 +02:00
iglocska 0455b16f70
fix: [cleanup] 2020-09-10 15:22:26 +02:00
iglocska 7186ee6ce4
fix: [cleanup] 2020-09-10 15:22:02 +02:00
iglocska c0498b4aa5
fix: [string concat] fix 2020-09-10 15:20:43 +02:00
iglocska 2c7e9af9cb
fix: [cleanup] debug 2020-09-10 15:16:47 +02:00
iglocska 77855e14b3
fix: [internal] Correctly handle positive tag filters for non site admins 
- tag filters were ignored incorrectly when it was a positive lookup
 2020-09-10 15:15:39 +02:00
Jakub Onderka 565f446f19 chg: [internal] Faster tag fetching for events 2020-09-07 17:07:12 +02:00
Jakub Onderka 2f6f97e36e
Merge pull request #6274 from JakubOnderka/acl_filter_attribute_values 
fix: [internal] Respect ACL for event attribute search
 2020-09-02 17:24:16 +02:00
Jakub Onderka 4d819452e4 fix: [internal] Respect ACL for event attribute search 2020-09-02 16:49:45 +02:00
Jakub Onderka 713b228709
Merge pull request #6219 from JakubOnderka/event-small-optim 
Event small optim
 2020-09-01 20:03:22 +02:00
Jakub Onderka f3feb997bf chg: [internal] Deduplicate code for event conditions 2020-09-01 20:01:57 +02:00
Jakub Onderka 951c9f1033
Merge pull request #6271 from JakubOnderka/faster_quick_filter 
chg: [internal] Much faster quick filter
 2020-09-01 20:00:39 +02:00
Jakub Onderka be11e36c11 chg: [internal] Much faster quick filter 2020-09-01 18:37:26 +02:00
Golbark 3a0bedb104 chg: [internal] Using Allowedlist instead of Whitelist 2020-09-01 16:28:20 +02:00
Golbark 3fb47d1cce chg: [internal] Using blocklist instead of blacklist 2020-09-01 16:27:36 +02:00
Jakub Onderka d3eb86553b chg: [internal] Less SQL queries for event index page 2020-08-24 16:27:27 +02:00
Jakub Onderka 0737253d4a chg: [internal] Distribution is checked by SQL 2020-08-24 16:27:12 +02:00
Jakub Onderka 5232a8d251 chg: [internal] Remove not necessary code 2020-08-24 16:27:01 +02:00
Vito Piserchia 6af706947c syntax check and fix 2020-08-17 19:10:15 +02:00
Vito Piserchia 8486ecb8b4 Merge remote-tracking branch 'upstream/2.4' into baseurl-patch 2020-08-17 17:29:38 +02:00
Vito Piserchia eeb3c3b7d0 rebase continue 2020-08-17 17:19:16 +02:00
Vito Piserchia a393d411e1 rebase continue 2020-08-17 17:13:58 +02:00
Vito Piserchia dad45e68ca rebase continue 2020-08-17 15:52:32 +02:00
Jakub Onderka c41c1d5cc4 chg: [UI] Nicer tag removal confirmation 2020-08-16 16:23:20 +02:00
Vito Piserchia a1c80378f6 more merge fixes 2020-08-16 13:44:53 +02:00
Vito Piserchia b8c7485712 resolve merge 2020-08-16 13:31:31 +02:00
Jakub Onderka 9ba17f2551 fix: [security] Check tag restriction for event tags 2020-08-15 15:48:39 +02:00
Jakub Onderka e4b061c744 fix: [security] Respect ACL for freetext import 2020-08-05 17:37:05 +02:00
Jakub Onderka c749281b8f chg: [UI] Do not exclude local tags when viewing event 2020-08-04 12:23:41 +02:00
Jakub Onderka 67a9d612d5 fix: [security] ACL check when adding or removing tags 2020-08-04 12:23:41 +02:00
Jakub Onderka db626cf741 fix: [security] Respect ACL when event edit 2020-08-04 12:21:42 +02:00
mokaddem 97d63a0989
chg: [event:freetextImport] Usage of primaryOnlyCorrelatingTypes and 
limit the number of correlations displayed
 2020-07-28 11:46:44 +02:00
Jakub Onderka fa222e76f1 chg: [internal] Small controller cleanup 2020-07-27 23:17:45 +02:00
Jakub Onderka 805ce7d728
Merge pull request #5954 from JakubOnderka/get-related-attributes-faster 
chg: [correlations] Faster loading related attributes
 2020-07-26 23:00:42 +02:00
mokaddem 9d0597528d
fix: [events:index] Do not show events if org doesn't belong to the SG 
Event belonging to an organisation which is not
included in the sharing group assigned to the event will not see the
event on the index anymore.
Fix #6033
Fix #6107
 2020-07-21 10:36:15 +02:00
mokaddem ad81c60986
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-21 08:09:25 +02:00
Jakub Onderka 560894c5f5
Merge pull request #6131 from JakubOnderka/toggle-correlation-speedup 
chg: [internal] Faster generating correlations when enabling
 2020-07-20 09:21:18 +02:00
Jakub Onderka b847fd4476 new: [UI] Show event preview when merging 2020-07-20 08:39:51 +02:00
Jakub Onderka 35e2aa5837 chg: [internal] Faster generating correlations when enabling for event by toggle 2020-07-17 09:46:34 +02:00
iglocska 17c46a8b25
fix: [sync] internal sync now correctly syncs local tags 
- also fixes a notice about a missing tag in the sync
 2020-07-16 10:56:32 +02:00
mokaddem b3dbecb318
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-14 16:25:04 +02:00
Jakub Onderka dc03e8fd24
Merge pull request #6114 from JakubOnderka/remove-cidr 
fix: [internal] Remove unused CidrComponent and CIDRTool classes
 2020-07-14 12:06:13 +02:00
Jakub Onderka 39f3acba34 fix: [internal] Remove unused CidrComponent and CIDRTool classes 2020-07-14 10:29:32 +02:00
Jakub Onderka 3df94f868f chg: [freetext] Various code fixes and optimisations 2020-07-13 21:12:26 +02:00
Jakub Onderka 9f8a198eaa
Merge pull request #6091 from JakubOnderka/existence-checking 
fix: [internal] Do not check event existence twice
 2020-07-13 17:31:30 +02:00
mokaddem d348221792
chg: [ClusterRelationsGraphTool] Refacto and simplified code 2020-07-07 15:56:29 +02:00
mokaddem 1c4b3b97e9
chg: Removed integer type hinting in controllers 2020-07-07 14:49:09 +02:00
Andras Iklody e9aa2a284a
Merge pull request #6092 from JakubOnderka/event-ui 
chg: [internal] Simplify and optimise eventUI method
 2020-07-07 11:38:21 +02:00
mokaddem ac44422b04
chg: Added comments 2020-07-07 10:37:31 +02:00
mokaddem 51337c230e
chg: refacto some galaxy cluster controller files 2020-07-07 09:46:47 +02:00
mokaddem 38da0d2461
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-07 07:39:43 +02:00
iglocska c81c47d01a
new: [merge] functionality reworked 
- handle objects, tags, etc via @chrisr3d's module result parsing
- handle sharing groups correctly - as reported by Jakub Onderka
- using standardised fetchers internally
- API enabled (which will directly merge all contents of the source event into the target event)
 2020-07-06 16:43:18 +02:00
Jakub Onderka 7a01fecd14 chg: [internal] Simplify and optimise eventUI method 2020-07-05 16:22:01 +02:00
Jakub Onderka decbb360ea fix: [internal] Do not check event existence twice 2020-07-05 16:03:52 +02:00
mokaddem f3a9481c61
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-01 16:22:55 +02:00
Jakub Onderka b0be3b07fe fix: [security] Check event ACL before allowing user to send event contact form 2020-06-30 09:01:55 +02:00
Jakub Onderka e4805fedb8 chg: [correlations] Faster loading related attributes 2020-06-23 12:18:49 +02:00
iglocska 6b95047c1e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-06-22 11:11:31 +02:00
iglocska 2eccb31636
fix: [ACL] unpublished_private global setting tightened to include correlations 
- Thanks to Jakub Onderka for reporting and providing a fix to this!
 2020-06-22 11:10:25 +02:00
mokaddem 5c04b9a8c1
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-05-28 14:06:30 +02:00
chrisr3d e95dad15d0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-25 12:00:33 +02:00
Andras Iklody 0db582ef95
Merge pull request #5924 from JakubOnderka/php74-errors 
Fix notices in PHP 7.4
 2020-05-23 18:27:19 +02:00
Andras Iklody 0fa4c7aecb
Merge pull request #5934 from JakubOnderka/remove-galaxy-tags 
chg: [internal] Faster removing galaxy cluster tags from attributes
 2020-05-23 17:59:45 +02:00
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