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

14988 Commits (9edd7a6bb9215e58579a1b89fdad75e6012fb41f)

Author SHA1 Message Date
iglocska c6ccda3cc6
Merge branch '2.4' into develop 2021-03-09 17:59:15 +01:00
iglocska 2ad90bc2aa
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-09 17:58:56 +01:00
iglocska 644d84f4df
fix: [UI] indextable link generation on empty result set 
- empty string instead of notice barfed back
 2021-03-09 17:58:24 +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 fc3924c8e8 new: [freetext] Faster freetext parsing with more tests 2021-03-09 16:58:12 +01:00
mokaddem 2d058b6dc1
chg: bumped queryversion 2021-03-09 10:53:24 +01:00
mokaddem f95babb980
Merge branch 'develop' of github.com:MISP/MISP into eventgraph-node-coloring 2021-03-09 10:49:22 +01:00
mokaddem 3b4f61c884
chg: [eventGraph] Improved object coloring strategy 2021-03-09 10:48:06 +01:00
Jakub Onderka 126fe6fae5
Merge pull request #7170 from JakubOnderka/find-list-optim 
chg: [optimisation] Faster Model::_findList method
 2021-03-09 08:17:48 +01:00
Jakub Onderka e46745c0b9
Merge pull request #7174 from JakubOnderka/event-locks-faster 
chg: [internal] Faster event locks with Redis
 2021-03-09 08:17:30 +01:00
Jakub Onderka 306782afac chg: [internal] Faster event locks with Redis 2021-03-08 18:07:36 +01:00
Jeroen Pinoy b81f348581
chg: [restClient:querybuilder] add events and attributes addTag and removeTag actions. 2021-03-08 14:38:56 +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
Alexandre Dulaunoy c7ad46d619
Merge pull request #7159 from Wachizungu/fix-removetag-querybuilder-template 
chg: [restClient:querybuilder] fix remove tag from object template
 2021-03-08 08:58:04 +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
Jeroen Pinoy d7e535a302
chg: [restClient:querybuilder] add events and attributes addTag and removeTag actions. 2021-03-07 16:09:49 +00:00
Jeroen Pinoy 0c102a112c
chg: [attributes] fix attribute addtag by name conditions for find not set 2021-03-07 16:14:10 +01:00
Jeroen Pinoy 9c19392f02
chg: [attributes] fix attribute addtag by name conditions for find not set 2021-03-07 13:04:39 +00:00
Jeroen Pinoy c43cf356a3
chg: [attributes] fix copypasta error leading to internal server error on addtag with tag name 2021-03-07 11:35:33 +01:00
Jeroen Pinoy 8913fe15cc
chg: [attributes] fix copypasta error leading to internal server error on addtag with tag name 2021-03-07 11:35:09 +01:00
Jakub Onderka e19850218a chg: [optimisation] Faster Model::_findList method 2021-03-07 11:12:03 +01:00
Jeroen Pinoy 5dcaa53e88
chg: [attributes] fix copypasta error leading to internal server error on addtag with tag name 2021-03-07 00:14:42 +00: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 3f12e95571 new: [test] Alert email generating 2021-03-06 12:03:53 +01:00
Jakub Onderka 22e097ef30
Merge pull request #7161 from JakubOnderka/sighting-different-query 
chg: [internal] Fetch attribute UUIDs for sightings in different query
 2021-03-06 11:16:32 +01:00
Jakub Onderka 8b2d1bdffd chg: [internal] Fetch attribute UUIDs for sightings in different query 2021-03-06 10:56:46 +01:00
Jakub Onderka a436f56066
Merge pull request #7133 from JakubOnderka/pivot-fix 
fix: [internal] PHP warnings when pivoting
 2021-03-06 10:44:50 +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 634810d856 fix: [email] Correctly check if user has PGP or S/MIME key 2021-03-06 10:39:16 +01:00
Jakub Onderka f140de17f2 fix: [email] Correct Content-Type header for alternative content 2021-03-06 10:39:16 +01:00
Jakub Onderka 29040c4f1c new: [email] New setting `MISP.event_alert_metadata_only` 2021-03-06 10:39:16 +01:00
Jakub Onderka 9f81f0fb65 fix: [email] Correctly set domain for email message ID 2021-03-06 10:39:16 +01:00
Jakub Onderka d523025b6d new: [email] Command for testing generated alert email 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 9b9c69bfad new: [email] Allow to set email subject from template 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 79e78b817f new: [mail] Backend support for sending HTML emails 2021-03-06 10:39:15 +01:00
Jakub Onderka b097e968a0
Merge pull request #7166 from JakubOnderka/css-nice 
CSS nice
 2021-03-06 10:20:31 +01:00
Jakub Onderka 5d017e8130
Merge pull request #7167 from JakubOnderka/keyboard-shortucts 
Keyboard shortcuts
 2021-03-06 10:20:01 +01:00
Jakub Onderka 42f74e7175 new: [shortcuts] Show help when pressing ? key 2021-03-05 20:04:23 +01:00
Jakub Onderka d52db98621 chg: [UI] It is 2021! Removed -moz and -webkit specific CSS properties 2021-03-05 18:55:31 +01:00
Jakub Onderka 9e50fe8617 chg: [UI] Make some parts of MISP nicer 2021-03-05 18:54:50 +01:00
iglocska a33213ef05
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-05 16:17:13 +01:00
iglocska 0b408a131d
Merge branch '2.4' into develop 2021-03-05 16:17:00 +01:00
iglocska 91b82178a5
fix: [SG] allow saving sharing groups with empty releasabiltiy tags, fixes #7165 2021-03-05 16:16:27 +01:00
Jakub Onderka 349e2f2161
Merge pull request #7162 from JakubOnderka/empty-object-sync 
fix: [sync] Warning when sync object without attributes
 2021-03-05 13:28:56 +01:00
iglocska 1156440b47
Merge branch '2.4' into develop 2021-03-05 12:22:16 +01:00
iglocska 4a4722a30c
chg: [security audit] removed sharing group recommendation and fixed grammar 
- the hide sharing group org setting is actively harmful, we should definitely not promote it
 2021-03-05 12:20:39 +01:00
iglocska fe1034b461
fix: [Freetext import] handle end of sentence periods and brackets better, fixes #7163 2021-03-05 11:57:00 +01:00
Jakub Onderka cc9b50fb8e fix: [sync] Warning when sync object without attributes 2021-03-05 10:13:16 +01:00
Jakub Onderka 941981813a
Merge pull request #7160 from JakubOnderka/fix-diagnotics 
fix: [UI] Module diagnostics view
 2021-03-05 08:16:46 +01:00
iglocska 128587350d
fix: [UI] event matrix heatmap view correctly flattens the event 
- object attributes were excluded
 2021-03-05 01:02:00 +01:00
iglocska 6c89e0219c
fix: [UI] event matrix heatmap view correctly flattens the event 
- object attributes were excluded
 2021-03-05 01:00:41 +01:00
iglocska 29518586c5
fix: [UI] fix broken checkbox layout in generic Form builder forms 2021-03-05 00:34:31 +01:00
Jakub Onderka 5d2ae28a58 fix: [UI] Module diagnostics view 2021-03-04 21:33:33 +01:00
Jeroen Pinoy a43a62577a
chg: [restClient:querybuilder] fix remove tag from object template 2021-03-04 20:10:14 +00: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
Jakub Onderka 27e58bbb2d chg: [sync] Do not decode body if is empty 2021-03-04 18:30:28 +01:00
Jakub Onderka 2e7bd05b94 fix: [UI] Add attribute checkboxes 2021-03-04 16:47:17 +01:00
Jakub Onderka 65fb06fccf chg: [UI] Nicer pivots 2021-03-04 16:38:07 +01:00
Jakub Onderka 37f1e1c498 fix: [UI] Diagnostics box 2021-03-04 13:05:49 +01:00
Jakub Onderka 6ed50c3812 fix: [UI] Remove warning about old PHP a Python 2021-03-04 12:56:58 +01:00
Jakub Onderka 1b50258d04 fix: [diagnostics] Typo in security audit message 2021-03-04 12:56:39 +01:00
Jakub Onderka 74c38f1d34 chg: [diagnostics] Show Redis memory fragmentation 2021-03-04 12:56:17 +01:00
Jakub Onderka 6a5716b69b
Merge pull request #7150 from JakubOnderka/force-https 
new: [internal] Security setting force_https
 2021-03-04 10:44:33 +01:00
Jakub Onderka e77d9fcd49 fix: [internal] PHP warnings when pivoting 2021-03-04 10:17:57 +01:00
iglocska d4989dbd85
Merge branch '2.4' into develop 2021-03-03 21:31:07 +01:00
Jakub Onderka 2c20da190f
Merge pull request #7149 from JakubOnderka/csp-setting 
chg: [csp] Add Security.csp_enforce to server setting
 2021-03-03 20:24:32 +01:00
Jakub Onderka 96e349f47f chg: [csp] Add Security.csp_enforce to server setting 2021-03-03 20:24:12 +01:00
Jakub Onderka 2a8ba9020f new: [internal] Security setting force_https 2021-03-03 20:07:07 +01:00
Jakub Onderka 440eb2372c fix: [csp] Incorrect variable name 2021-03-03 18:28:18 +01:00
iglocska e394cfbe66
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-03 17:24:36 +01:00
Jakub Onderka 7695b52f0f chg: [csp] Report only by default 2021-03-03 17:19:07 +01:00
Jakub Onderka eb75b5c395 fix: [csp] Custom policies 2021-03-03 15:22:37 +01:00
Jakub Onderka 6487a079d6
Merge pull request #7138 from JakubOnderka/oidc-role-fix 
fix: [OIDC] Change algo how roles are assigned to users
 2021-03-03 13:58:47 +01:00
Jakub Onderka 2e4c01035d
Merge pull request #7086 from JakubOnderka/save-progress 
chg: [internal] When caching feed, save progress to db less often
 2021-03-03 13:39:23 +01:00
Jakub Onderka 6a553d39da fix: [OIDC] Change algo how roles are assigned to users 2021-03-03 13:37:08 +01:00
Raphaël Vinot 9f18cec0ca chg: [PyMISP] Bump version 2021-03-03 13:02:37 +01:00
Raphaël Vinot 9923e30c84 chg: [PyMISP] Bump version 2021-03-03 10:41:50 +01:00
Jakub Onderka 94bba9baca
Merge pull request #7104 from JakubOnderka/authkeys-allowed-ips 
new: [authkeys] Allowed IPs
 2021-03-03 10:05:16 +01:00
Jakub Onderka a646f03aae
Merge pull request #7111 from JakubOnderka/cookie-name 
chg: [internal] Set cookie name just when no name is set
 2021-03-03 09:25:09 +01:00
Jakub Onderka ab84aecc48 new: [authkeys] Copy key info when resetting key 2021-03-03 09:23:07 +01:00
Jakub Onderka 599819f7f9 new: [authkeys] Allowed IPs 2021-03-03 09:23:07 +01:00
Jakub Onderka 8c316b7245
Merge pull request #7060 from JakubOnderka/galaxy-cluster-tag-name-ci 
chg: [schema] Convert GalaxyCluster tag name to case insensitive
 2021-03-03 09:07:05 +01:00
Jakub Onderka 956a45c34b
Merge pull request #7112 from JakubOnderka/galaxy-cluster-md 
new: [UI] Render galaxy cluster description as markdown
 2021-03-03 08:19:54 +01:00
Jakub Onderka e3b2a0a40c chg: [schema] Add index for EventReport.event_id 2021-03-03 08:17:18 +01:00
Jakub Onderka 874ec66c9b chg: [schema] Convert GalaxyCluster tag name to case insensitive 2021-03-03 08:17:16 +01:00
Jakub Onderka cae7bef656
Merge pull request #7127 from JakubOnderka/server-setting-cleanup 
chg: [internal] Cleanup code that is resposible for fetching setting
 2021-03-03 08:10:33 +01:00
Jakub Onderka 26a286f4da
Merge pull request #7117 from JakubOnderka/keyboard-shortcuts 
chg: [UI] Simplify keyboard-shortcuts.js
 2021-03-03 08:09:58 +01:00
Jakub Onderka 4d5c7f7e03
Merge pull request #7116 from JakubOnderka/page-visibility-api 
chg: [UI] Use Page Visibility API
 2021-03-03 08:09:35 +01:00
Jakub Onderka f42c15480a
Merge pull request #7125 from JakubOnderka/fix-undefined-index 
fix: [internal] Undefined index when importing from module
 2021-03-03 08:09:19 +01:00
Jakub Onderka 273c81492a
Merge pull request #7113 from JakubOnderka/optimise-loading-clusters 
chg: [optimise] Faster loading galaxy cluster index
 2021-03-03 08:08:50 +01:00
Alexandre Dulaunoy 2e4ff38377
chg: [misp-objects] updated to the latest version 2021-03-03 07:45:06 +01:00
iglocska e7f6c10256
Merge branch '2.4' into develop 2021-03-03 01:26:18 +01:00
iglocska 01a67a2b8c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-03 01:26:07 +01:00
iglocska 78a48ddc87
new: [server shell] list servers, fixes #7115 
- simple human readable listing
- kept the old weird JSON producing listServers intact
 2021-03-03 00:30:35 +01:00
iglocska 7f9afb84e7
fix: [Sharing groups] capturing a sharing group correctly ignores the incoming data's active flag when editing 
- based on PR #7101 by @lfortemps
 2021-03-03 00:19:46 +01:00
Andras Iklody 2fee084250
Merge pull request #6661 from cudeso/2.4 
Azure Active Directory Authentication
 2021-03-03 00:14:30 +01:00
Andras Iklody 3904f7f85e
Merge pull request #7100 from lfortemps/local-tags-fix 
Prevent pulling local tags
 2021-03-03 00:08:00 +01:00
iglocska bf1621c650
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-03 00:07:08 +01:00
iglocska b08befbf26
Merge branch '2.4' into develop 2021-03-03 00:07:02 +01:00
iglocska ef261ecd47
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-03 00:06:52 +01:00
Andras Iklody 18346e078d
Merge pull request #7059 from adammchugh/patch-1 
Inclusion of full-name under person
 2021-03-03 00:04:54 +01:00
Andras Iklody d519374f7d
Merge pull request #7130 from Wachizungu/fix-shortcut-manager-triangle-popup 
chg: [UI] fix keyboard shortcut manager popup triangle
 2021-03-02 23:59:30 +01:00
Andras Iklody e45949dd0b
Merge pull request #7114 from Wachizungu/add-short-event-block-rule-explanation 
chg: [UI] Add small description of what event block rules do
 2021-03-02 23:53:22 +01:00
Andras Iklody 9cef95f756
Merge pull request #6736 from JakubOnderka/sighting-deletion 
chg: [sighting] Simplified sighting deletion
 2021-03-02 23:50:03 +01:00
Andras Iklody 53642be804
Merge pull request #7080 from StefanKelm/2.4 
Update resolved_misp_format.ctp
 2021-03-02 23:47:59 +01:00
Andras Iklody ef21065e33
Merge pull request #7092 from lfortemps/patch-2 
fix: [email_otp] Trim value for increased UX
 2021-03-02 23:46:23 +01:00
iglocska f83fc6ca24
fix: [sharing groups] fixed regression with updating local sharing groups 2021-03-02 23:42:54 +01:00
Jeroen Pinoy 7431beefa1
chg: [UI] fix keyboard shortcut manager popup triangle 2021-03-02 22:03:05 +00:00
Jakub Onderka c8533ead78 chg: [internal] Cleanup code that is resposible for fetching server setting 2021-03-02 18:04:49 +01:00
Jakub Onderka 62537961f0 fix: [internal] Undefined index when importing from module 2021-03-02 14:44:41 +01:00
iglocska 66e371a19c
fix: [comments] updated for two recent changes in the code 2021-03-02 13:03:54 +01:00
Jakub Onderka 4bcf270233 chg: [UI] Simplify keyboard-shortcuts.js 2021-03-02 11:36:23 +01:00
Jakub Onderka 55d695bd10 chg: [UI] Use Page Visibility API 2021-03-02 10:04:49 +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 ca13fee271
fix: [security] sharing group all org flag too lax 
- the all org flag was used as a trigger to make the sharing group obejct itself viewable to all local organisations
- even if the all org flag was set for an instance other than the local one

- as reported by Jeroen Pinoy
 2021-03-01 23:47:01 +01:00
iglocska 11c89e5c0a
fix: [tag index] remove sorting on count fields 
- doesn't work anyway
 2021-03-01 23:41:33 +01:00
iglocska b07d76070c
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 23:33:55 +01:00
iglocska 7bb9466e9c
Merge branch '2.4' into develop 2021-03-01 23:33:42 +01:00
iglocska 498d6215e3
chg: [genericForm] added description field to the explanation 2021-03-01 23:33:04 +01:00
iglocska 1727a748eb
fix: [pull] invalid internal vs external server lookup when deciding whether to pull local tags 2021-03-01 23:32:25 +01:00
iglocska ce88fd3ac2
fix: [sharing group] saving fixed 
invalid boolean operator when encoding the local org
 2021-03-01 23:31:53 +01:00
Jeroen Pinoy 6654eff47e
chg: [UI] Add small description of what event block rules do 2021-03-01 22:03:20 +00:00
Jakub Onderka 6f74097c37 chg: [optimise] Faster loading galaxy cluster index 2021-03-01 22:46:35 +01:00
Jakub Onderka ce98ce48ac chg: [UI] Do not show published for default galaxy clusters 2021-03-01 19:48:54 +01:00
Jakub Onderka 99ca948555 new: [UI] Render galaxy cluster description as markdown 2021-03-01 19:37:32 +01:00
Jakub Onderka 98ec79db60 chg: [internal] Set cookie name just when no name is set 2021-03-01 17:22:39 +01:00
mokaddem 9fa273ed1f
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 15:59:13 +01:00
mokaddem 6a646edf01
fix: [galaxyCluster] Revoke relations on sync 
- Relationships are now re-build from scratch for the cluster being sync
- This cancels any modification done locally (which should not have
happened in the first place)
 2021-03-01 15:57:17 +01:00
mokaddem 2e817c8ed8
fix: [galaxyClusterRelations] Bump cluster's timestamp after performing CRUD on relations 2021-03-01 15:56:58 +01:00
iglocska 76f588e039
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 11:43:28 +01:00
iglocska ccdbdd1606
Merge branch '2.4' into develop 2021-03-01 11:39:29 +01:00
iglocska d24e2a085a
fix: [Sharing group] refactored and fixed 
- include own org in pulled sharing groups (to avoid implicit inclusion not being visible after a pull)
- refactor the pulling method to be more maintainable
- avoid pulling proposals/sightings on each event cherry pick
 2021-03-01 11:38:05 +01:00
Jakub Onderka af4e248690
Merge pull request #7094 from JakubOnderka/oidc-readme 
new: [oidc] Readme
 2021-03-01 08:59:11 +01:00
Jakub Onderka 37dd3038b1 new: [oidc] Readme 2021-03-01 08:58:45 +01:00
Alexandre Dulaunoy 9df5d31294
Merge pull request #7106 from Wachizungu/add-short-org-blocklist-explanation 
chg: [UI] Add small description of what org blocklist does. Fix #4363
 2021-02-27 20:26:24 +01:00
Jakub Onderka 1a732063a6
Merge pull request #7105 from JakubOnderka/oidc-roles 
chg: [oidc] Use first match as user role
 2021-02-27 20:09:22 +01:00
Jeroen Pinoy 8bcdd5b053 chg: [UI] correct edit org blocklist entries view 2021-02-27 18:36:46 +00:00
Jeroen Pinoy ec63f58d36 chg: Add small description of what org blocklist does. Fix #4363 2021-02-27 18:08:36 +00:00
Jakub Onderka 8cf1bbb9a9 chg: [oidc] Use first match as user role 2021-02-27 16:54:23 +01:00
Alexandre Dulaunoy eec55c3438
Merge branch '2.4' into develop 2021-02-27 10:26:38 +01:00
Alexandre Dulaunoy 19ef63f521
chg: [taxonomies] updated to the latest version 2021-02-27 10:24:40 +01:00
Jakub Onderka fd6f1bd398
Merge pull request #7095 from JakubOnderka/event-report-empty-objects 
fix: [internal] Empty object when getting event info for event report
 2021-02-26 14:37:39 +01:00
Jakub Onderka 8edfdc14e8
Merge pull request #7097 from JakubOnderka/csp 
new: [security] Content-Security-Policy support
 2021-02-26 14:33:35 +01:00
Jakub Onderka 8a3144f112 new: [security] Content-Security-Policy support 2021-02-26 13:21:00 +01:00