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

19798 Commits (ade3d78d981efa23d93c20102d2e17af5f779e3c)

Author SHA1 Message Date
iglocska ade3d78d98
chg: [VERSION] bump 2021-08-05 11:59:29 +02:00
Raphaël Vinot 111cbd349d chg: [PyMISP] Bump recommended version 2021-08-05 11:47:42 +02:00
Raphaël Vinot 9802c22235 chg: [PyMISP] Bump 2021-08-05 11:43:07 +02:00
Jakub Onderka ddc4bbdca7
fix: [js] Show correct error message for get remote version 2021-08-05 09:56:10 +02:00
Jakub Onderka 10b9dc4db3
Merge pull request #7624 from JakubOnderka/get-remote-user-fixes 
fix: [UI] Show correct error message for get remote user
 2021-08-05 09:39:37 +02:00
Jakub Onderka 1571ab90ae fix: [UI] Show correct error message for get remote user 2021-08-04 10:28:02 +02:00
Jakub Onderka 9ccd157d3d
Merge pull request #7622 from JakubOnderka/fix-fetching-version 
fix: [sync] Fetching remote server version
 2021-08-03 16:22:43 +02:00
Jakub Onderka ed6ea29a17 fix: [sync] Fetching remote server version 2021-08-03 15:55:40 +02:00
Jakub Onderka 158fb40861
Merge pull request #7619 from JakubOnderka/get-remote-update 
chg: [internal] Use ServerSyncTool for fetching remote user info
 2021-08-03 15:32:32 +02:00
Jakub Onderka a4c69e5c6e chg: [internal] Use ServerSyncTool for fetching remote user info 2021-08-03 15:06:59 +02:00
Jakub Onderka 9db9c00760
Merge pull request #7620 from JakubOnderka/database-indexes 
Database indexes
 2021-08-03 14:57:54 +02:00
Jakub Onderka 3bc4f90122 new: [test] Check schema diagnostics in CI 2021-08-03 14:38:50 +02:00
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 2a80b29de0
Merge pull request #7568 from JakubOnderka/zmq 
Add missing misp_json_warninglist topic to Python script
 2021-08-03 09:41:16 +02:00
Jakub Onderka e6348d3a21
Merge pull request #7606 from JakubOnderka/undefined-index-fix 
fix: [API] Undefined index when just last_seen is set
 2021-08-03 09:40:09 +02:00
Jakub Onderka 62bf6c8c85
Merge pull request #7614 from JakubOnderka/optimise-statistics 
chg: [internal] Optimise loading attribute histogram
 2021-08-02 17:29:48 +02:00
iglocska 4739e1f234
Merge branch '2.4' into develop 2021-08-02 13:31:19 +02:00
iglocska 269883c4ef
fix: [afterHook] for setting changes wasn't returning true, fixes 7477 
- this caused the CLI setting change to error out
 2021-08-02 13:30:29 +02:00
Jakub Onderka bcc499db1e chg: [internal] Optimise loading attribute histogram 2021-08-02 10:40:18 +02:00
Alexandre Dulaunoy 87c674ab15
new: [citation-cff] added 2021-08-02 08:16:52 +02:00
Alexandre Dulaunoy 0422c7e088
new: [citation-cff] added 2021-08-02 08:13:42 +02:00
lk-dll 1a8235d9cf
quick fix sticky buffers 
According to documention (https://suricata.readthedocs.io/en/suricata-6.0.3/rules/http-keywords.html#http-keywords) sticky buffers should be before content, http.header and http.uri isn't marked as sticky buffers, but rules are wrongly generated and reported to logs. Tested on stable Suricata v6.0.1+
 2021-08-02 08:04:30 +02:00
Alexandre Dulaunoy 34e55048d3
Merge pull request #7613 from lk-dll/patch-1 
quick fix sticky buffers
 2021-08-01 23:08:20 +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
lk-dll 2db23745a9
quick fix sticky buffers 
According to documention (https://suricata.readthedocs.io/en/suricata-6.0.3/rules/http-keywords.html#http-keywords) sticky buffers should be before content, http.header and http.uri isn't marked as sticky buffers, but rules are wrongly generated and reported to logs. Tested on stable Suricata v6.0.1+
 2021-07-29 18:19:58 +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