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

1674 Commits (7ac9cae7b6aa21eb7a8c4d492dc0e507ab4cb14a)

Author SHA1 Message Date
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
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