Commit Graph

1672 Commits (fe83ea6b7ae36bf2d65e461013d529f28c6ddce1)

Author SHA1 Message Date
Jakub Onderka 330aa12313 chg: [sync] Use ServerSyncTool for pushing events 2022-02-20 13:56:13 +01:00
Jakub Onderka 924f28c9e1 fix: [UI] Event warning - distribution can be string 2022-02-20 13:04:35 +01:00
Tom King 5f618ed0ca chg: Update from upstream develop 2022-02-17 10:41:58 +00:00
iglocska f8a0feb59c
chg: [event warnings] load the new behaviour and set the view variable with the contents 2022-02-17 09:24:12 +01:00
Jeroen Pinoy 7a93ffd423
chg: fix findoriginaluuid typo 2022-02-04 11:10:49 +01:00
Jakub Onderka abafe09188 fix: [internal] Array to string conversion 2022-02-02 15:36:35 +01:00
Jakub Onderka 39fc9fa5f8 chg: [internal] Add debugging for problematic push 2022-02-01 17:00:33 +01:00
Steve Clement 021334f8cc
fix: [typo] check - not chech 2022-01-07 11:19:49 +09:00
Richard van den Berg 2e303024bf fix: [event:checkDistributionForPush] typos 2021-12-22 13:55:46 +01:00
Richard van den Berg 7b627037d7 fix: [event:uploadEventSightingsToServersRouter] use Event model for Sighting context 2021-12-22 13:05:55 +01:00
Richard van den Berg c7cf1e7be3 fix: [event:uploadEventSightingsToServersRouter] allow sightings to be pushed upstream 2021-12-22 12:11:22 +01:00
Jakub Onderka d9cc0e8205
Merge pull request #8028 from JakubOnderka/json-convertor-static
chg: [internal] Make JSONConverterTool method static
2021-12-17 18:02:05 +01:00
Sami Mokaddem 0f77454876
fix: [event:push] Unset attribute before processing it and nesting typo 2021-12-17 15:24:35 +01:00
Jakub Onderka f9eeeed4fe chg: [internal] Make JSONConverterTool method static 2021-12-14 22:35:50 +01:00
Sami Mokaddem 7d87fef8ea
fix: [events:synchronisation] debug and typos 2021-12-10 10:02:49 +01:00
Sami Mokaddem 3db4a4636b
chg: [server:synchronisation] Usage of template_uuid instead of the object name 2021-12-10 09:52:07 +01:00
Sami Mokaddem 9d104e941e
chg: [server:synchronisation] Tpye filtering duringg PUSH synchronisation
Split type on attributes and objects
2021-12-10 09:32:49 +01:00
Jakub Onderka d20a68dc38 fix: [internal] Fixes #7961 2021-11-25 10:10:04 +01:00
Jakub Onderka 1e5ca3dc59
Merge pull request #7577 from JakubOnderka/add-event-cleanup
chg: [internal] Convert array to const
2021-11-23 11:51:58 +01:00
Jakub Onderka 975bf43041 chg: [internal] Use ProcessTool in StixExport 2021-11-15 10:04:37 +01:00
Jakub Onderka 9793205661 chg: [internal] upload_stix uses ProcessTool 2021-11-15 10:04:37 +01:00
Luciano Righetti f2c9d12eae chg: merge develop, fix conflicts. 2021-11-08 11:35:20 +01:00
Jakub Onderka 3459a09943 chg: [internal] App model cleanup 2021-11-07 10:40:01 +01:00
Jakub Onderka 70d1829ccb chg: [internal] Unpublish event timestamp 2021-11-06 20:28:01 +01:00
Jakub Onderka 0de880f8ed chg: [internal] Faster attaching tags to events 2021-11-06 15:34:46 +01:00
Luciano Righetti b1eaed2b1b chg: merge develop, fix conflicts 2021-11-03 13:54:20 +01:00
Jakub Onderka ab1e79646e new: [internal] Use pubToZmq to check if publish to ZMQ 2021-11-03 10:27:42 +01:00
Jakub Onderka ab432a02d6 chg: [internal] Optimise fetching events by tags 2021-10-30 19:43:17 +02:00
Jakub Onderka fbbd51385f new: [settings] Allow to use ThreatLevel.name for alert filter 2021-10-30 12:45:28 +02:00
Jakub Onderka 5cd1fe3723 chg: [internal] Small optimisations 2021-10-29 17:39:55 +02:00
Luciano Righetti c16c2784d2 chg: move metadata parameter to last, refactor Server calls to background jobs to new tool 2021-10-29 17:25:33 +02:00
Luciano Righetti a617c089c2 chg: refactor background jobs tool to receive jobId instead of entity. 2021-10-28 10:06:41 +02:00
Luciano Righetti 5e19ca6761 chg: refactor all background job calls from event model and controller to use new tool 2021-10-27 11:33:32 +02:00
Luciano Righetti 970583c4a3 chg: move contact reporter background job to new tool 2021-10-27 09:20:11 +02:00
Luciano Righetti 7a727c028b chg: fetch job status from redis in jobs view. 2021-10-26 15:02:35 +02:00
Luciano Righetti 9bb95db27e chg: remove hardcode response, map shell/cmd names. 2021-10-26 11:14:11 +02:00
Luciano Righetti 35cf34fab2 Merge branch 'develop' into add_simple_background_jobs 2021-10-26 10:55:13 +02:00
Luciano Righetti 5b08bc3578 chg: pass sql Job to new job handler 2021-10-26 10:31:17 +02:00
Jakub Onderka fc2c6c7147 chg: [internal] Fetch less columns for Tag for event index 2021-10-25 09:24:24 +02:00
Jakub Onderka 75ea9c4a0a chg: [internal] Log when object reference could not be captured 2021-10-25 09:14:44 +02:00
Jakub Onderka 5dec932f29 fix: [API] Faster assigning objects and attributes to references 2021-10-24 13:14:19 +02:00
Jakub Onderka 717435cb0e fix: [internal] Do not duplicate column 2021-10-24 12:58:13 +02:00
Jakub Onderka 81717d4c0d chg: [internal] Faster attaching references 2021-10-24 12:54:45 +02:00
Jakub Onderka cf710f796a chg: [internal] Simplified Event::attachTagsToEvents 2021-10-24 11:45:50 +02:00
Jakub Onderka abdd526b2d chg: [internal] Faster attaching attribute tags 2021-10-24 11:45:48 +02:00
Jakub Onderka 7e32f74f83 fix: [API] Simplify linking proposals to attributes 2021-10-24 10:36:54 +02:00
Jakub Onderka 41edbb130e fix: [API] Simplify fetchEvent code 2021-10-23 21:28:18 +02:00
Jakub Onderka ca0892589d fix: [internal] Attaching servere/feed correlation to proposals 2021-10-23 21:06:30 +02:00
Luciano Righetti d3d001dbe3 chg: make enqueue method generic for both engines. 2021-10-22 17:09:31 +02:00
Luciano Righetti f3d05e6ff8 add: add initial new simple background jobs. 2021-10-21 13:39:26 +02:00
Jakub Onderka 2d360da21d chg: [internal] Simplify UserSetting code 2021-10-21 13:03:38 +02:00
Tom King 4e74a165ed Merge remote-tracking branch 'upstream/develop' into feature/propagate_tag_deletion 2021-10-19 09:44:41 +01:00
Jakub Onderka bbb21571bf fix: [internal] Deleting events 2021-10-18 13:55:47 +02:00
Jakub Onderka db5962a680 chg: [internal] Update correlations just when necessary 2021-10-18 09:04:07 +02:00
Jakub Onderka 5c6a7a2939 chg: [internal] Event::unpublishEvent method 2021-10-18 09:04:07 +02:00
Jakub Onderka 03e903a41d chg: [internal] Simplify validation for Event org_id and orgc_id fields 2021-10-18 09:04:07 +02:00
Jakub Onderka 8a0532d902 chg: [internal] Move UUID generation to beforeSave method 2021-10-18 09:04:07 +02:00
Jakub Onderka f99f82fa34 chg: [internal] SaveMany for Event::add_original_file 2021-10-18 09:04:07 +02:00
Jakub Onderka 9e0c36ff2a chg: [internal] Simplify Event::__attachReferences 2021-10-18 09:04:06 +02:00
Jakub Onderka a1a9ee9e6e chg: [internal] Optimise fetching correlations 2021-10-18 09:04:06 +02:00
Jakub Onderka 7fae06785b chg: [internal] Simplify Event::beforeValidate 2021-10-18 09:04:06 +02:00
Jakub Onderka 2cdddfe039 chg: [internal] Use reference for event modification 2021-10-17 13:13:51 +02:00
Jakub Onderka e0144c595c chg: [internal] Optimise code for fetch proposals for events 2021-10-17 13:10:12 +02:00
Jakub Onderka d08f7d8373 chg: [internal] Simplified attaching sharing groups 2021-10-17 12:59:00 +02:00
Jakub Onderka e92c4036fd chg: [internal] Do not specify fields when fetching object 2021-10-17 12:51:58 +02:00
Jakub Onderka ea6854fa14 chg: [internal] Optimise fetching event when pulling 2021-10-17 12:51:58 +02:00
Jakub Onderka 86effcf41f
Merge pull request #7658 from JakubOnderka/compatiblity-check-log
chg: [internal] Create log entry for compatibility check
2021-10-16 09:29:01 +02:00
Jakub Onderka 2f46e0de63
Merge pull request #7748 from JakubOnderka/event-index-optim-vol2
chg: [internal] Another bunch of event filter optim
2021-10-15 20:29:23 +02:00
Jakub Onderka b3c3333812 chg: [internal] Event tags are deleted by quick delete 2021-10-15 20:11:56 +02:00
Jakub Onderka e31f31bcb4 chg: [rest] Do not copy data 2021-10-15 16:17:00 +02:00
Jakub Onderka 41f2825257 fix: [API] Fix fetching events by org UUID 2021-10-15 10:42:38 +02:00
Jakub Onderka 9d84b6923d
Merge pull request #7835 from JakubOnderka/stix-export
chg: [internal] Simplified loading python bin
2021-10-13 17:27:02 +02:00
Jakub Onderka 272bfbbe74
Merge pull request #7832 from JakubOnderka/pulish-sightings-file
chg: [internal] Use FileAccessTool for publishing sightings
2021-10-13 17:26:49 +02:00
Jakub Onderka 481c268105 chg: [internal] Use JsonTool for JSON encoding 2021-10-13 16:12:43 +02:00
Jakub Onderka d19c76388d chg: [internal] Use tmp folder for stix upload 2021-10-13 14:42:26 +02:00
Jakub Onderka d1acf3ea1d chg: [internal] Use FileAccessTool for STIX upload 2021-10-13 11:18:50 +02:00
Jakub Onderka 1bb64d6d3d chg: [internal] Use FileAccessTool for Event::__getTagNamesFromSynonyms 2021-10-13 11:06:07 +02:00
Jakub Onderka e96b05554c chg: [export] Check method existence rather than another variable 2021-10-13 09:57:26 +02:00
Jakub Onderka 742f01a8a9 fix: [internal] Fix saving tags 2021-10-12 12:01:06 +02:00
Jakub Onderka d983d10c14 chg: [internal] Use FileAccessTool for publishing sightings 2021-10-12 11:09:37 +02:00
misp-test d25c8e7b2f keep tag local state when importing from json or sync from internal
Fixes MISP#7810
When importing an Event via JSON, local tags inside the json should stay local after import too, and not be attached as global ones.
Same applies for Sync-Operations from internal instances (for any other instance local tags get stripped anyway)
2021-10-12 11:05:44 +02:00
Jakub Onderka d74343b7b6
Merge pull request #7830 from JakubOnderka/audit-log-undefined-index
fix: [log] Undefined index local
2021-10-12 09:55:41 +02:00
Jakub Onderka b5856d6f73 chg: [log] Log when saving tags fails for attribute or event 2021-10-12 09:25:15 +02:00
Jakub Onderka 6aee82112b chg: [UI] Show proper error when uploading event that already exists 2021-10-11 12:15:34 +02:00
Jakub Onderka 3d0e678231 chg: [internal] Simplify Event::__captureObjects code 2021-10-10 16:12:40 +02:00
Jakub Onderka d646a68565 chg: [internal] Remove dead code 2021-10-10 16:04:58 +02:00
Jakub Onderka ae08f5d382 chg: [internal] No need to initialize Sighting model 2021-10-10 15:54:42 +02:00
Jakub Onderka 0427ee33b9 chg: [internal] Remove unused attribute from MispObject::captureObject method 2021-10-10 15:42:37 +02:00
Jakub Onderka b3ca92a0ec chg: [internal] Remove unused code when saving attributes for event 2021-10-10 15:40:41 +02:00
Jakub Onderka 26badb4e3e chg: [internal] Save multiple tags in one call 2021-10-10 15:06:04 +02:00
Jakub Onderka c43d1c18b0 chg: [internal] Simplified SharingGroup::appendOrgsAndServers 2021-10-10 14:26:39 +02:00
Jakub Onderka 4ddab29b7d chg: [internal] Cache capturing tag results 2021-10-10 14:26:39 +02:00
Jakub Onderka 18d38b7478 fix: [internal] Remove unused Event::checkIfAuthorised method 2021-10-10 11:12:23 +02:00
Jakub Onderka f9a54c3d4d fix: [internal] Deleting event propagation to ZMQ and Kafka 2021-10-10 10:23:40 +02:00
Jakub Onderka 9bfe634cac chg: [internal] Default distribution method 2021-10-10 10:14:04 +02:00
Jakub Onderka de73e47318 chg: [internal] Faster saving origin file 2021-10-09 18:32:57 +02:00
Jakub Onderka 3562899af0 chg: [internal] Background processing refactoring 2021-10-09 15:00:28 +02:00
Jakub Onderka 10f505c09d chg: [internal] Use hasAny 2021-10-05 20:33:53 +02:00
Jakub Onderka c48ad84708
Merge pull request #7779 from JakubOnderka/create-job
new: [internal] Method Job::createJob
2021-09-30 13:51:58 +02:00
Jakub Onderka 48016120b7 chg: [internal] Use AdminSetting::getSetting method 2021-09-30 13:09:46 +02:00
Jakub Onderka ac4f042868 new: [internal] Method Job::createJob 2021-09-30 13:05:29 +02:00
Jakub Onderka cdee859a06 fix: [internal] Better error handling when uploading STIX file 2021-09-29 15:53:10 +02:00
Jakub Onderka dc05fc1302 chg: [internal] Code cleanup 2021-09-20 10:51:10 +02:00
Jakub Onderka 47808bd542
Merge pull request #7733 from JakubOnderka/capture-object-attributes
chg: [internal] Faster capturing object attributes
2021-09-08 15:36:09 +02:00
Jakub Onderka e3f2ba68a5 chg: [internal] Faster processing freetext import 2021-09-08 13:12:38 +02:00
Jakub Onderka 3ae8a09814 chg: [internal] Faster editing attributes when change is required 2021-09-07 15:59:58 +02:00
Jakub Onderka d582893bdf chg: [internal] Faster capturing object attributes 2021-09-07 15:59:58 +02:00
Jakub Onderka a539b2ee7c
Merge pull request #7579 from JakubOnderka/publish_alerts_summary_only_deprecate
chg: [alert] Deprecate `MISP.publish_alerts_summary_only`
2021-09-07 12:19:01 +02:00
mokaddem 2229809e9b
Merge branch 'develop' of github.com:MISP/MISP into feature-email-notification-bans 2021-09-07 09:00:24 +02:00
Jakub Onderka 62e90a1817 chg: [internal] Simplify code for editing object 2021-09-04 07:17:04 +02:00
Jakub Onderka 541f8f03c3 chg: [internal] Simplify code for editing attribute 2021-09-03 22:17:14 +02:00
Jakub Onderka 12cc881ff6 chg: [internal] Use correlation object from attribute 2021-09-03 12:28:54 +02:00
Jakub Onderka ed19de5b82 fix: [internal] Filtering warninglist in objects 2021-09-02 17:01:09 +02:00
Jakub Onderka ee62d185f9 fix: [internal] Typo 2021-09-02 16:38:16 +02:00
Jakub Onderka 8caa73ccc8
Merge pull request #7719 from JakubOnderka/warninglist-filtering
new: [UI] Allow to filter attributes by specific warninglist
2021-09-02 16:23:01 +02:00
Jakub Onderka c6519b2939 new: [UI] Allow to filter attributes by specific warninglist 2021-09-02 15:02:18 +02:00
mokaddem 2153537e01
new: [event:notification] Added email notification ban system based on users triggering the notification 2021-08-31 09:39:05 +02:00
mokaddem f2af0a2e49
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-08-31 08:14:22 +02:00
mokaddem a7270cc7c8
new: [export:host] RestSearch export for blackholing via host file 2021-08-31 08:09:43 +02:00
Jakub Onderka 80675e1745 chg: [internal] Simplify capturing object code 2021-08-30 17:08:49 +02:00
Jakub Onderka 9acc30d7a0 chg: [internal] Simplify capturing attribute code 2021-08-30 15:49:46 +02:00
Jakub Onderka 439ec5cceb fix: [internal] Code cleanup 2021-08-23 17:03:44 +02:00
Jakub Onderka faf5054583
Merge pull request #7649 from JakubOnderka/pull-sightings
chg: [sync] Pull just necessary data when pulling sightings
2021-08-20 09:26:09 +02:00
Jakub Onderka 3c3cee7735
Merge pull request #7659 from JakubOnderka/unique-indexes
chg: [schema] Mark more indexes as unique
2021-08-20 09:22:23 +02:00
mokaddem ec2cb29fe0
fix: [event:filter_value] Allow searching for multiple values 2021-08-18 14:32:40 +02:00
Jakub Onderka 2e506ea430 fix: [log] Array to string conversion 2021-08-17 14:05:41 +02:00
Jakub Onderka 67f986a8b5 chg: [validation] UUID unique validation 2021-08-15 20:08:28 +02:00
Jakub Onderka a5712b8edd chg: [sync] Use server sync tool for compatibility check 2021-08-13 10:32:38 +02:00
Jakub Onderka 0174336156 chg: [sync] Pull just necessary data when pulling sightings 2021-08-11 18:42:22 +02:00
Tom King 370176a037 Merge remote-tracking branch 'upstream/develop' into feature/propagate_tag_deletion 2021-08-11 10:56:30 +01:00
Jakub Onderka bed7ada3af chg: [internal] Simplified code for adding events 2021-08-11 10:06:53 +02:00
Jakub Onderka c797cb6ac0 chg: [internal] Do not keep original variable to save memory 2021-08-11 10:06:37 +02:00
Jakub Onderka 164c85f5c0 chg: [internal] Simplified Event::getRelatedAttributes 2021-08-11 10:06:09 +02:00
Jakub Onderka 7cc38f67ba chg: [internal] Use hash for removing duplicate attributes 2021-08-11 10:05:38 +02:00
Jakub Onderka c53c860b58 chg: [internal] Use one EventLock instance 2021-08-11 10:05:28 +02:00
Jakub Onderka 673f48c10d chg: [internal] Cleanup code responsible for adding events 2021-08-11 10:05:18 +02:00
Jakub Onderka 97a7d1cc73 fix: [internal] Shadow attributes don't have tags 2021-08-05 10:46:33 +02:00
Jakub Onderka 15e3cc799c chg: [internal] Removed unused variables 2021-07-27 18:43:16 +02:00
Jakub Onderka bf9ee25239 fix: [internal] Remove unused variable 2021-07-21 09:32:51 +02:00
Jakub Onderka 52d8ac6060 chg: [alert] Deprecate `publish_alerts_summary_only`, this option just duplicate `event_alert_metadata_only` 2021-07-20 15:19:10 +02:00
mokaddem 88b1772244
fix: [event:contact] User object passed in contact reporter
Fix #7471
2021-07-13 15:20:12 +02:00
Jakub Onderka f747d98877
Merge pull request #6817 from JakubOnderka/upload-sightings
chg: [sync] New separate method for uploading sightings to remote server
2021-07-09 12:25:16 +02:00
Jakub Onderka c14e070912 fix: [internal] Relationship import 2021-07-07 12:38:49 +02:00
Tom King 297eb9baad Merge remote-tracking branch 'upstream/2.4' into feature/propagate_tag_deletion 2021-07-07 08:49:13 +01:00
mokaddem 8921b3b3ba
fix: [event:add] Typo in accessing sharing group roaming information 2021-06-30 12:41:07 +02:00
iglocska c516d4d6ef
fix: [emailing] added missing if branch for the publish alert summary mode to trigger 2021-06-15 20:12:08 +02:00
Tom King b5e2163556 new: [sync] Allow option to delete tags on event sync prior to soft-delete tag implementation 2021-06-11 17:14:29 +01:00
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 683e52702d new: [sync] When saving sightings, push just new sightings 2021-03-14 09:28:15 +01:00
Jakub Onderka d82a95b903 new: [sync] When pushing event, upload sightings by another call 2021-03-11 12:14:52 +01:00
Jakub Onderka 6af83b5d5a new: [sync] Filter out existing sightings if remote sever supports that method 2021-03-11 12:14:52 +01:00
Jakub Onderka 362707deb1 chg: [sync] Faster capturing sighting when pushing whole event 2021-03-11 12:14:52 +01:00
Jakub Onderka 0e9f9abdb3 chg: [sync] Optimise event filtering 2021-03-11 12:14:52 +01:00
Jakub Onderka 6472839187 chg: [sync] Check if event exists before pushing 2021-03-11 12:14:52 +01:00
Jakub Onderka 937766ec58 fix: [sync] Do not append 'metadata:1' when pushing event 2021-03-11 12:14:52 +01:00
Jakub Onderka 5fc9d03bd8 chg: [sync] Remove old method for uploading sightings 2021-03-11 12:14:52 +01:00
Jakub Onderka aa75290165 chg: [sync] Check event existence before pushing sightings 2021-03-11 12:14:52 +01:00
Jakub Onderka 8830696c4d chg: [sync] New separate method for uploading sightings to remote server 2021-03-11 12:14:52 +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