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

4146 Commits (791dc9deabd2d7fdfd7c371331eb557d14782372)

Author SHA1 Message Date
Jakub Onderka 791dc9deab new: [internal] JSON stream convert 2020-11-17 19:28:59 +01:00
Jakub Onderka f1d8bf60e4
Merge pull request #6605 from JakubOnderka/php-extension-diagnostic 
chg: [diagnostic] Smarter PHP extension diagnostics
 2020-11-17 17:06:15 +01:00
Jakub Onderka 5a597ca3db chg: [diagnostic] Smarter PHP extension diagnostics 2020-11-17 14:08:37 +01:00
mokaddem c8462c5791
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 13:35:40 +01:00
mokaddem ffa0ab54f9
fix: [attribute:fetch_attributes] Respect group_by request 2020-11-17 12:08:46 +01:00
mokaddem 217abfc2f8
fix: [mispObject:save_object] Returns error in correct format. 
Fix #6598
 2020-11-17 11:37:40 +01:00
mokaddem 9135a1ca8d
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 11:05:44 +01:00
Sami Mokaddem 32e7a3a5c3
Merge pull request #6580 from Maddosaurus/fix-plugin-setting-spelling 
Fix: Fix spelling of sightings_anonymise_as description
 2020-11-17 11:04:25 +01:00
mokaddem 86b0f75700
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 10:31:39 +01:00
Jakub Onderka 24301af247 fix: [internal] Server::update method 2020-11-16 23:22:27 +01:00
Jakub Onderka a2449f9c02
Merge pull request #6597 from JakubOnderka/zmq-setting-change-fix 
fix: [internal] Initialize ZMQ just when necessary after setting change
 2020-11-16 21:48:35 +01:00
Jakub Onderka 14efe5681c fix: [internal] Initialize ZMQ just when necessary after setting change 2020-11-16 20:37:27 +01:00
Jakub Onderka fd9baef7c0
Merge pull request #6588 from JakubOnderka/gpg-version-diagnostics 
new: [diagnostic] Show installed GnuPG version
 2020-11-16 17:46:31 +01:00
Jakub Onderka 73b63e2ccd new: [diagnostic] Show installed GnuPG version 2020-11-16 14:38:40 +01:00
mokaddem 51066e786c
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-16 10:46:07 +01:00
Jakub Onderka b38a4d5246
Merge pull request #6561 from JakubOnderka/rest-attribute-include-context 
chg: [rest] For attribute REST search with includeContext, fetch events just once
 2020-11-16 08:48:02 +01:00
iglocska a306784844
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-15 10:21:50 +01:00
Jakub Onderka b057426b9f fix: [security] Properly validate new auth key 2020-11-14 22:33:05 +01:00
Jakub Onderka 3b8b0019af new: [user] Setting `disable_user_add` to disable user creation by org admins 2020-11-14 17:44:17 +01:00
Jakub Onderka 272142637b new: [UI] Add `disable_user_password_change` and `disable_user_login_change` setting 2020-11-14 17:44:16 +01:00
mokaddem e3d42ffe2a
new: [eventReport] Report from event 2020-11-13 13:56:28 +01:00
iglocska 2eec8878cd
new: [authkey] generate authkeys automatically when creating users 
- when using the new authkey system
 2020-11-13 12:54:14 +01:00
iglocska c3a1fd7df9
fix: [UI] various smaller fixes 2020-11-13 12:53:52 +01:00
iglocska 03e5ad741d
fix: [authkey] various improvements 
- correct lookup of users by API key when no expiration is set
- added authkey reset functions
 2020-11-13 12:52:20 +01:00
Mat c21ba85a08 Fix: Fix spelling of sightings_anonymise_as description 2020-11-13 12:38:05 +01:00
iglocska dbffebe503
Merge branch '2.4' into CRUD 2020-11-11 11:19:23 +01:00
mokaddem 774c4c104a
fix: [object:deltaMerge] Stopped updating object's attributes when updating the FS/LS. 
- Make sure to compare the correct date value of FS/LS and not their representation
 2020-11-11 09:56:05 +01:00
Jakub Onderka 7e0eed33a5 chg: [internal] Allow to fetch two orgs in one query 2020-11-09 08:05:01 +01:00
Jakub Onderka 6160ad5e34 chg: [rest] For attribute REST search with includeContext, fetch events just once 2020-11-09 08:05:01 +01:00
Jakub Onderka df9687238d
Merge pull request #6529 from JakubOnderka/experimenteal-faster-rest-fetch 
chg: [rest] Faster attributes restSearch
 2020-11-08 14:16:45 +01:00
Jakub Onderka 5d6c1abe3c
Merge pull request #6519 from JakubOnderka/update-login-times 
fix: [internal] Properly set login time for custom auth
 2020-11-07 09:58:54 +01:00
Jakub Onderka a604d3ce27
Merge pull request #6538 from JakubOnderka/event-edit-optimisation 
fix: [internal] Do not load all attributes when editing event
 2020-11-06 20:16:09 +01:00
mokaddem a076562817
fix: [object:edit] Changes on fs/ls handling for object's attributes 
- Allow object's attributes to have fs/ls different from their object.
- Object's attribute's timestamp is no longer refreshed when editing an object unless the attribute changed
- Object's attribute's inherit their object fs/ls if unset
 2020-11-06 09:09:50 +01:00
mokaddem 3efaffdefc
fix: [attribute] `only_full_group_by` fixed for `__getCDIRList`. 
Fix #6218
 2020-11-06 08:36:07 +01:00
mokaddem 60d1adb1cf
chg: [taxonomy] Include if the predicate is exclusive at entry level 2020-11-05 15:23:12 +01:00
mokaddem 0f69022a4e
fix: [appmodel] Make sure parameter is a string before accessing string 
index.
Fix #6544
 2020-11-05 10:13:05 +01:00
Jakub Onderka a92c1c4fe4 chg: [internal] Speedup sightings saving 2020-11-03 09:20:22 +01:00
Jakub Onderka 19c13dc5a9 fix: [internal] Do not load all attributes and sightings when editing event 2020-11-02 15:03:36 +01:00
Jakub Onderka 31df0d5a15
Merge pull request #6521 from JakubOnderka/cached-feed-url-match 
chg: [feed] Check also URL without protocol
 2020-11-02 14:30:15 +01:00
Jakub Onderka 88ec45549b
Merge pull request #6514 from JakubOnderka/fix-indefined-index 
fix: [internal] `Undefined index: value` warning
 2020-11-02 14:29:47 +01:00
Jakub Onderka dc3651709e fix: [internal] Remove warning when modules are not reachable 2020-11-01 15:19:57 +01:00
mokaddem 1be6225494
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-10-31 21:24:07 +01:00
mokaddem baf7897c0c
fix: [eventReport] Function call not adapted after module rework merge 2020-10-31 21:23:27 +01:00
iglocska 9768fc9bcc
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-10-31 08:49:21 +01:00
iglocska 6e81c8ee8a
fix: [security] SSRF fixed in the rest client 
- by using the full path parameter in the rest client, users could issue queries to any server
- this becomes especially problematic when the MISP server is able to query other internal servers,
  as external users could trigger those

- new server setting added that allows enabling the full path option, this is now disabled by default
- new server setting added to add an override baseurl for the rest client, removing the need for the full
  path option in the first place (for example for the training VM with its port forwarding)

- Thanks to Heitor Gouvêa for reporting this vulnerability
 2020-10-31 08:49:01 +01:00
Jakub Onderka 9cf7be802d chg: [rest] Faster attributes restSearch 2020-10-30 18:49:48 +01:00
Jakub Onderka b749610c56 chg: [feed] Check also URL without protocol 2020-10-29 18:55:17 +01:00
mokaddem 53f3a38d0a
Merge remote-tracking branch 'origin/2.4' into feature-report-extract-data 2020-10-29 18:36:15 +01:00
Jakub Onderka 5a4ba9cbc1 fix: [internal] Properly set login times for custom auth 2020-10-29 17:53:11 +01:00
Jakub Onderka bc9be1f5c9 fix: [internal] `Undefined index: value` warning 2020-10-29 09:07:28 +01:00