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

16447 Commits (81252c560bc2eb8eb5e3152682088dd97d096b65)

Author SHA1 Message Date
Jakub Onderka ea70525e54 chg: [API] Simplify handling deleted attributes 2021-10-19 18:27:16 +02:00
Jakub Onderka 1562d0704b chg: [UI] Simplify performQuery method 2021-10-19 18:18:40 +02:00
Jakub Onderka 62825c64ab chg: [UI] Simplify HTML code 2021-10-19 18:01:43 +02:00
Jakub Onderka 32510c0037
Merge pull request #7730 from JakubOnderka/user-setting-oidc 
new: [oidc] User setting for oidc metadata
 2021-10-19 15:17:37 +02:00
Jakub Onderka 817dbdb7be
Merge pull request #7861 from JakubOnderka/ajax-401 
chg: [ajax] Return correct error code when user is not logged
 2021-10-19 14:50:42 +02:00
Sami Mokaddem dc7103ca0e
chg: [Server:update] Execute git submodule sync before updating 
This is done in order to make sure the submodules' remote URL is inline with the value defined in the .gitmodules
 2021-10-19 14:39:32 +02:00
Jakub Onderka 45b4a326ca chg: [ajax] Return correct error code when user is not logged 2021-10-19 14:36:42 +02:00
Sami Mokaddem a4d20632c9
chg: [Server:update] Execute git submodule sync before updating 
This is done in order to make sure the submodules' remote URL is inline with the value defined in the .gitmodules
 2021-10-19 14:09:53 +02:00
Jakub Onderka a4966261cd
Merge pull request #7859 from JakubOnderka/fix-completeley-broken-ui 
fix: [UI] Broken tag attaching
 2021-10-19 10:38:49 +02:00
Jakub Onderka 1f61719861 fix: [UI] Active rules value 2021-10-18 18:10:09 +02:00
Jakub Onderka 9cde4c4342 fix: [UI] Event filtering 2021-10-18 18:01:57 +02:00
Jakub Onderka 327852024a fix: [ui] Do not call checkAndSetPublishedInfo when no need 2021-10-18 18:01:57 +02:00
Jakub Onderka fd150d5fe0 fix: [UI] Correctly handle links to related events 2021-10-18 18:01:57 +02:00
Jakub Onderka 4f31876890 fix: [UI] Broken tag attaching 2021-10-18 18:01:57 +02:00
Jakub Onderka df63d660f6 chg: [internal] Faster tag extraction 2021-10-18 16:36:03 +02:00
Jakub Onderka bbb21571bf fix: [internal] Deleting events 2021-10-18 13:55:47 +02:00
Jakub Onderka 3773fdff93 new: [CLI] Assign UserSetting to list output 2021-10-18 10:08:20 +02:00
Jakub Onderka 2ed41a0964 new: [oidc] User setting for oidc metadata 2021-10-18 10:08:18 +02:00
Jakub Onderka 9720a9772c chg: [auditlog] Optimise fetching old records 2021-10-18 09:04:07 +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 0043148ca5 chg: [internal] Simplify Attribute::beforeValidate 2021-10-18 09:04:06 +02:00
Jakub Onderka 6fe3a895c8 chg: [internal] Simplify validation 2021-10-18 09:04:06 +02:00
Jakub Onderka ea9360e680 chg: [internal] Optimise beforeValidate for object 2021-10-18 09:04:06 +02:00
Jakub Onderka f179ec0db6 chg: [internal] Optimise datetimeOrNull method 2021-10-18 09:04:06 +02:00
Jakub Onderka 4cba4b3337 chg: [internal] Optimise JSONConverterTool 2021-10-18 09:04:06 +02:00
Jakub Onderka 8b219c73b5 chg: [modules] Use JsonTool 2021-10-18 09:04:06 +02:00
Jakub Onderka a6c5089eba chg: [stix-export] Use JsonTool 2021-10-18 09:04:06 +02:00
Jakub Onderka f481e30fe6 chg: [pubsub] Optimise 2021-10-18 09:04:06 +02:00
Jakub Onderka 1ffdfed0b1 chg: [internal] Optimise validators 2021-10-18 09:04:06 +02:00
Jakub Onderka a1c22e9fe5 chg: [internal] Remove unused validation rule 2021-10-18 09:04:06 +02:00
Jakub Onderka 3b69b528cc chg: [internal] Fix validation for UserSetting value 2021-10-18 09:04:06 +02:00
Jakub Onderka f3f50c14fd chg: [internal] Remove unused method 2021-10-18 09:04:06 +02:00
Jakub Onderka e1895cba81 chg: [internal] Optimise sightings 2021-10-17 16:17:17 +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 28afe209ca chg: [internal] Fix setting cleanDb admin setting 2021-10-16 19:32:32 +02:00
Jakub Onderka 751839ad8f
Merge pull request #7848 from JakubOnderka/update-less-work 
chg: [internal] Do less work when checking if db is updated
 2021-10-16 19:23:03 +02:00
Jakub Onderka 5b298912d9
Merge pull request #7797 from JakubOnderka/server-pull-cleanup 
chg: [internal] Code cleanup for Server::pull method
 2021-10-16 19:20:46 +02:00
Jakub Onderka ea9e9d9be8
Merge pull request #6562 from JakubOnderka/prevent-deadlocks 
fix: [internal] Try to prevent deadlocks when updating event attribute count
 2021-10-16 10:05:16 +02:00
Jakub Onderka d45ac63bf9 chg: [internal] Do less work when checking if db is updated 2021-10-16 09:58:05 +02:00
Jakub Onderka e734349f85
Merge pull request #7036 from JakubOnderka/event-tooltips 
Event tooltips
 2021-10-16 09:34:11 +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 401531e03a
Merge pull request #7646 from JakubOnderka/server-sync-log 
new: [sync] Server sync logging
 2021-10-16 09:27:41 +02:00
Jakub Onderka 459afd6f67 chg: [internal] Code cleanup for Server::pull method 2021-10-16 09:26:42 +02:00
Jakub Onderka 49eb9e1351 chg: [internal] Code cleanup for EventsController::__indexRestResponse 2021-10-15 20:40:40 +02:00
Jakub Onderka fdc6441751 chg: [internal] Small optimisations for index REST response 2021-10-15 20:40:40 +02:00
Jakub Onderka 567174a4bb fix: [internal] Fetch event index in CSV 2021-10-15 20:40:40 +02:00
Jakub Onderka 77e8ef0337 chg: [internal] Remove user id from fetched columns 2021-10-15 20:40:40 +02:00
Jakub Onderka 26b1b9bf04 chg: [API] Fetch sharing groups in different query 2021-10-15 20:40:40 +02:00
Jakub Onderka 9dd4248bc9 chg: [API] Optimise fetching event index 2021-10-15 20:40:40 +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 2c9f2aeca3 chg: [event-index] Faster fetching empty results 2021-10-15 20:11:56 +02:00
Jakub Onderka 64afd7d57b chg: [index] Faster event filtering by multiple tags 2021-10-15 20:11:56 +02:00
Jakub Onderka b3c3333812 chg: [internal] Event tags are deleted by quick delete 2021-10-15 20:11:56 +02:00
Jakub Onderka 01a416db72 chg: [event-index] Simplified condition for minimal search 2021-10-15 20:11:56 +02:00
Jakub Onderka 9133e4d2e5 chg: [test] test_search_index_minimal_published 2021-10-15 20:11:56 +02:00
Jakub Onderka 81080a991c chg: [event index] For non exists email, do not return any event 2021-10-15 20:11:56 +02:00
Jakub Onderka ede058eebf chg: [internal] Handle non admin search event by email differently 2021-10-15 16:41:03 +02:00
Jakub Onderka e31f31bcb4 chg: [rest] Do not copy data 2021-10-15 16:17:00 +02:00
Jakub Onderka d469883395 chg: [rest] Close session to allow concurrent requests 2021-10-15 16:17:00 +02:00
Jakub Onderka a3d1ff8762 chg: [internal] Another bunch of event filter optim 2021-10-15 15:54:31 +02:00
Jakub Onderka 1a33ec8f87
Merge pull request #7845 from JakubOnderka/fix-ui-undefined-index 
fix: [UI] Undefined index
 2021-10-15 14:54:43 +02:00
Jakub Onderka 82a76325a8
Merge pull request #7846 from JakubOnderka/stix-delete-files 
fix: [stix-export] Delete tmp files
 2021-10-15 14:54:28 +02:00
Jakub Onderka 829ae07c3e fix: [stix-export] Delete tmp files 2021-10-15 14:40:37 +02:00
Jakub Onderka c81e9b7f27 fix: [UI] Undefined index 2021-10-15 14:32:41 +02:00
Jakub Onderka e984b20c83 fix: [index] Org condition 2021-10-15 12:32:09 +02:00
Jakub Onderka 1ffcb5fdb5 chg: [index] Simplified code for org matching 2021-10-15 12:21:03 +02:00
Jakub Onderka 37631f4272 fix: [index] Remove all virtual fields 2021-10-15 12:15:33 +02:00
Jakub Onderka 41f2825257 fix: [API] Fix fetching events by org UUID 2021-10-15 10:42:38 +02:00
iglocska 5fa99acb3b
Merge branch '2.4' into develop 2021-10-14 14:21:57 +02:00
iglocska 932a94f623
fix: [event index] search by org fixed when using string names, fixes MISP/PyMISP#799 2021-10-14 14:20:26 +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 0f2ac9c1c0 chg: [stix-export] Code cleanup 2021-10-13 10:37:06 +02:00
Jakub Onderka e96b05554c chg: [export] Check method existence rather than another variable 2021-10-13 09:57:26 +02:00
Jakub Onderka 785722931e chg: [stix-export] Throw exception on error 2021-10-13 09:57:26 +02:00
Jakub Onderka e03ac4f3ba chg: [stix-export] Store temp file in default folder 2021-10-13 09:57:26 +02:00
Jakub Onderka 1cf0f02228 chg: [stix-export] Try to directly return TmpFileTool 2021-10-13 09:57:26 +02:00
Jakub Onderka 3239c6dbd5 chg: [stix-export] Use more reliable file processing 2021-10-13 09:57:26 +02:00
Jakub Onderka fdfda4cec2 chg: [stix-export] Use TmpFileTool 2021-10-13 09:57:26 +02:00
Jakub Onderka 2b31ada0a5 chg: [stix-export] Simplified loading python bin 2021-10-13 09:57:25 +02:00
iglocska 0d82df3e4c
Merge branch 'attribute_index' into develop 2021-10-12 16:13:03 +02:00
iglocska cb20a9e1d9
fix: [attribute index] fixed attribute tag widget 
- notice errors due to missing variables in the closure
 2021-10-12 16:12:15 +02:00
iglocska c7493a5e0d
fix: [attribute index] fix galaxy widget for the attribute index 
- notice errors when logged in as a user
 2021-10-12 15:57:53 +02:00
iglocska d93a683f15
fix: [attribute index] action ACL fixed 2021-10-12 15:34:59 +02:00
iglocska 10005f3774
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-10-12 15:12:15 +02:00
iglocska 4695a1d3f7
Merge branch '2.4' into develop 2021-10-12 15:10:59 +02:00
iglocska 4822aad82c
Revert "fix: [internal] withCredentials property was added into $.ajaxSetup() to get rid of 403 and 302 responses" 
This reverts commit b496161f5b.
 2021-10-12 15:10:45 +02:00
Andras Iklody d0633c2f62
Merge pull request #7633 from righel/migrate-news-views 
chg: migrate news views to factory.
 2021-10-12 15:04:23 +02:00
iglocska 0ae53cc1f1
chg: [queryversion] bump 2021-10-12 15:02:34 +02:00
iglocska 36b4300f04
Merge branch '2.4' into develop 2021-10-12 15:02:03 +02:00
Andras Iklody f44b125ab2
Merge pull request #7818 from MrBoba/fix-unauthorized-ajax 
fix: [internal] withCredentials property was added into $.ajaxSetup()…
 2021-10-12 15:01:17 +02:00
Jakub Onderka 9610fb1e93 chg: [internal] Use FileAccessTool for Feed::unzipFirstFile 2021-10-12 14:32:50 +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 60ac21e252 fix: [log] Undefined index local 2021-10-12 09:14:28 +02:00
Alexandre Dulaunoy b3017cc06a
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-10-12 07:19:40 +02:00
Alexandre Dulaunoy e7c842d25f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-10-12 07:19:11 +02:00
Alexandre Dulaunoy da6d5aaa12
chg: [MISP/cakephp] updated - to get latest CA bundle 2021-10-12 07:18:33 +02:00
Jakub Onderka 5246b4269d
Merge pull request #7826 from JakubOnderka/new-submodules 
chg: [internal] Add new submodules to diagnostics page
 2021-10-11 12:51:08 +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 7fd45b4b11 chg: [internal] Add new submodules to diagnostics page 2021-10-11 11:52:42 +02:00
Jakub Onderka af15ea4934 chg: [feed] Move feed cache to proper folder 2021-10-11 10:23:08 +02:00
Jakub Onderka c1c179dcff chg: [feed] Use FileAccessTool 2021-10-11 10:23:08 +02:00
Jakub Onderka 72f180c0af chg: [feed] Simplified code for updating events from MISP feed 2021-10-11 10:23:08 +02:00
Jakub Onderka 8a4628c7e2 chg: [feed] Support unicode for feed preview search 2021-10-11 10:23:08 +02:00
Jakub Onderka 629b711524 chf: [feed] Cache MISP feed manifest file 2021-10-11 10:23:08 +02:00
Jakub Onderka 8a8f5095ee chg: [feed] Faster saving freetext attributes 2021-10-11 10:23:08 +02:00
Jakub Onderka b26f0e435b chg: [feed] Clean cache after feed modification 2021-10-11 10:23:08 +02:00
Jakub Onderka bf89ef2231 chg: [feed] Check ETag when fetching freetext feed 2021-10-11 10:23:08 +02:00
Jakub Onderka 618c5cf52a chg: [internal] Use hasAny for Org::canSee method 2021-10-11 09:41:46 +02:00
Jakub Onderka aedadd070b chg: [internal] Use findColumn for Org::getOrgIdsFromMeta method 2021-10-11 09:41:46 +02:00
Jakub Onderka dc54516829 chg: [internal] Use FileAccessTool to read country galaxy cluster 2021-10-11 09:41:46 +02:00
Jakub Onderka 99db1b7d7c chg: [internal] Better logging when saving SharingGroup 2021-10-11 09:41:46 +02:00
Jakub Onderka 34914d44de fix: [internal] Remove unused SharingGroup::getSGSyncRules method 2021-10-11 09:41:46 +02:00
Jakub Onderka d9e89955bc chg: [internal] Simplify fetching Kafka topic 2021-10-11 09:41:46 +02:00
Jakub Onderka a33bf23342 chg: [internal] Simplify SharingGroup::checkIfAuthorisedToSave 2021-10-11 09:41:46 +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 6986d84987 chg: [internal] Simplified code for MispObject::captureObject 2021-10-10 15:40:04 +02:00
Jakub Onderka d8a5441a21 chg: [internal] Faster saving attributes 2021-10-10 15:06:04 +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 962929dcbd chg: [internal] Remove unused method Tag::findEventTags 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 3af50e0770 chg: [internal] Faster validating SG 2021-10-10 11:58:37 +02:00
Jakub Onderka a7ea4bbc4d chg: [internal] Remove unused method 2021-10-10 11:57:34 +02:00
Jakub Onderka aaa81bfd66 chg: [internal] Simplified SharingGroup::checkIfAuthorised method 2021-10-10 11:46:11 +02:00
Jakub Onderka 69b150b46a chg: [internal] Use hasAny for SG existence check 2021-10-10 11:38:35 +02:00
Jakub Onderka 2d7f9e7c85 chg: [internal] Use ?: operator 2021-10-10 11:37:54 +02:00
Jakub Onderka ee4480bc30 chg: [internal] Use hasAny method for checkIfAuthorised methods 2021-10-10 11:37:36 +02:00
Jakub Onderka 5cfb9aade7 chg: [internal] Simplified Attribute::editAttribute method 2021-10-10 11:14:22 +02:00
Jakub Onderka 3f490c0989 chg: [internal] Move Attribute::resizeImage method to AttachmentTool 2021-10-10 11:14:22 +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 4049c1e127 chg: [internal] Attribute::onDemandEncrypt faster 2021-10-10 08:11:46 +02:00
chrisr3d 581816c435 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2021-10-10 01:24:03 +02:00
chrisr3d f70e584a5b
fix: [stix1 export] Removed unnecessary write 2021-10-10 01:04:15 +02:00
Jakub Onderka 9826847660 chg: [internal] Delete unused method Attribute::saveAndEncryptAttribute 2021-10-09 18:44:33 +02:00
Jakub Onderka de73e47318 chg: [internal] Faster saving origin file 2021-10-09 18:32:57 +02:00
Jakub Onderka 6da85b4494 chg: [internal] Optimise Attribute::valueIsUnique check 2021-10-09 18:15:16 +02:00
Jakub Onderka 5e320a1dbd chg: [internal] Do not encode/decode base64 for simpleAddMalwareSample 2021-10-09 18:15:16 +02:00
Jakub Onderka c89893cbab chg: [internal] Use FileAccessTool in AttachmentTool 2021-10-09 18:15:16 +02:00
Jakub Onderka 2f71e0f7f4 chg: [internal] Allow to save raw data 2021-10-09 17:07:29 +02:00
Jakub Onderka 0faf986b78 fix: [shell] EventShell::contactemail command 2021-10-09 15:44:55 +02:00
Jakub Onderka 3562899af0 chg: [internal] Background processing refactoring 2021-10-09 15:00:28 +02:00
Alexandre Dulaunoy c61668dac4
Merge pull request #7819 from Wachizungu/fix-communities-list-language 
fix: [community-metadata] Fix typos and improve wording
 2021-10-09 07:23:46 +02:00
Alexandre Dulaunoy a5b0f8b87b
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-10-09 07:20:10 +02:00
Alexandre Dulaunoy 932a3ec28b
fix: [misp-stix] updated to the latest version (incorrect submodule) 
Fix #7812
 2021-10-09 07:17:32 +02:00
Jeroen Pinoy ea5c81cde9
fix: [community-metadata] Fix typos and improve wording 2021-10-09 00:30:10 +02:00
MrBoba b496161f5b fix: [internal] withCredentials property was added into $.ajaxSetup() to get rid of 403 and 302 responses 2021-10-08 17:14:02 +00:00
chrisr3d 71837d2f1b
chg: [stix2 export] Using a specific filter to specify the STIX version 
- `version` being too generic and used from another
  end point, we use `stix-version` in order to
  avoid confusion between the 2 filters
 2021-10-08 17:17:46 +02:00
Jakub Onderka e756708342
Merge pull request #7816 from JakubOnderka/update-misp-stix 
chg: [misp-stix] Update
 2021-10-08 16:54:51 +02:00
Jakub Onderka 21b1bda0ad
Merge pull request #7638 from JakubOnderka/add-event-error 
fix: [API] Return correct error message if event is blocklisted
 2021-10-08 16:37:51 +02:00
Jakub Onderka e241985b37 chg: [misp-stix] Update 2021-10-08 16:35:57 +02:00
Jakub Onderka 65b17aa701
Merge pull request #7710 from JakubOnderka/filename-pattern 
fix: [attribute] Use `filename-pattern`
 2021-10-08 16:26:09 +02:00
Jakub Onderka 622c56fc20
Merge pull request #7814 from JakubOnderka/server-save-setting 
fix: [internal] Server save setting file
 2021-10-08 15:46:12 +02:00
Jakub Onderka 96d2199726 fix: [internal] Server save setting file 2021-10-08 15:28:31 +02:00
chrisr3d ab3ed64de1 Merge branch 'develop' of https://github.com/MISP/MISP into misp-stix 2021-10-08 14:08:17 +02:00
chrisr3d 0d7374d8d2 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-08 12:25:48 +02:00
chrisr3d aaf6213fae
fix: [misp-stix] Bumped latest version 2021-10-08 12:24:38 +02:00
Luciano Righetti 4df55d99c8 fix: sharing groups dropdown not showing when adding a feed with distribution set to sharing group. 2021-10-08 10:33:23 +02:00
iglocska 20c453d970
Merge branch 'misp-stix' into develop 2021-10-07 16:35:44 +02:00
chrisr3d 30cc4d268f Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-07 16:08:59 +02:00
chrisr3d a0ce904f37
fix: [stix2 import] Using path to import the stix2 python library 2021-10-07 16:05:24 +02:00
chrisr3d bb2cce5213
fix: [stix1 export] Added the required stix python library path for their import 
- Support of the coming changes to use paths instead
  of maintaining the pip updates
 2021-10-07 15:51:45 +02:00
chrisr3d 9c95c50ae4
fix: [stix1 import] Quick fix due to some recent changes library changes and the support of STIX 1.2 2021-10-07 15:50:27 +02:00
Alexandre Dulaunoy 8b36067fa5
chg: [misp-object] updated 2021-10-07 15:01:10 +02:00
chrisr3d 115134b10c
chg: [misp-stix] Bumped latest version including recent PR merged 2021-10-07 14:38:18 +02:00
chrisr3d ecafed5d19
chg: [stix] Bumped latest version of `misp-stix` $ `cti-python-stix2` python libraries 2021-10-07 14:22:07 +02:00
chrisr3d 53ad91cc70
fix: [stix export] Aligning path of the STIX2 python library to following its recent location change 2021-10-07 14:00:01 +02:00
Jakub Onderka df86ab3daa
Merge pull request #7808 from JakubOnderka/tag-add 
chg: [internal] Faster adding tags to attributes
 2021-10-07 12:22:26 +02:00
Jakub Onderka c55cfbb185
Merge pull request #7809 from JakubOnderka/audit-log-fix 
fix: [log] Do not call callbacks when deleting
 2021-10-07 12:21:41 +02:00
chrisr3d 3873244f70
chg: [stix2 export] Moved the stix2 python library with its stix1 friends in the `scripts` dir 2021-10-07 12:02:49 +02:00
Jakub Onderka 13f1ce0d64 fix: [log] Do not call callbacks when deleting 2021-10-07 11:49:53 +02:00
chrisr3d 3a1fbf7023
fix: [stix export] Added all the needed paths to load the required python libraries 2021-10-07 11:47:43 +02:00
chrisr3d 9a86b2c35a
add: [stix export] Submoduled all the required python libraries 2021-10-07 11:46:19 +02:00
Jakub Onderka 4e02f421c8 chg: [internal] Generate correlations just once 2021-10-07 09:31:19 +02:00
chrisr3d 7adf9b8094
fix: [misp-stix] Bumped latest version with a quick fix on email objects export as STIX 2.0 & 2.1 2021-10-07 01:55:52 +02:00
Jakub Onderka 8bee6de811 chg: [internal] Faster adding tags to attributes 2021-10-06 18:28:46 +02:00
chrisr3d a945f09401 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-06 17:54:55 +02:00
chrisr3d dd34016fdf
chg: [misp-stix] Bumped the latest version including some fixes and updates 2021-10-06 17:53:49 +02:00
iglocska 773713e949
fix: [users] adding/modifying users fails silently for org admins if domain restriction checks fail 2021-10-06 15:54:52 +02:00
iglocska 10412eecc9
fix: [organisations] correctly handle a list of org domain restrictions 2021-10-06 15:52:31 +02:00
Sami Mokaddem 3822521d2c
chg: [users:routeafterlogin] Allow forcing the pre-login URL to be HTTPS 
This can be achieved by turning the setting MISP.forceHTTPSforPreLoginRequestedURL to true.
 2021-10-06 11:39:23 +02:00
Sami Mokaddem 4091849888
Merge branch 'feature-force-https-for-pre-login-request' into develop 2021-10-06 09:09:36 +02:00
Sami Mokaddem ec4074f925
chg: [users:routeafterlogin] Allow forcing the pre-login URL to be HTTPS 
This can be achieved by turning the setting MISP.forceHTTPSforPreLoginRequestedURL to true.
 2021-10-06 09:09:06 +02:00
Jakub Onderka 10f505c09d chg: [internal] Use hasAny 2021-10-05 20:33:53 +02:00
Jakub Onderka b3591f2d72 chg: [internal] Faster event tag attaching 2021-10-05 20:24:02 +02:00
Jakub Onderka 923f2501d3 fix: [internal] Bad merge 2021-10-05 19:41:57 +02:00
Sami Mokaddem 9a6d0b2b96
Merge remote-tracking branch 'origin/2.4' into develop 2021-10-05 16:15:44 +02:00
Alexandre Dulaunoy 11b6a2fbe7
chg: [misp-warninglists] updated 2021-10-05 15:44:54 +02:00
Alexandre Dulaunoy 3187b4c3e8
chg: [misp-galaxy] updated 2021-10-05 15:44:17 +02:00
Alexandre Dulaunoy 741e990e57
chg: [misp-objects] updated 2021-10-05 15:43:43 +02:00
chrisr3d 52f004937b
wip: [misp-stix] Bumped latest version 2021-10-04 16:54:18 +02:00
chrisr3d 9f4fe71a55 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-04 13:45:46 +02:00
Jakub Onderka 544c9ee8b9 new: [internal] Store MISP live status also in Redis 2021-10-04 10:07:32 +02:00
Jakub Onderka 3dd23605bc chg: [internal] Refactor FileAccessTool 2021-10-03 23:53:03 +02:00
Jakub Onderka 1a44c3885d new: [internal] OrgBlocklist::removeBlockedEvents 2021-09-30 21:18:25 +02:00
Jakub Onderka 45eefe8243 chg: [internal] Simplified EventsController::view code 2021-09-30 20:13:54 +02:00
Jakub Onderka c79db5cf0a
Merge pull request #7688 from JakubOnderka/server-sync-get-ids 
chg: [sync] Use server sync tool for fetching remote events index
 2021-09-30 19:46:26 +02:00
Alexandre Dulaunoy 4d94f4e25e
chg: [warning-lists] updated 2021-09-30 14:42:34 +02:00
Alexandre Dulaunoy 164435c475
chg : [warning-list] updated 2021-09-30 14:40:54 +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 687556df32 chg: [internal] Fetch just value for AdminSetting::getSetting method 2021-09-30 13:09:16 +02:00
Jakub Onderka ac4f042868 new: [internal] Method Job::createJob 2021-09-30 13:05:29 +02:00
Jakub Onderka d7005ea722
Merge pull request #7789 from JakubOnderka/stix-upload-error 
Stix upload error
 2021-09-29 18:14:01 +02:00
Jakub Onderka cdee859a06 fix: [internal] Better error handling when uploading STIX file 2021-09-29 15:53:10 +02:00
Jakub Onderka 812a424e69 chg: [internal] Faster Attribute search 2021-09-29 13:49:24 +02:00
Jakub Onderka b21f673872
Merge pull request #7778 from JakubOnderka/server-command-line 
chg: [internal] Server::command_line_functions is generated on demand
 2021-09-28 09:06:04 +02:00
Jakub Onderka 871ca92c48 new: Support for BECH32 (P2WPKH) BTC address 2021-09-28 01:25:58 +02:00
Jakub Onderka 325a3d356a chg: [internal] Server::command_line_functions is generated on demand 2021-09-27 23:16:34 +02:00
Jakub Onderka 4c75854d07 new: [CLI] UserShell::ip_user command 2021-09-27 15:01:53 +02:00
Jakub Onderka d20b6ce7c3 chg: [internal] Do not try to save config when config file is not writeable 2021-09-27 14:10:47 +02:00
Jakub Onderka 8ee60523b3
Merge pull request #7772 from JakubOnderka/update-cleanup 
chg: [internal] Cleanup AdminShell::{updateJSON,runUpdates}
 2021-09-27 13:16:40 +02:00
Jakub Onderka a989489ae6 chg: [internal] Optimise saving logs 2021-09-27 12:34:51 +02:00
Jakub Onderka fdf6f5ca9e chg: [internal] Cleanup AdminShell::{updateJSON,runUpdates} 2021-09-26 21:52:18 +02:00
Jakub Onderka 0e4bc7f349
Merge pull request #7771 from JakubOnderka/cli-redis-available 
new: [CLI] New tasks that will check if Redis is available
 2021-09-26 21:42:12 +02:00
Jakub Onderka 353a503384 new: [CLI] New tasks that will check if Redis is available 2021-09-26 21:41:02 +02:00
Jakub Onderka f43800e0fe chg: [internal] Cleanup unnecessary permissions 2021-09-26 13:59:11 +02:00
Jakub Onderka 624634751f chg: [internal] Simplify ACLComponent 2021-09-26 13:47:49 +02:00
Jakub Onderka 1262b6124c chg: [internal] AppController code cleanup 2021-09-26 13:21:55 +02:00
Jakub Onderka 861fdffada chg: [internal] Move methods to specific controllers 2021-09-26 12:23:23 +02:00
Jakub Onderka aeffc1b204 fix: [internal] Undefined offset in AppController 2021-09-26 11:39:50 +02:00
Luciano Righetti 19af2d8d82 fix: incorrect check for alertemail and publishSightings event commands 2021-09-24 16:04:10 +02:00
Alexandre Dulaunoy 59abf3142d
chg: [misp-objects] updated to the latest version 2021-09-24 15:38:58 +02:00
Alexandre Dulaunoy 120a9e7143
chg: [misp-objects] updated 2021-09-24 15:38:28 +02:00
Luciano Righetti e3d0769f12 fix: incorrect check for publish event command 2021-09-24 14:08:31 +02:00