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

14988 Commits (9edd7a6bb9215e58579a1b89fdad75e6012fb41f)

Author SHA1 Message Date
Jeroen Pinoy a0ead60b4d
chg: [statistics] fix typo in statistics_data view - monthly attributes styling check 2021-03-24 08:30:57 +01:00
Jeroen Pinoy c1f92662fe
chg: [statistics] fix typo in statistics_data view - monthly attributes styling check 2021-03-23 23:15:08 +00:00
Jeroen Pinoy a8e08a6892
chg: [ShibbAuth] Add login entry on logging in for audit 2021-03-23 13:32:58 +01:00
Alexandre Dulaunoy aa2fe120f6
Merge pull request #7231 from Wachizungu/add-login-log-shibbauth 
chg: [ShibbAuth] Add login entry on logging in for audit
 2021-03-23 13:32:06 +01:00
Eva Yang 002ba9d416
Add AadAuth module as saved settings 2021-03-22 15:25:47 -04:00
Jeroen Pinoy ebc9dcecc4
chg: [ShibbAuth] Add login entry on logging in for audit 2021-03-22 17:46:42 +00:00
iglocska d59c0ee292
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-22 10:19:40 +01:00
iglocska 3140b77be0
fix: [config.php] file permission after changes fixes #7229 
- will revert to the permissions before the save
- caused by the create -> rename cycle that backs up server settings on each change actually creating a new file instead of modifying it
 2021-03-22 10:19:14 +01:00
iglocska 02dc2a124d
fix: [sharing groups] uuid not logged when saving failed due to invalid variable lookup 2021-03-22 10:17:29 +01:00
iglocska f64f4b9efd
fix: [UI] signature allowedlist clarification 2021-03-22 10:16:54 +01:00
Jakub Onderka a4c6c38cf1
Merge pull request #7081 from JakubOnderka/galaxy-view-new 
New galaxy view for events
 2021-03-20 21:34:28 +01:00
Jakub Onderka 921744918f
Merge pull request #6722 from JakubOnderka/threat-level-index 
new: [UI] Show threat level icons on event index
 2021-03-20 19:32:50 +01:00
Jakub Onderka 374b10d623 new: [UI] Reworked galaxy quick view 2021-03-19 20:51:08 +01:00
Andras Iklody 90ed58d567
Merge pull request #7206 from tomking2/bug/sighting_crash 
fix: [api] Fixes crash when a new indicator in existing event has a sighting
 2021-03-18 23:04:28 +01:00
Jakub Onderka d4b0f265bb
Merge pull request #7183 from JakubOnderka/merge-local-tags-v2 
fix: [merge] Local tags should stay local vol. 2
 2021-03-18 20:54:02 +01:00
Jakub Onderka 0b0b71e8f5
Merge pull request #7181 from JakubOnderka/freetext-speedup 
new: [freetext] Faster freetext parsing with more tests
 2021-03-18 20:44:51 +01:00
Jakub Onderka ab7214eb05
Merge pull request #7213 from JakubOnderka/oidc-keep-setting 
fix: [internal] Keep OidcAuth setting when modify setting value from UI
 2021-03-18 20:34:51 +01:00
Jakub Onderka bd762ed092 chg: [test] Add test for #7214 2021-03-18 20:10:04 +01:00
Raphaël Vinot f74257670b fix: remove broken refang 2021-03-18 01:06:05 +01:00
Tom King 4474dcc2cf fix: [Sync] Crash when attempting to sync with 'Pull Galaxy Clusters' enabled 2021-03-17 15:31:36 +00:00
iglocska 5a917f008f
Merge branch '2.4' into develop 2021-03-16 23:15:30 +01:00
iglocska 82744ea39f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-16 23:15:09 +01:00
iglocska b773361561
fix: [refanging] Removed obnoxious regexes, fixes #7214 
- refanging \\. and .. to . is a stupid idea
 2021-03-16 23:14:48 +01:00
Jakub Onderka e2ea0cde3b
Merge pull request #7205 from tomking2/bug/galaxy_country_flag 
fix: [UI] Fixes bug that stops country flag being displayed alongside country
 2021-03-16 20:44:05 +01:00
Jakub Onderka bea5432123
Merge pull request #7207 from JakubOnderka/freetext-feed-view 
chg: [UI] Show number of items in freetext feed
 2021-03-16 20:43:38 +01:00
Jakub Onderka 8d03ba7dc1 fix: [internal] Keep OidcAuth setting when modify setting value from UI 2021-03-16 20:37:23 +01:00
iglocska a65cb60d7a
fix: [shibbauth] fixed invalid varname 2021-03-15 20:37:25 +01:00
Jakub Onderka 805b046760
Merge pull request #7184 from JakubOnderka/feed-event-preview-nicer 
chg: [UI] Make feed event preview nicer
 2021-03-15 18:21:45 +01:00
Jakub Onderka 284dc80f72 chg: [UI] Show number of items in freetext feed 2021-03-15 18:12:58 +01:00
Tom King 045595968c fix: [API] Fixes crash when a new indicator in existing event has a sighting 2021-03-15 16:53:01 +00:00
iglocska 2312fd72ff
chg: [shibbauth] added two extra settings 
- ApacheShibbauth.DefaultRole: defaults to false, if set, pick the supplied roleID for any user authenticating. Can be used together with BlockRoleModifications
- ApacheShibbauth.BlockRoleModifications: defaults to false, boolean. If set to true, will block any updates to the existing users on authentication. This preserves any modifications made by a site admin in MISP.
 2021-03-15 14:51:48 +01:00
Tom King f320e030dc fix: Fixes bug that stops country flag being displayed alongside the coutry in galaxy clusters 2021-03-15 12:48:46 +00:00
Jakub Onderka b17ddeaf70 chg: [feed] Check if value is clean IP without doing expensive operations 2021-03-15 10:51:48 +01:00
Alexandre Dulaunoy cc02fd9378
chg: [misp-galaxy] updated to the latest version 2021-03-13 11:07:50 +01:00
Alexandre Dulaunoy 765d948263
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-13 11:07:20 +01:00
Alexandre Dulaunoy 14e669c49f
chg: [misp-galaxy] updated to the latest version 2021-03-13 11:06:50 +01:00
Jakub Onderka d989759211
Merge pull request #7191 from JakubOnderka/create-no-need 
fix: [internal] Remove unnecessary create call
 2021-03-11 12:14:16 +01:00
Jakub Onderka a748134551 fix: [internal] Remove unnecessary create call 2021-03-11 12:03:00 +01:00
Jakub Onderka 032302dbf9 fix: [workers] Worker name when processing freetext 2021-03-10 21:34:14 +01:00
John Kristoff 5e7bbe4132 added newest DataPlane.org feeds 2021-03-10 11:10:04 -06:00
Jakub Onderka 9ab5447725 fix: [feed] Convert invalid key case 2021-03-10 14:09:06 +01:00
Jakub Onderka 42f78580df chg: [UI] Make feed event preview nicer 2021-03-10 14:09:06 +01:00
Jakub Onderka 2f1efc4561
Merge pull request #7186 from JakubOnderka/threat-level-list 
chg: [internal] Threat levels list
 2021-03-10 08:38:19 +01:00
Jakub Onderka 3935dee16b chg: [internal] Threat levels list 2021-03-10 08:17:11 +01:00
iglocska 5fce326e33
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-09 23:24:30 +01:00
iglocska f592b11ba6
Merge branch '2.4' into develop 2021-03-09 23:24:18 +01:00
iglocska eebe031091
fix: [unsafe API keys] fixed 
- if you really have to use them, they should work again

- please don't use them, you are disclosing your APIkey via the URL
- apache logs, proxy logs they will all have your APIkey
- adding headers with your APIkey isn't so difficult
- if a tool you use has no way of configuring headers, reach out to your vendor, they ought to do something about that
 2021-03-09 23:10:19 +01:00
Jakub Onderka ddd5673f86 fix: [merge] Local tags should stay local vol. 2 2021-03-09 20:39:24 +01:00
Jakub Onderka e716df5259
Merge pull request #7182 from JakubOnderka/merge-local-tags 
fix: [merge] Local tags should stay local
 2021-03-09 20:12:32 +01:00
Jakub Onderka 1d08e3eef2 fix: [merge] Local tags should stay local 2021-03-09 20:05:22 +01:00
iglocska c6ccda3cc6
Merge branch '2.4' into develop 2021-03-09 17:59:15 +01:00
iglocska 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