MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
23,666 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

1672 Commits (fe83ea6b7ae36bf2d65e461013d529f28c6ddce1)

Author SHA1 Message Date
Jakub Onderka 21afe562ef fix: [internal] Faster RegexpBehavior 2022-05-29 17:39:10 +02:00
Jakub Onderka 5c4a126aaa fix: [internal] Checking if event exists typo 2022-05-29 16:21:25 +02:00
Jakub Onderka 7ea7b16113 chg: [internal] Faster check if org is blocked 2022-05-29 16:21:25 +02:00
Jakub Onderka bb9567f671 new: [UI] Allow to upload MISP event by pasting data to textarea 2022-05-29 16:21:25 +02:00
Jakub Onderka c4a85b4998 chg: [internal] Escape table and column name 2022-05-24 14:57:19 +02:00
Jakub Onderka 2f644a2a33 chg: [internal] Use SORT_REGULAR for array_unique 2022-05-22 18:20:12 +02:00
Jakub Onderka d086f22284 new: [internal] New method SharingGroup::authorizedIds 2022-05-22 18:03:16 +02:00
Jakub Onderka 4998ed672e chg: [internal] Delete event in transaction 2022-05-21 12:46:12 +02:00
Jakub Onderka e293da740f chg: [internal] Remove QueryTool 2022-05-21 11:40:18 +02:00
Sami Mokaddem c5af331bc5
Merge branch 'develop' of github.com:MISP/MISP into feature-workflows 2022-05-16 10:50:47 +02:00
Jakub Onderka 2f7c671adb new: [internal] Simplify checking if connection is MySQL/MariaDB 2022-05-14 10:17:06 +02:00
Sami Mokaddem 140b771989
Merge branch 'webhook' of github.com:MISP/MISP into feature-workflows 2022-05-11 13:05:15 +02:00
iglocska a4cba3fdc6
new: [modules] action module type added 
- hooking function type
- add a hooking point via `$this->Module->executeActions($hook_name, $user, $input, $logging_options, $error)`
- will execute the enabled modules for the hook name and depending on the module's type (blocking/not blocking) allow for breaking the execution when false is returned.
- For a sample skeleton, see the misp-modules project
 2022-05-04 01:23:13 +02:00
Jakub Onderka d7bdc32c1f new: [UI] Filtering attributes by correlated event ID 2022-04-30 18:12:04 +02:00
Tom King d3f2dc07c8 fix: Enable sharing group filter for Event controller not just attribute 2022-04-21 11:16:26 +01:00
Luciano Righetti 5fd52252e7 fix: revert ec2cb29fe0 2022-04-20 12:33:26 +02:00
Tom King 5de04ecffa chg: Merge from develop 2022-04-20 08:07:36 +01:00
Jakub Onderka eb86544b72
Merge pull request #8281 from JakubOnderka/freetext-import-simplify 
chg: [internal] Simplify and speedup code for freetext importing
 2022-04-18 20:11:19 +02:00
Jakub Onderka 104ea79afc chg: [internal] Simplify and speedup code for freetext importing 2022-04-15 14:31:17 +02:00
Luciano Righetti 204ec386b2
Merge pull request #8277 from tomking2/feature/restSearch_SharingGroup 
Add in new RestAPI parameter to filter by sharing group on Event or Attribute search
 2022-04-14 17:25:59 +02:00
Tom King 37ea0ddee1 chg: Add in new RestAPI parameter to filter by sharing group on Event or Attribute search 2022-04-13 16:27:20 +01:00
Jakub Onderka ff150b8834 chg: [internal] Do not generate export array when initializing Event class 2022-04-10 09:49:21 +02:00
iglocska 08ccdf23e2
chg: [server sync] update to the previous fix to include the recursive condition 
- instead of just replacing the condition with the contain list, include both to get the performance gains back
 2022-03-24 16:11:29 +01:00
iglocska b1f1b4d2cd
Merge branch '2.4' into develop 2022-03-24 15:37:21 +01:00
iglocska 15820bb5af
fix: [sync] publishing sharing group events fail to sync - fixed 
- code cleanup removed related models, including remote org which is needed to check if the remote is to receive an event

- as reported by @treyka
 2022-03-24 15:36:11 +01:00
Jakub Onderka ec0fae0c94 fix: [internal] Code style 2022-03-20 14:21:31 +01:00
Jakub Onderka f208c656ea chg: [cryptograhicKey] Simplified code for event pushing 2022-03-17 13:58:25 +01:00
iglocska e8dcb31623
Merge branch 'feature/protected_mode' into develop 2022-03-17 01:43:44 +01:00
iglocska 8ea0b2cb56
chg: [unused endpoint] removed 2022-03-17 00:57:41 +01:00
iglocska 259a19a374
fix: [sync] removed newly added locked field as a sanitized sync field 
- ends up creating unlocked events on the remote, preventing future edits
 2022-03-16 15:36:58 +01:00
iglocska d60e8a39a1
Merge branch 'feature/protected_mode' of github.com:MISP/MISP into feature/protected_mode 2022-03-15 23:11:19 +01:00
iglocska f592053f5a
fix: [event] include the protected field in the saving to allow syncing of protected events 2022-03-15 23:10:09 +01:00
iglocska e5c7e50fcf
fix: [internal] event rearranging before push fixed 
- some elements were at a misaligned level in the array
 2022-03-15 07:16:19 +01:00
iglocska 0774086ad2
fix: [event model] fixes 
- fixed class name typo
- removed placeholder exception / breakpoint
 2022-03-14 00:33:41 +01:00
iglocska 8e96e2fd00
chg: [cryptographic key] move capture function to a bulk delta function 2022-03-13 17:02:50 +01:00
iglocska 4c381157a6
chg: [cryptographickey] execute key update on add() 2022-03-13 15:13:32 +01:00
iglocska d165b092f3
new: [event signing] sign events function added 2022-03-13 12:37:02 +01:00
Jakub Onderka cac0e81001
Merge pull request #8154 from JakubOnderka/server-sync-push 
chg: [sync] Use ServerSyncTool for pushing events
 2022-03-12 13:19:54 +01:00
Jakub Onderka b00ef27fb5
Merge pull request #8179 from JakubOnderka/upload-event-cleanup 
chg: [internal] Simplify code for pushing events
 2022-03-12 13:18:33 +01:00
Jakub Onderka 2e87d6b7b4
Merge pull request #8197 from JakubOnderka/push-sightings-refactor 
chg: [sync] Simplify code for sighting pushing
 2022-03-12 13:17:38 +01:00
Sami Mokaddem b6c730f8f4
chg: [events:restSearch] Added `context-markdown` export format 2022-03-09 17:49:34 +01:00
Sami Mokaddem f08d29f1e7
Merge branch 'develop' of github.com:MISP/MISP into develop 2022-03-08 13:40:37 +01:00
Sami Mokaddem 155bf23776
new: [events:restSearch] Added `context` export format 
The `context` export format includes:
- List of used taxonomies
- List of used galaxy cluster
- List of custom tags
- Mitre Att&ck matrix
 2022-03-08 13:40:15 +01:00
Jakub Onderka 90cd99685f chg: [sync] Simplify code for sighting pushing 2022-03-07 17:45:06 +01:00
Jakub Onderka 1c97d4de2a chg: [internal] Simplify code for pushing events 2022-02-28 14:54:18 +01:00
Jakub Onderka 1950ca6ab8
Merge pull request #8155 from JakubOnderka/bg-jobs-read-timeout 
new: [bgjobs] Allow to set Redis read timeout
 2022-02-27 09:00:43 +01:00
Jakub Onderka 29e0695df7
Merge pull request #8173 from JakubOnderka/fix-id-translator 
fix: [internal] Event ID translator
 2022-02-26 11:16:12 +01:00
Jakub Onderka 5ec36f8d4b fix: [internal] Event ID translator 2022-02-26 09:37:27 +01:00
Jakub Onderka 341687cb61 chg: [internal] Simplify logging when pulling events 2022-02-23 16:05:42 +01:00
Jakub Onderka 9bc899e3a4 fix: [internal] Append variable just when not null 2022-02-23 16:05:41 +01:00
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