Commit Graph

1365 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

Author SHA1 Message Date
mokaddem 3820528edc
Merge remote-tracking branch 'origin/develop' into fix-sg-api-edit 2021-06-04 15:22:54 +02:00
mokaddem bd26a1671c
fix: [event:__prepareForPushToServer] Slight refactoring 2021-06-04 15:22:06 +02:00
mokaddem eee298f19f
fix: [event:prepareForPush] Gracefully handle the case if SharingGroupServer is empty 2021-06-04 14:30:16 +02:00
mokaddem 0a68e339e8
chg: [sharinggroup] Allow pushing SG if remote internal server is not in the list of SG servers 2021-06-04 08:34:47 +02:00
mokaddem 9f17bb0c41
fix: [Event:set_filter_value] Support of wildcard searches 2021-06-03 15:37:51 +02:00
mokaddem 604670f048
Merge remote-tracking branch 'origin/develop' into fix-composite-attribute-filtering 2021-06-03 11:29:49 +02:00
chrisr3d 308787918e Merge branch '2.4' of https://github.com/MISP/MISP into develop 2021-05-11 17:52:31 +02:00
chrisr3d 258e68df9b
fix: [module results] References between objects returned with module results and the original object attribute are now pointing to the original object itself
- A reference between an object and an object
  attribute is supported in the API, but does not
  appear on the event graph
- Instead of pointing to the initial object
  attribute then, we look for the uuid of the
  object containing the attribute and use this
  uuid for the reference
- The references between objects returned as
  module results and the object containing the
  attribute initially used for the enrichment
  with a module are then handled properly
2021-05-11 17:26:07 +02:00
chrisr3d 3cf7c5848c
fix: [module results] Included the object references handling loop in the objects handling loop
- If we did not get any object in a result from
  a misp module, the `$references` variable would
  not have been defined and would have raised an
  issue. The references are related to objects,
  it is then obvious to handle them both together
2021-05-11 11:58:10 +02:00
chrisr3d 7573c5abb9
fix: [modules results] Fixed the query to find the uuid of the attribute used as input of a misp-module
- With `Attribute.object_id => 0`, the query did
  only return attributes outside of a MISP object
- This was causing issues with references between
  the MISP objects returned by the modules and the
  attribute used as input to the module. Those
  references were visible in the module results
  preview, but skipped then after the submit
  button is pressed.
- The references are now correctly handled
2021-05-11 11:37:23 +02:00
Jakub Onderka ad1b373766 new: [log] Audit log 2021-05-03 13:44:44 +02:00
mokaddem 95ceeebebb
chg: [event:alert] Added option to refresh to ban 2021-04-30 15:00:08 +02:00
mokaddem b71c73a304
chg: [event:getEventRepublishBanStatus] Improved wording 2021-04-30 13:59:15 +02:00
mokaddem eac4918ab6
new: [event:alert] Re-publishing ban feature based on configurable threshold 2021-04-30 13:58:53 +02:00
iglocska e711fcc7c5
chg: [internal] fetchEventIds refactored
- the stupid ordered params were driving me nuts
2021-04-21 09:09:29 +02:00
mokaddem 108d1a3c76
chg: [event:search] Allow filtering by org uuid.
Fix #7288
2021-04-06 14:05:11 +02:00
Jakub Onderka 77f4e3e6a6 chg: [internal] Optimise fetching correlation count for events 2021-03-29 14:19:53 +02:00
mokaddem 0eb106ef34
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-03-25 16:07:30 +01:00
mokaddem e72579f5a9
fix: [sync:local-tag] Local tags converted into global after sync for internal sync
Fix #7253
2021-03-25 16:04:23 +01:00
mokaddem 71e8dc9641
fix: [attributes:restSearch] pop attribute timestamp filtering condition
This avoid the condition to propagates to the event level.
Fix #7096
2021-03-24 14:42:09 +01:00
mokaddem c9dafbf412
fix: [Event:set_filter_value] Reset array indexing 2021-03-23 16:25:38 +01:00
mokaddem 6ae72280b2
fix: [Event:set_filter_value] Allows searching for composite attributes
Fix #7119
2021-03-23 16:19:15 +01:00
Jakub Onderka 032302dbf9 fix: [workers] Worker name when processing freetext 2021-03-10 21:34:14 +01:00
Jakub Onderka e716df5259
Merge pull request #7182 from JakubOnderka/merge-local-tags
fix: [merge] Local tags should stay local
2021-03-09 20:12:32 +01:00
Jakub Onderka 1d08e3eef2 fix: [merge] Local tags should stay local 2021-03-09 20:05:22 +01:00
iglocska c6ccda3cc6
Merge branch '2.4' into develop 2021-03-09 17:59:15 +01:00
iglocska ad20eb3562
new: [event loader] has a new extensionList parameter
- boolean, if set includes a list of extension events, metadata only
2021-03-09 17:57:22 +01:00
Jakub Onderka 92b51aad4e
Merge pull request #7173 from JakubOnderka/disable-correlation-info-date
chg: [correlation] Do not update info and date column
2021-03-08 09:01:01 +01:00
Jakub Onderka f4cb072d58 chg: [correlation] Do not update info and date column, since they are not used anymore 2021-03-08 08:43:40 +01:00
Jakub Onderka 71e1d486fd
Merge pull request #6967 from JakubOnderka/html-alert-email
HTML alert email
2021-03-06 12:18:33 +01:00
Jakub Onderka 1915cf4724
Merge pull request #7156 from JakubOnderka/fix-empty-object
fix: [internal] Warning when object has no attributes
2021-03-06 10:44:27 +01:00
Jakub Onderka 29040c4f1c new: [email] New setting `MISP.event_alert_metadata_only` 2021-03-06 10:39:16 +01:00
Jakub Onderka 0d493efb1b chg: [email] Move event alert email subject generting 2021-03-06 10:39:16 +01:00
Jakub Onderka 56508cce17 new: [mail] Add reference for event alert emails 2021-03-06 10:39:16 +01:00
Jakub Onderka 17fb5db3cf new: [mail] Move contact alert email to templates 2021-03-06 10:39:16 +01:00
Jakub Onderka e2b1ba18a3 new: [mail] HTML alert emails 2021-03-06 10:39:16 +01:00
Jakub Onderka cc9b50fb8e fix: [sync] Warning when sync object without attributes 2021-03-05 10:13:16 +01:00
Jakub Onderka 062390ed83
Merge pull request #7155 from JakubOnderka/push-optim
Push optim
2021-03-04 19:12:31 +01:00
Jakub Onderka 5113ae34c7 fix: [internal] Warning when object has no attributes 2021-03-04 18:46:57 +01:00
Jakub Onderka 921583f24d chg: [sync] Code cleanup 2021-03-04 18:30:28 +01:00
iglocska 66e371a19c
fix: [comments] updated for two recent changes in the code 2021-03-02 13:03:54 +01:00
iglocska 76a2727583
fix: [sharing groups] Allow users to see events they own, even if their organisation is not explicitly mentioned in the SG
- however, show a clear message that this is the case
- in-line with the rest of the ACL
2021-03-02 00:09:37 +01:00
iglocska 7bb9466e9c
Merge branch '2.4' into develop 2021-03-01 23:33:42 +01:00
iglocska 1727a748eb
fix: [pull] invalid internal vs external server lookup when deciding whether to pull local tags 2021-03-01 23:32:25 +01:00
iglocska ccdbdd1606
Merge branch '2.4' into develop 2021-03-01 11:39:29 +01:00
iglocska d24e2a085a
fix: [Sharing group] refactored and fixed
- include own org in pulled sharing groups (to avoid implicit inclusion not being visible after a pull)
- refactor the pulling method to be more maintainable
- avoid pulling proposals/sightings on each event cherry pick
2021-03-01 11:38:05 +01:00
Jakub Onderka 7d8fdc25a4 chg: [internal] Check missing taxonomies at one place 2021-02-24 08:13:45 +01:00
Jakub Onderka 28b6a9066b chg: [internal] Faster fetching galaxy clusters when fetching event 2021-02-22 08:18:40 +01:00
iglocska 6b5715386a
Merge branch '2.4' into develop 2021-02-19 20:33:44 +01:00
iglocska c63468fd2f
fix: [restsearch] fixed a bug introduced via the new page/limit filters 2021-02-19 20:33:00 +01:00