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

4146 Commits (791dc9deabd2d7fdfd7c371331eb557d14782372)

Author SHA1 Message Date
Andras Iklody 2c2bf5f847
Update Server.php 2020-10-01 15:35:35 +02:00
Andras Iklody 22167a1e59
chg: [cleanup] removed duplicate empty queue declaration 2020-10-01 15:34:50 +02:00
Alexandre Dulaunoy 1ffddca1b2
new: [attribute-type] filename-pattern to describe a filename base on a pattern 
Fix #403

There is no specific validation on the field. This allows us to have a clear
separation between filename and filename-pattern as many users were
using filename for regexp. This also helps the creation of object
template which requires a filename pattern.
 2020-10-01 15:04:13 +02:00
Andras Iklody f12f86b503
Merge pull request #6373 from RichieB2B/issue-6368 
Allow OS user to be set for upgrades
 2020-10-01 14:40:21 +02:00
Andras Iklody 09ff03d649
Merge pull request #6375 from RichieB2B/issue-6342 
Do not limit TLD to 5 characters
 2020-10-01 14:39:38 +02:00
Jakub Onderka b6033a36a6
Merge pull request #6374 from JakubOnderka/test-fix 
Test fix
 2020-10-01 14:25:31 +02:00
Richard van den Berg 502806ff50 fix: [server] Do not limit TLD to 5 characters. Fix #6342 2020-10-01 13:58:38 +02:00
Jakub Onderka 0d62475834 fix: [internal] Variable should be defined all the time 2020-10-01 13:54:55 +02:00
Jakub Onderka 1da6cd8cd4 fix: [proposal] No return when org is not defined 2020-10-01 13:53:35 +02:00
Richard van den Berg bb8981353b chg: [Shell] Add MISP.osuser for updates. Fix #6368 2020-10-01 13:47:51 +02:00
mokaddem fc9c77b917
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-10-01 13:40:06 +02:00
Andras Iklody 90dd9db25a
Merge pull request #6372 from RichieB2B/ncsc-nl/pullAll 
Document "cake Server pullAll"
 2020-10-01 12:51:59 +02:00
Richard van den Berg b9ff5fc7db fix: [doc] Document "cake Server pullAll" 2020-10-01 12:22:31 +02:00
Andras Iklody c4608a94eb
Merge pull request #6362 from imidoriya/2.4 
Fix date filter on to / from #6239
 2020-10-01 11:28:00 +02:00
mokaddem 4ef7442a9a
chg: [eventReport] Replace ID by UUID when referencing MISP Elements 2020-10-01 11:08:30 +02:00
mokaddem 02725982cc
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-10-01 10:38:28 +02:00
mokaddem c4bb8e2ecb
fix: [server:workerDiagostics] Default queue status to false 2020-10-01 09:46:17 +02:00
mokaddem 2fdcede6b6
chg: [appModel] Removed prio worker from the list of available workers 
to perform an update
 2020-10-01 09:28:02 +02:00
iglocska 065eba4c6b
Revert "fix: [tag] Show correct count of tag attributes and events" 
This reverts commit e644f4ea4c.
 2020-09-30 17:47:40 +02:00
iglocska 59d08f2e54
Revert "chg: [internal] Optimise fetching sightings for object" 
This reverts commit e442a394cd.
 2020-09-30 17:47:29 +02:00
iglocska 6d21f1696a
fix: [hacky] readded org field to shadow attributes - just blank it out for old instances where the update failed to remove it a few years ago 2020-09-30 09:54:00 +02:00
iglocska 14400a932d
fix: [sync] better logging of error messages and handle the user ID not being set by background processes 2020-09-30 09:43:12 +02:00
deku 22cbd98aa2 Filter Event Date - convert timestamp to datetime 
PyMisp sends the to / from as a timestamp.  MISP needs to convert a timestamp when comparing.
 2020-09-29 15:05:49 -04:00
iglocska 6b0252d7e4
new: [user agent] string changed for MISP -> MISP synchronisation 2020-09-29 14:56:19 +02:00
mokaddem 14178a1d8c
chg: [eventReport] Added support of all galaxy matrixes 2020-09-29 12:16:50 +02:00
mokaddem 7d09f4d231
chg: [eventReport] Added rearrange function 2020-09-29 10:35:46 +02:00
mokaddem 0448f52e13
fix: [eventReport] Deleted report can be restored by non-admin users 2020-09-29 10:35:00 +02:00
Jakub Onderka 95dfd75af7 chg: [correlations] Really limit number of correlations, not number of attributes 2020-09-28 19:52:19 +02:00
Jakub Onderka d1eec44d8d chg: [internal] Initialize Job class just once 2020-09-28 19:40:32 +02:00
Jakub Onderka 7f29b6b089 chg: [internal] Delete Redis key in pipeline 2020-09-28 18:33:56 +02:00
Jakub Onderka 552315555c chg: [feed] Faster feed list fetching 2020-09-28 17:19:25 +02:00
Jakub Onderka c87616e6ec fix: [correlations] Properly delete feeds caches 2020-09-28 17:00:00 +02:00
mokaddem 6aab30c871
chg: [appmodel] Make sure to trigger the event report db update 2020-09-28 15:53:12 +02:00
Jakub Onderka a11e27bedc chg: [correlations] Fetch just server of feed that has data in Redis 2020-09-28 15:49:54 +02:00
Jakub Onderka 0c5be866fc chg: [correlations] Refactor feed cached correlations 2020-09-28 15:02:08 +02:00
mokaddem 25a58578ba
fix: [decaying] 2-tag base_score ratio. Fix #6352 2020-09-28 10:30:02 +02:00
mokaddem d0c7c44a2f
fix: [attribute] Typo in regex. Fix #6354 2020-09-28 09:34:54 +02:00
rmkml 1f08e9a27a fix #6336 vhash 2020-09-27 13:45:23 +02:00
Jakub Onderka 03b5af1f78
Merge pull request #6344 from JakubOnderka/misp-file-import 
Misp file import error message
 2020-09-26 19:34:55 +02:00
Jakub Onderka 731aeaaf38 chg: [internal] Initialize Log model just once 2020-09-26 13:27:59 +02:00
Jakub Onderka 804525a20e chg: [internal] Move addMISPExportFile from controller to model 2020-09-26 13:02:19 +02:00
Jakub Onderka 77776d1ff6
Merge pull request #6338 from JakubOnderka/password-reset-absolute 
fix: [UI] Custom password reset link is absolute
 2020-09-23 17:58:16 +02:00
Jakub Onderka 21e00a996b fix: [internal] Fix tests for missing ACL 2020-09-23 17:28:01 +02:00
Jakub Onderka 2b59792215 fix: [internal] Typo in perm name 2020-09-22 18:13:28 +02:00
Jakub Onderka 5163c98111
Merge pull request #6330 from JakubOnderka/event-creator 
chg: [UI] Show event creator for users from event org
 2020-09-22 17:59:29 +02:00
Jakub Onderka ff83fd00a0 fix: [internal] Do not fetch more info than necessary 2020-09-22 17:10:59 +02:00
Jakub Onderka aa613d0369 chg: [UI] Show event creator for users within event org 2020-09-22 17:10:58 +02:00
Richard van den Berg 8cfc14c3e9 Remove extraneous spaces from E-mail subject 2020-09-22 12:51:35 +02:00
mokaddem 4408a17dff
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-09-22 10:15:22 +02:00
mokaddem 98eb9c3ceb
chg: [eventreport] Make sure the format is correct when capturing 2020-09-22 10:05:22 +02:00
mokaddem ffedb4cbbb
fix: [event] Delete event report when deleting event 2020-09-22 09:30:16 +02:00
iglocska 650f32144c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-09-22 09:15:27 +02:00
iglocska 8c07d01302
new: [workers] add kill all / force kill all buttons to the worker management, fixes #6329 2020-09-22 09:15:03 +02:00
mokaddem 3b15038ab5
chg: [eventReports] Improved returned data from controller 2020-09-22 08:31:14 +02:00
Jakub Onderka cb424fac50
Merge pull request #6090 from JakubOnderka/tlp-uppercase 
chg: [mail] Refactor email generating
 2020-09-21 13:51:52 +02:00
Jakub Onderka 77833be960 chg: [mail] Another code cleanup for alert and contact mails template 2020-09-21 13:17:00 +02:00
Jakub Onderka 28b6e73aa8 chg: [mail] Use same format for contact email as for alert 2020-09-21 13:17:00 +02:00
Jakub Onderka f1cf6191a0 chg: [mail] Add unsubscribe info also for non encrypted mails 2020-09-21 13:17:00 +02:00
Jakub Onderka d88cc19a21 chg: [mail] Simplified mail generation 2020-09-21 13:17:00 +02:00
Jakub Onderka 76b2a51253 fix: [ACL] Permissions when sending contact and alert emails 2020-09-21 13:17:00 +02:00
Jakub Onderka 1347940d4f chg: [mail] Cleanup mail sending code for event alerts 2020-09-21 13:16:58 +02:00
Jakub Onderka 05118ba2bc chg: [mail] TLP in subject should be uppercase 2020-09-21 13:14:56 +02:00
mokaddem 5893a303de
fix: [eventReport] changed beforeFilter signature to avoid notice 2020-09-21 11:49:41 +02:00
mokaddem b78b13d428
chg: [eventReport] Added comments 2020-09-21 11:48:05 +02:00
Jakub Onderka 73cc4b7044 fix: [internal] Conditions when object distribution is set to org only 2020-09-21 11:33:19 +02:00
mokaddem 064ec80913
chg: [eventReport] Moved event unpublishing to model 2020-09-21 11:14:43 +02:00
mokaddem ca45c76c7b
chg: [eventReport] Started refactoring model - WiP 2020-09-21 11:01:36 +02:00
mokaddem 473d8a9318
chg: [eventReports] Refactored indexes 2020-09-21 10:37:18 +02:00
Jakub Onderka 32acd3895d chg: [internal] Simplify objects conditions 2020-09-20 19:02:57 +02:00
Jakub Onderka 3d4142f836 fix: [internal] Fetching objects with attachments 2020-09-20 18:54:04 +02:00
Jakub Onderka 08e2a18b2c chg: [internal] Use cached sharing groups IDs when fetching objects 2020-09-20 18:43:07 +02:00
Jakub Onderka f52eee457a fix: [internal] Remove duplicate check for published event when fetch objects 2020-09-20 18:34:38 +02:00
Jakub Onderka 6a017f63fe fix: [internal] Remove duplicate conditions for object restSearch 2020-09-20 18:20:23 +02:00
Jakub Onderka 8f897af503 fix: [internal] Code style 2020-09-20 18:20:23 +02:00
Jakub Onderka 636fc74d8a fix: [internal] Invalid conditions for sharing group when fetching objects 2020-09-20 18:20:23 +02:00
Jakub Onderka fdc3830c55 fix: [internal] Bad merge 2020-09-20 18:13:14 +02:00
iglocska 8e01caca62
Merge branch '2.4' into event_recovery 2020-09-19 22:28:28 +02:00
iglocska b5ee50d251
Merge branch 'event_recovery' of github.com:MISP/MISP into event_recovery 2020-09-19 18:37:35 +02:00
iglocska 94c37871da
fix: [recovery] various fixes 
- to_ids fixed
- background processing made optional
- first/last seen format conversion altering the data's format for the recovery script fixed
- added capture of object first/last seen to the recovery script
 2020-09-19 18:35:15 +02:00
rmkml b33193c4d0 fix #6266 vhash & 2020-09-18 20:40:04 +02:00
mokaddem f56cab6e49
chg: [log] Convert shadowAtribute's fs/ls into understood format 2020-09-18 16:51:53 +02:00
mokaddem e0bf738b11
chg: [log] Convert object's fs/ls into understood format 2020-09-18 16:41:26 +02:00
mokaddem 18097f05db
fix: [log:event_recovery] Delete blocklist entry for recovered event 2020-09-18 15:50:26 +02:00
mokaddem 4eae503a80
fix: [objectReference] Do no reset timestamp to current time if already provided 2020-09-18 15:33:42 +02:00
mokaddem 1074458cf7
fix: [log] Convert attribute's fs/ls into understood format 2020-09-18 15:32:50 +02:00
mokaddem f231d08748
chg: [eventReports] Major refactoring - WiP 2020-09-18 14:19:59 +02:00
iglocska d7b93b46ab
Merge branch 'event_recovery' of github.com:MISP/MISP into event_recovery 2020-09-18 13:53:40 +02:00
iglocska c8b61175e8
new: [recovery] script added mock method among other changes 
- also added proposals
- add/accept/discard should be fully supported now
 2020-09-18 13:42:52 +02:00
Jakub Onderka 935437d1bc chg: [internal] Invalid message for UUID contains that UUID must be RFC 4122 compliant 2020-09-18 10:56:28 +02:00
mokaddem 6dd782329e
fix: [event] Use correct function name 2020-09-18 08:45:52 +02:00
mokaddem 0c6a5ce3c6
chg: [eventReport] Improved authorization error reporting 2020-09-18 08:41:32 +02:00
mokaddem 8dd31e884d
chg: [eventReports] Few UI improvements 2020-09-18 08:30:11 +02:00
mokaddem 3f7ef16c14
chg: [server] Allow to sync events if they only have event report 2020-09-17 16:13:16 +02:00
mokaddem 17058aa1d0
chg: [server] Added distribution downgrade for event report sync 2020-09-17 16:12:44 +02:00
mokaddem a247bd3500 fix: [server] Downgrade distribution of objects when pulling 2020-09-17 15:53:10 +02:00
mokaddem aba72c2a56
chg: [eventReport] Generic improvements and light integration with 
fetchEvent and sync support
 2020-09-17 15:06:55 +02:00
mokaddem 7089dda800
chg: [eventReports] Improved default index and prevent edition if 
deleted
 2020-09-17 10:43:58 +02:00
mokaddem cc67009d2c
chg: [eventReport] Improved deletion/restoration via the API 2020-09-17 10:08:10 +02:00
mokaddem c888403289
chg: [eventReport:edit] Allow to edit individual fields and better error 
reporting
 2020-09-17 09:55:13 +02:00
mokaddem ca61d45441
chg: [event] Forced usage of worker for event recovery 2020-09-16 10:33:05 +02:00
iglocska 64a0cff5c9
Merge branch '2.4' into event_recovery 2020-09-15 23:56:00 +02:00
iglocska 19d52f312a
new: [recovery] added event deletion recovery tool 2020-09-15 23:54:59 +02:00
iglocska d61a4e2f87
new: [internal] added helper function to get tag id based on cluster id 2020-09-15 23:52:52 +02:00
iglocska b3c66d5610
fix: [validation] make publish_timestamp on the event object more resilient to malformed empty values 2020-09-15 23:52:14 +02:00
mokaddem afd3794985
chg: [eventReport] Improved UI and added support of soft/hard deletion 2020-09-15 17:12:49 +02:00
mokaddem 8e6b5ecb44
chg: [appmodel] New entry to create an upper bound for the unwanted 
action through login

This will be used by recovery scripts
 2020-09-15 12:00:26 +02:00
mokaddem e8d9ae3240
chg: [eventReport] Started rework on CRUD operations - WiP 2020-09-15 10:12:58 +02:00
Andras Iklody 899490969c
Merge pull request #6310 from RichieB2B/ncsc-nl/selective-push 
Only push events/sightings when selected for server
 2020-09-11 20:46:51 +02:00
Richard van den Berg 284f32ba6a fix: [Server] only push events/sightings when selected 2020-09-11 18:08:57 +02:00
Richard van den Berg 7151990383 chg: [sightings] anonymise pushed sightings using new Sightings_anonymise_as setting 2020-09-11 17:23:29 +02:00
mokaddem c5944ea485
chg: [eventReport] Centralized elements proxy for markdownViewer 2020-09-10 11:26:23 +02:00
Jakub Onderka c7984cebdc
Merge pull request #6286 from JakubOnderka/push-error-handling 
chg: [internal] Better error handling when pushing event to remote se…
 2020-09-09 23:25:41 +02:00
Jakub Onderka 69955d2fc6
Merge pull request #6272 from JakubOnderka/uuid-validation 
Experimental: UUID validation
 2020-09-08 21:17:53 +02:00
iglocska b6c871309b
fix: [validation] relaxed first/last/middle name validation 2020-09-08 15:53:04 +02:00
iglocska 14ca7ddf49
fix: [internal] fix to various CLI commands breaking on the IP field in the log table not having a default value, fixes #6263 2020-09-08 13:10:10 +02:00
Jakub Onderka 0e916bd364 chg: [internal] Ensure that UUID is always lowecase and real UUID 2020-09-08 10:47:28 +02:00
Jakub Onderka ebd55d0127 fix: [internal] Fetch related events for merged events just when necessary 2020-09-08 10:35:19 +02:00
Jakub Onderka e4a606708e
Merge pull request #6293 from JakubOnderka/event-blocklist-view-fix 
Event blocklist view fix
 2020-09-07 18:38:45 +02:00
Jakub Onderka 28fc46082b chg: [blocklist] Add comment for automatic event blocklist 2020-09-07 18:10:49 +02:00
Jakub Onderka 565f446f19 chg: [internal] Faster tag fetching for events 2020-09-07 17:07:12 +02:00
Jakub Onderka 7b47d49836 chg: [internal] Little optimise Event::getRelatedAttributes 2020-09-05 11:40:59 +02:00
Jakub Onderka e475b2bf7f chg: [internal] Optimise Event::getRelatedEvents for non correlated events 2020-09-05 11:40:59 +02:00
Jakub Onderka 3153b45539 chg: [internal] Optimise Event::__attachReferences method 2020-09-05 11:40:59 +02:00
Alexandre Dulaunoy 6f2b94f09a
chg: [attributes] to_ids for new email type 2020-09-04 16:32:23 +02:00
Alexandre Dulaunoy c8b7523063
chg: [attribute] pgp is not php ;-) 2020-09-04 15:56:56 +02:00
Jakub Onderka 94f2b5bbbb chg: [internal] Better error handling when pushing event to remote server 2020-09-04 15:43:52 +02:00
Jakub Onderka 6635471b87
Merge pull request #6259 from JakubOnderka/extended_view_deduplication 
Extended view deduplication
 2020-09-03 19:43:41 +02:00
iglocska 7e2b0ac087
new: [types] pgp-public-key/pgp-private-key added 2020-09-03 17:40:55 +02:00
mokaddem 32dde67374
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-09-03 13:38:41 +02:00
iglocska 92391ead44
chg: [type] email-src/email-dst descriptions redefined. Also added email to the person category 2020-09-03 12:15:06 +02:00
iglocska 6fe5732700
new: [internal] filter "type" added for the internal fetcher 
- appends email as a type if email-src/email-dst are found
 2020-09-03 12:03:59 +02:00
iglocska b14e5fbb0e
new: [types] email added as a new type, affects #6281 2020-09-03 12:03:21 +02:00
Jakub Onderka 24d2c37105
Merge pull request #6254 from JakubOnderka/unique_index_diagnostic 
new: [diagnostic] Check if database index is unique
 2020-09-02 18:56:46 +02:00
Jakub Onderka 2f6f97e36e
Merge pull request #6274 from JakubOnderka/acl_filter_attribute_values 
fix: [internal] Respect ACL for event attribute search
 2020-09-02 17:24:16 +02:00
Jakub Onderka 4d819452e4 fix: [internal] Respect ACL for event attribute search 2020-09-02 16:49:45 +02:00
Jakub Onderka 6f12dfc7df new: [diagnostic] Check if database index is unique 2020-09-02 10:13:03 +02:00
Jakub Onderka 713b228709
Merge pull request #6219 from JakubOnderka/event-small-optim 
Event small optim
 2020-09-01 20:03:22 +02:00
Jakub Onderka f3feb997bf chg: [internal] Deduplicate code for event conditions 2020-09-01 20:01:57 +02:00
Jakub Onderka 951c9f1033
Merge pull request #6271 from JakubOnderka/faster_quick_filter 
chg: [internal] Much faster quick filter
 2020-09-01 20:00:39 +02:00
Jakub Onderka a935d9fec4
Merge pull request #6265 from JakubOnderka/not-necessary-code-vol2 
Remove not necessary code vol2
 2020-09-01 19:59:12 +02:00
Jakub Onderka 8a3ba08402
Merge pull request #6268 from JakubOnderka/sightings-faster-fetcher 
chg: [internal] Use faster fetcher for viewing sightings
 2020-09-01 19:45:48 +02:00
Jakub Onderka edd90267f7 chg: [internal] Initialize Feed class just once 2020-09-01 19:40:38 +02:00
Jakub Onderka be11e36c11 chg: [internal] Much faster quick filter 2020-09-01 18:37:26 +02:00
Jakub Onderka e7f80fd51d chg: [internal] Use faster fetcher for viewing sightings 2020-09-01 17:06:23 +02:00
Andras Iklody bab68641aa
Merge pull request #6267 from Golbark/rename_bl 
Rename blacklist and whitelist to alternatives
 2020-09-01 16:36:37 +02:00
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 50a630197a chg: [internal] Unsetting SharingGroup is not necessary 2020-09-01 16:07:18 +02:00
Jakub Onderka 06ceece0e5 fixup! chg: [internal] Simplified putting attributes to objects 2020-09-01 14:12:30 +02:00
Jakub Onderka 43c2dc4d03 chg: [internal] Remove unused Event::getAccessibleEventIds 2020-09-01 13:58:06 +02:00
Jakub Onderka 6614671c8e chg: [internal] Remove duplicate event_creator_email fetching 2020-09-01 13:33:56 +02:00
Jakub Onderka 1b9f0c08f1 chg: [internal] Simplified putting attributes to objects 2020-09-01 13:33:21 +02:00
Jakub Onderka e11f6d0087
Merge pull request #6264 from JakubOnderka/not-necessary-code 
Remove not necessary code
 2020-09-01 12:20:27 +02:00
Jakub Onderka af82f54245 chg: [internal] Removed unused variables 2020-09-01 12:06:28 +02:00
Jakub Onderka 9595d69c07 chg: [internal] Event::__escapeCSVField is not used 2020-09-01 12:01:25 +02:00
Jakub Onderka 929784d887 chg: [internal] Event::generateRandomFileName just redefines AppModel method 2020-09-01 12:00:43 +02:00
Jakub Onderka 8043b52d83 chg: [internal] Validation issues are already checked by fetcher 2020-09-01 11:58:22 +02:00
Jakub Onderka 8121a63e75 chg: [internal] Warninglist::filterWarninglistAttributes takes just two arguments 2020-09-01 11:58:02 +02:00
Jakub Onderka 0d5d1d28d3
Merge pull request #6262 from JakubOnderka/deduplicate_related_tags 
chg: [event] Deduplicate attribute related tags
 2020-09-01 10:07:39 +02:00
Jakub Onderka d15cf00f12 chg: [event] Deduplicate attribute related tags 2020-09-01 09:20:18 +02:00
mokaddem 355861daa7
fix: [appmodel] Create indexes after the column has been added 2020-09-01 08:16:17 +02:00
Jakub Onderka 89d503cd65 chg: [event] Deduplicate related events for extended view 2020-08-31 15:32:27 +02:00
Jakub Onderka 076322230f chg: [event] Deduplicate tags for extended view 2020-08-31 15:29:28 +02:00
iglocska f82e10d1fb
new: [API] added count returnformat for the REST api, fixes #6233 
- simply counts the number of attributes/events found (on each respective scope)
 2020-08-31 12:32:28 +02:00
Jakub Onderka 8f806c4f1b
Merge pull request #6214 from JakubOnderka/otp-encryption 
fix: [otp] Allow to send encrypted OTP by mail
 2020-08-30 11:22:05 +02:00
chrisr3d 16095cb462 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2020-08-28 18:36:21 +02:00
chrisr3d a531e9c0b6
fix: [enrich event] Typo 2020-08-28 17:48:25 +02:00
iglocska 40c43462a0
fix: [internal] loading a missing proposal attachment leads to an exception 
- should be silently logged and notice error sent
 2020-08-28 16:48:16 +02:00
chrisr3d f020085168
fix: [enrich event] Avoid freetext results to end up lost in the interstellar space of orphaned attributes with no event_id 2020-08-27 19:09:50 +02:00
Andras Iklody d9605eebd5
Merge pull request #6203 from JakubOnderka/tag-count 
Show proper number of attributes and events for tags
 2020-08-26 13:05:01 +02:00
Loïc Fortemps 8844fd7ada
Event ID translation feature (#6212) 
* new: [sync] Event ID translation between sync servers
 2020-08-26 10:01:14 +02:00
James Droste 2ae7c7df30 Add the ability to customize the IP header field when logging 2020-08-25 16:29:34 -07:00
Jakub Onderka d3eb86553b chg: [internal] Less SQL queries for event index page 2020-08-24 16:27:27 +02:00
Jakub Onderka e55d49d3b8 chg: [internal] Remove unused code 2020-08-24 16:26:48 +02:00
rmkml 6da01364ba add SHA3 Hash on Attribut.php 2020-08-23 18:26:56 +02:00
Jakub Onderka 8f3abdad5a chg: [correlation] Fetch just necessary fields 2020-08-21 18:57:24 +02:00
Jakub Onderka 3005ef8f6e fix: [otp] Allow to send encrypted OTP by mail 2020-08-20 19:58:24 +02:00
Jakub Onderka e442a394cd chg: [internal] Optimise fetching sightings for object 2020-08-18 15:02:36 +02:00
Jakub Onderka e644f4ea4c fix: [tag] Show correct count of tag attributes and events 2020-08-18 10:57:33 +02:00
iglocska 5d8cab4e4a
Merge branch 'baseurl' into 2.4 2020-08-18 10:07:45 +02:00
iglocska 8fc66eda9f
new: [internal] cache tags instead of loading them over and over via the event fetcher, fixes #6201 
- should speed things up for exports of datasets that have a lot of recurring tags
- moved the caching of some internals to the appmodel level to make it more generic
 2020-08-18 09:52:48 +02:00
iglocska 0e898ce4f4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-08-18 09:26:56 +02:00
iglocska 24a5a9dc5e
chg: [internal] stub for a simple caching mechanism for recurring queries 2020-08-18 09:26:25 +02:00
Vito Piserchia 850034ecc0 recover from upstream version missing bits 2020-08-17 17:57:30 +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 7da8b32ada rebase continue 2020-08-17 17:25:02 +02:00
Andras Iklody eccc3f83e9
Merge pull request #6202 from rmkml/2.4 
add vhash (VirusTotal Hash) on Attribut.php
 2020-08-17 17:05:46 +02:00
rmkml a6eeb676c4 add vhash (VirusTotal Hash) on Attribut.php 2020-08-17 16:36:47 +02:00
Jakub Onderka 261b54e505 chg: [correlation] Use less memory when generating correlation 2020-08-17 10:54:01 +02:00
Jakub Onderka 5005991af2 chg: [internal] Break loop when match is found 2020-08-16 16:23:20 +02:00
Vito Piserchia b8c7485712 resolve merge 2020-08-16 13:31:31 +02:00
Jakub Onderka 778d39e175 fix: [attachment] Do not fetch attachment when accepting deletion proposal 2020-08-14 13:40:05 +02:00
Jakub Onderka cac497158e chg: [internal] Reuse AttachmentTool instance 2020-08-14 12:30:12 +02:00
Jakub Onderka ba74ddd689 fix: [UI] Showing image thumbnail 2020-08-13 15:34:32 +02:00
Jakub Onderka 83f5d3ada5 chg: [internal] Generate event date even if attachments doesn't exists 2020-08-13 15:34:32 +02:00
Jakub Onderka a411b36666 chg: [internal] Move attachment handling to one place 2020-08-13 15:34:32 +02:00
Jakub Onderka f157b879a3 fix: [test] Use two spaces to pass the test 2020-08-12 19:34:05 +02:00
Jakub Onderka bbeb2d2d2f fix: [internal] Throw exception if invalid event for contact method is provided 2020-08-12 19:34:03 +02:00
Jakub Onderka 8338659396 fix: [internal] Fix undefined index notices 2020-08-12 19:33:45 +02:00
Jakub Onderka 6ee505a207 chg: [mail] Initialize GPG just once 2020-08-12 19:33:15 +02:00
Jakub Onderka ee4de160e8 chg: [internal] Move GPG initialization to GpgTool 2020-08-12 19:33:15 +02:00
Jakub Onderka 6fc8e4d119 fix: [internal] SendEmail exceptions message and logging 2020-08-12 19:33:15 +02:00
Jakub Onderka 65a4ece3bb chg: [test] Set correct setting for GPG 2020-08-12 19:33:15 +02:00
Jakub Onderka c347ffc6db new: [internal] 'GnuPG.obscure_subject' option to not send unencrypted subject 2020-08-12 19:33:15 +02:00
Jakub Onderka d044df2cb4 chg: [internal] Refactor S/MIME certificate validation 2020-08-12 19:33:15 +02:00
Jakub Onderka 6d1757188a new: [internal] Log if e-mail was send encrypted or not 2020-08-12 19:33:15 +02:00
Jakub Onderka 652df56ba6 chg: [internal] Rework email sending 2020-08-12 19:33:15 +02:00
Jakub Onderka b37900ea75 fix: [internal] Throw exception when invalid event id provided for contact email 2020-08-12 18:32:12 +02:00
Jakub Onderka 54aa24a31e fix: [intrernal] Undefined index: Organisation notice 2020-08-12 18:32:12 +02:00
Jakub Onderka 7764dc2af9
Merge pull request #5948 from JakubOnderka/update-correlations 
chg: [internal] Update correlations in one query
 2020-08-11 16:10:27 +02:00
Jakub Onderka 31ea1d6eb3 chg: [CLI] Allow to fetch remove event by UUID 2020-08-10 15:47:06 +02:00
Jakub Onderka 8b10c94cfa chg: [internal] Refactor Server::getEventIdsFromServer 2020-08-10 15:47:06 +02:00
Jakub Onderka 421e94bc2f fix: [security] Check if user can access sharing group when uploading attachment 2020-08-06 11:52:53 +02:00
iglocska 72e108b44f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-08-06 10:39:25 +02:00
iglocska 9694deca21
fix: [zmg] failing to publish to the ZMQ channel when MISP.org is invalid fixed, fixes #6174 
- use the host org ID
- if it's not set (should never happen), just take the lowest ID org
 2020-08-06 10:38:17 +02:00
Jakub Onderka dd7d70ebf8 fix: [UI] Bad merge for mass edit form 2020-08-06 09:34:43 +02:00
Jakub Onderka e4b061c744 fix: [security] Respect ACL for freetext import 2020-08-05 17:37:05 +02:00
Jakub Onderka b6116098c0 fix: [security] Throw exception if invalid data provided 2020-08-05 12:39:11 +02:00
Jakub Onderka 03c78fedf7 fix: [ACL] Unpublished private for object do not apply for site admin 2020-08-05 12:39:11 +02:00
Jakub Onderka f0f826841e fix: [security] Sharing groups for objects respect permissions 2020-08-05 12:39:11 +02:00
mokaddem 1636d40a27
chg: [markdownViewer] Added syntax highlighing 2020-08-04 14:49:05 +02:00
Jakub Onderka 7a14e5d19b fix: [tags] Show just tags that user can really use 2020-08-04 12:34:39 +02:00
Jakub Onderka a5f1fe801c fix: [proposals] Respect unpublished private event when loading proposals 2020-08-04 12:23:41 +02:00
Jakub Onderka 8bb2d94c5e fix: [security] ACL check when loading ajax tags 2020-08-04 12:23:41 +02:00
Jakub Onderka 5611374829 fix: [security] ACL check when editing multiple event attributes 2020-08-04 12:23:38 +02:00
Jakub Onderka db626cf741 fix: [security] Respect ACL when event edit 2020-08-04 12:21:42 +02:00
mokaddem ce6269b54b
chg: [eventReport] Improved models and markdown editor 2020-08-04 11:45:54 +02:00
iglocska 5d8f32a955
fix: [API] org blacklist copy pasta preventing additions of entries fixed 2020-08-04 11:38:58 +02:00
mokaddem 8d6f2eab03
chg: [eventReport] Added markdown-it dependency and started integration 
- WiP
 2020-08-04 10:08:18 +02:00
iglocska 42896beaaf
chg: [api] fixed restresponse for blacklists 2020-08-03 16:34:01 +02:00
mokaddem dfaafd8054
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-08-03 14:38:06 +02:00
Jakub Onderka 2deb9d3c8b
Merge pull request #6156 from JakubOnderka/feed-httpsocket-optional 
fix: [feed] Make HttpSocket instance optional for local feeds
 2020-08-03 10:51:03 +02:00
mokaddem 9d50a9bf06
Merge branch '2.4' of github.com:MISP/MISP into fix-mass-edit-form-with-post 2020-07-31 09:47:17 +02:00
iglocska b5dffc2023
fix: [internal] older PHP still not happy with the return from a generator 2020-07-30 17:32:35 +02:00
iglocska dfc743aab2
fix: [internal] make ancient PHP versions happy 2020-07-30 17:24:19 +02:00
mokaddem 3d224cfdb8
Merge branch '2.4' of github.com:MISP/MISP into fix-mass-edit-form-with-post 2020-07-30 15:29:20 +02:00
iglocska 451df93c38
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-30 09:23:28 +02:00
iglocska a2c0010d48
fix: [unicode] Temporarily escape 4 byte characters until we move the attribute value fields to mb4, fixes #5123 
- fixes sync/feed issues related to 4 byte unicode characters
 2020-07-30 09:17:27 +02:00
Sami Mokaddem e6c863efae
Merge pull request #6154 from JakubOnderka/tags-fix 
chg: [internal] Initialize UserSetting just when needed
 2020-07-30 08:27:58 +02:00
mokaddem 8420663ae1
fix: [object:edit] Updating an object to a new template acutally save 
the template version
Fix #6083
 2020-07-29 15:46:20 +02:00
Jakub Onderka d9f21f75f5 chg: [feed] Better exception messages for invalid JSON 2020-07-28 18:33:05 +02:00
Jakub Onderka 6c411203c0 fix: [feed] Make HttpSocket instance optional for local feeds 2020-07-28 17:59:55 +02:00
Jakub Onderka bd1a2247e0 chg: [internal] Initialize UserSetting just when needed 2020-07-28 16:10:31 +02:00
Jakub Onderka dcd372bd93
Merge pull request #6150 from JakubOnderka/2.4 
fix: [pull] Check if url_params in pull filter is empty string
 2020-07-28 13:31:22 +02:00
Jakub Onderka d4c7374a03 fix: [pull] Check if url_params in pull filter is empty string 2020-07-28 13:10:25 +02:00
mokaddem 5e593240ce
fix: [attributes:massEditForm] Invalid conditions fixed and performances improvements 2020-07-28 10:58:05 +02:00
Jakub Onderka d7f7bc725b chg: [internal] Faster loading sighting 2020-07-28 09:50:28 +02:00
mokaddem f92467643b
chg: [objects:edit] Merge data is passed via cookies instead of the URI 2020-07-27 16:10:47 +02:00
mokaddem 8ee87fb754
chg: [attributes:massEditForm] Pass attributes ids to be edited via POST 
Fix #5500
 2020-07-27 12:10:53 +02:00
mokaddem e41ffb5c9e
Merge branch '2.4' of github.com:MISP/MISP into fix-update-tags-on-attribute-edit 2020-07-27 08:19:11 +02:00