MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,772 Commits
33 Branches
364 Tags
185 MiB
Commit Graph

19772 Commits (d5a425994f3b3bad210b921bcc8f2f7092e7f6f3)

Author SHA1 Message Date
Jakub Onderka d5a425994f fix: [schema] audit_logs.authkey_id columns should be nullable 2021-08-03 14:04:18 +02:00
Jakub Onderka ebdde921a2 chg: [internal] org_blocklists.org_uuid should be unique index 2021-08-03 10:38:08 +02:00
Jakub Onderka 6130065b5b chg: [internal] Organisation and object UUID should be unique 2021-08-03 10:26:25 +02:00
Jakub Onderka 7748598750
Merge pull request #7500 from JakubOnderka/stix-to-misp-types-path 
Stix to misp types path
 2021-08-01 18:40:58 +02:00
Alexandre Dulaunoy ac6c759dcf
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-07-31 10:42:35 +02:00
Alexandre Dulaunoy 6b3a276fee
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-31 10:42:19 +02:00
Alexandre Dulaunoy 327ca88d1e
chg: [warning-lists] updated to the latest version 2021-07-31 10:41:59 +02:00
iglocska 3c7e13446d
Merge branch '2.4' into develop 2021-07-30 15:56:12 +02:00
iglocska 5847cb29e4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-30 15:54:49 +02:00
iglocska e36f73947e
chg: [opendata] updated and changed parameter handling 2021-07-30 15:53:36 +02:00
mokaddem 6003aaee27
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-29 13:46:36 +02:00
mokaddem af50add824
fix: [security] Stored XSS when viewing galaxy cluster relationships 
- As reported by Dawid Czarnecki
 2021-07-29 13:44:53 +02:00
mokaddem f318f7c0dd
fix: [security] Stored XSS when viewing galaxy cluster elements in JSON format 2021-07-29 13:44:11 +02:00
Jakub Onderka 7ac9cae7b6
Merge pull request #7539 from JakubOnderka/publishing-refactoring 
Refactor publishing event
 2021-07-27 20:52:17 +02:00
Jakub Onderka c6183dbb98
Merge pull request #7609 from JakubOnderka/code-cleanup-vol6 
Code cleanup vol6
 2021-07-27 19:11:28 +02:00
Jakub Onderka 180fb627cc chg: [internal] Convert array to const 2021-07-27 18:58:04 +02:00
Jakub Onderka db242d6901 chg: [internal] Convert array to const 2021-07-27 18:49:40 +02:00
Jakub Onderka bcb9328841 chg: [internal] Simplified Attribute::deleteAttribute method 2021-07-27 18:43:27 +02:00
Jakub Onderka 15e3cc799c chg: [internal] Removed unused variables 2021-07-27 18:43:16 +02:00
Jakub Onderka 974c28d8a7 chg: [internal] Remove unused variable 2021-07-27 18:42:47 +02:00
Jakub Onderka 442392652f
Merge pull request #7607 from JakubOnderka/non-correlationg-types-const 
chg: [internal] Convert array to const
 2021-07-27 18:40:47 +02:00
Jakub Onderka d4c2d10fe3 chg: [internal] Convert array to const 2021-07-27 16:43:27 +02:00
iglocska b9619549af
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-27 16:19:27 +02:00
iglocska 1f567d4a55
Merge branch 'develop' into 2.4 2021-07-27 16:19:17 +02:00
iglocska 98e1f3f2f9
fix: [compatibility] several scoped constants reverted 2021-07-27 16:16:52 +02:00
iglocska 3295f69de5
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-27 16:06:07 +02:00
iglocska 8a2cd19491
chg: [compatibility] scoped constant changed to unscoped to allow for 7.0 compatibility 
- update your PHP version though
 2021-07-27 16:05:13 +02:00
Liviu Valsan 4b74a0d342
chg: [shibbauth] added option to block organisation changes at login 
- New ApacheShibbAuth.BlockOrgModifications setting added, defaults to false, boolean. If set to true, will block updates to the organisation of existing users on authentication. This preserves any modifications made by a site admin in MISP and is similar to ApacheShibbauth.BlockRoleModifications (same logic applied to role modifications).
 2021-07-27 15:27:48 +02:00
Alexandre Dulaunoy cdbcc1e619
Merge pull request #7602 from liviuvalsan/shib_user_org 
chg: [shibbauth] added option to block organisation changes at login
 2021-07-27 15:26:36 +02:00
iglocska 4dc3aee88d
Merge branch 'develop' into 2.4 2021-07-27 15:09:54 +02:00
iglocska e45245ec86
fix: [proposal alert email] function call fixed 2021-07-27 15:09:23 +02:00
iglocska 543180700c
Merge branch 'develop' into 2.4 2021-07-27 14:08:16 +02:00
iglocska 3166ef66a2
chg: [version] bump 2021-07-27 14:07:35 +02:00
iglocska 0083204ae3
Merge branch 'develop' into 2.4 2021-07-27 14:07:07 +02:00
iglocska 2a2303f36d
chg: [PyMISP] bump 2021-07-27 13:47:50 +02:00
Jakub Onderka babd5717d3
Merge pull request #7603 from JakubOnderka/fix-tests-vol2 
Fix tests vol2
 2021-07-27 13:07:47 +02:00
iglocska 251ba2ef11
chg: [PyMISP] bump 2021-07-27 11:53:13 +02:00
Jakub Onderka cf93bbb20e chg: [security audit] Check config.php.bk file permission 2021-07-27 10:59:07 +02:00
Jakub Onderka fa62d06c03 chg: [internal] Create config backup just when it is necessary 2021-07-27 10:29:16 +02:00
Jakub Onderka 91ba045db6 chg: [internal] Reset PHP cache after config file is successfully changed 2021-07-27 10:29:16 +02:00
Jakub Onderka 4ee2726f37 chg: [test] Move PHP tests to different task 2021-07-27 10:29:16 +02:00
Jakub Onderka 9a5b40f240 fix: [test] Set expected config for security tests 2021-07-26 16:55:48 +02:00
Jakub Onderka 0fa5551d93 fix: [test] Check if user is logged 2021-07-26 16:54:46 +02:00
iglocska b5feead107
chg: [PyMISP] bump 2021-07-26 16:47:26 +02:00
iglocska 4bb08fe151
fix: [config defaults] unset the default python bin path 2021-07-26 16:18:11 +02:00
iglocska 76af4b9d90
fix: [config defaults] changed default attachment storage 2021-07-26 16:16:23 +02:00
iglocska c8d34cc0f5
fix: [Userinit] create advanced auth key when needed 2021-07-26 16:12:04 +02:00
Liviu Valsan c68e8e2091 chg: [shibbauth] added option to block organisation changes at login 
- New ApacheShibbAuth.BlockOrgModifications setting added, defaults to false, boolean. If set to true, will block updates to the organisation of existing users on authentication. This preserves any modifications made by a site admin in MISP and is similar to ApacheShibbauth.BlockRoleModifications (same logic applied to role modifications).
 2021-07-26 15:02:18 +02:00
Jakub Onderka c9d60601e0
Merge pull request #7596 from JakubOnderka/publishd-time 
chg: [UI] Use time element for event published timestamp
 2021-07-26 14:18:16 +02:00
Jakub Onderka 1ace900043
Merge pull request #7589 from JakubOnderka/org-ui 
Org UI
 2021-07-26 14:17:37 +02:00