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

9276 Commits (219df09e986bc77d0a2903ee7884b921a1152d4e)

Author SHA1 Message Date
mokaddem 219df09e98 chg: [galaxyMatrix] number of entry per column. Fix #4601 2019-05-13 13:46:36 +02:00
mokaddem de186f93ad fix: [genericPicker] allow tagging when the ATT&CK Matrix has been 
opened.
 2019-05-13 10:10:26 +02:00
mokaddem 2bce33b83e fix: [object:revise] Removed useless ACL conditions; was failing for users 
not being admin.
 2019-05-13 08:53:22 +02:00
Alexandre Dulaunoy a2d0a8c7ac
chg: [misp-galaxy] updated to the latest version 2019-05-12 20:56:34 +02:00
iglocska 6904a16fcc fix: [age based publish blocking] Fixed and using the timestamp 2019-05-12 09:55:52 +02:00
iglocska f5e4479cef fix: [docs] Added attackGalaxy as a valid option for the restsearch APIs 2019-05-10 14:47:37 +02:00
iglocska c54839d2eb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-10 14:42:25 +02:00
iglocska 5ee6013dff fix: [API] Some fixes for the restsearch -> attack export 2019-05-10 14:41:50 +02:00
iglocska e899eb8b9d new: [ATT&CK] Added new export system for restsearch for ATT&CK 
- Return the ATT&CK matrix data as HTML via the API
- Directly viewable via the REST client

- Greetings from the ATT&CK workshop @ Eurocontrol
 2019-05-10 14:25:38 +02:00
Steve Clement c46ef49831
fix: [bug] getPythonVersion undefined, pull in where it is defined. (#4615) 
fix: [bug] getPythonVersion undefined, pull in where it is defined.
 2019-05-10 08:14:27 +09:00
Steve Clement 45e6d740f0 fix: [bug] getPythonVersion undefined, pull in where it is defined. 2019-05-10 07:23:14 +09:00
iglocska 5c9332072f new: [API] Added includeWarninglistHits to the attribute search API 2019-05-09 17:25:39 +02:00
iglocska 6150d9e4a6 new: [API] Added includeWarninglistHits as a possible filter for the event level restsearch 2019-05-09 17:14:25 +02:00
iglocska 845f2a7d40 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-09 17:13:41 +02:00
iglocska 583e07b484 fix: [galaxy clusters] Choosing them via the UI was dog slow 
- now it's just plain slow
 2019-05-09 12:22:30 +02:00
Andras Iklody fd80d7b93e
Merge pull request #4607 from pettai/new-rpz-action-fix 
rpz: fix missing rpz policy actions
 2019-05-09 11:46:06 +02:00
frpet 8cd4dceaf6 rpz: add missing rpz policy actions 
Fix: Add two new policy actions added to RPZexport previously
 2019-05-09 11:01:51 +02:00
Alexandre Dulaunoy a0c2b6d7a8
chg: [galaxy/taxonomy/warninglists] updated to the latest version 2019-05-09 10:45:54 +02:00
Andras Iklody 11a0c9ed73
Merge pull request #4600 from pettai/local-data 
rpz: Local-Data
 2019-05-09 10:19:44 +02:00
frpet 63083edcbd fix description 
make the description clearer
 2019-05-09 09:33:26 +02:00
Andras Iklody 2315500751
Merge pull request #4595 from pettai/action-policy-update 
rpz: make NXDOMAIN default
 2019-05-08 17:33:20 +02:00
frpet 38a64e0ba9 rpz: action policy rename (to Local-Data) 
Rename action policy "walled-garden" to "Local-Data" as per the IETF draft (and other documentation for RPZ)
 2019-05-08 15:54:34 +02:00
frpet 9274a9d987 rpz: make NXDOMAIN default 
Update default action policy from DROP --> NXDOMAIN
 2019-05-08 15:22:03 +02:00
mokaddem e6b8f32729 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-08 11:59:07 +02:00
mokaddem 3d74ce99ef chg: [adminShell] Added recovery function to replay updates 
It fetches the last successful DB update number in the log, then
re-apply all of them up to the latest available.
 2019-05-08 11:51:26 +02:00
chrisr3d e80553c795 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-08 11:10:17 +02:00
chrisr3d 2b23f1e5b7
fix: [stix export] Fixed email attachment export 
- Fixed condition trying to reach the case where
  we have an attachment attribute in the object,
  which was never true because of a wrong key
  testing
- Fixed the email attachment related file object
  creation initiation
 2019-05-08 11:09:24 +02:00
Steve Clement d8a77afacf
fix: [AdminShell] Yet another tyope :( (#4590) 
fix: [AdminShell] Yet another tyope :(
 2019-05-08 17:44:48 +09:00
Steve Clement 44e5f940a2 fix: [AdminShell] Yet another tyope :( 2019-05-08 17:44:15 +09:00
Steve Clement 7b5cdd028e
fix: [AdminShell] Fixed typo (#4589) 
fix: [AdminShell] Fixed typo
 2019-05-08 17:42:25 +09:00
Steve Clement db0fb9432e fix: [AdminShell] Fixed typo 2019-05-08 17:41:28 +09:00
Steve Clement 220725e278
Merge pull request #4588 from SteveClement/tools 
fix: [AdminShell] Added apache user
 2019-05-08 17:35:35 +09:00
iglocska 61bcf4a671 fix: [update] Disabled background processing until it's fixed 2019-05-08 10:28:03 +02:00
Steve Clement 5844d2534d fix: [AdminShell] Added apache user 2019-05-08 17:21:29 +09:00
Steve Clement 95bfb9783f Merge branch '2.4' into tools 2019-05-08 17:20:33 +09:00
frpet be7b344d0e Update Serial description 
Hint about $time, which also is a valid setting
 2019-05-08 07:28:31 +02:00
frpet 6576565de2 fix the testForRPZ... functions 
Make the testForRPZ... functions happy too.
 2019-05-08 07:14:36 +02:00
Steve Clement 968035c218
fix: [AdminShell] very dirt fix to get updateObjectTemplates working (#4585) 
fix: [AdminShell] very dirt fix to get updateObjectTemplates working
 2019-05-08 09:14:48 +09:00
Steve Clement b7ccee7e72 chg: [AdminShell] Some comments on current state of bugs 2019-05-08 09:13:59 +09:00
Steve Clement c6f26909b3 chg: [AdminShell] Let's at least tell what ID was not found. 2019-05-08 09:12:18 +09:00
Steve Clement 9280cc736b fix: [AdminShell] very dirt fix to get updateObjectTemplates working from the CLI 2019-05-08 09:09:41 +09:00
Andras Iklody 3c6a336774
Merge pull request #4581 from pettai/RPZ-policy-action 
RPZ - Add additional policy actions
 2019-05-07 17:03:27 +02:00
iglocska 6065023d23 fix: [UI] Notice errors fixed in the discussion threads 2019-05-07 16:54:45 +02:00
frpet 76fcc6553a Add additional policy actions 
Add the last policy actions from the RPZ draft.
* rpz-passthru allows for testing without applying changes on the returned answer.
* TCP-only forces the client over to use TCP.
 2019-05-07 16:29:32 +02:00
iglocska 8e3e4d27c1 fix: [bug] Fixed a bug in the update process that caused updates to fail due to an invalid value assigned as default for org_id 2019-05-07 11:56:29 +02:00
iglocska 62f15433e4 fix: [security] Fix persistent xss due to invalid sanitisation of image names in titles 
- triggered by expanding a screenshot

- as reported by João Lucas Melo Brasio from Elytron Security S.A. (https://elytronsecurity.com)
 2019-05-07 09:01:05 +02:00
iglocska 6f6fb678ca fix: [security] Fix persistent xss via link type attributes containing javascript:// links 
- low impact as it requires user interaction to trigger

- as reported by João Lucas Melo Brasio from Elytron Security S.A. (https://elytronsecurity.com)
 2019-05-07 09:00:33 +02:00
iglocska 3a085a6cee fix: [security] Fix persistent xss via discussion links via javascript:// links 
- low impact as it requires user interaction to trigger

- as reported by João Lucas Melo Brasio from Elytron Security S.A. (https://elytronsecurity.com)
 2019-05-07 08:58:36 +02:00
Alexandre Dulaunoy dd66d05001
chg: [misp-galaxy/misp-objects] updated to the latest version 2019-05-07 06:30:08 +02:00
Steve Clement ef4c99d964 fix: [AdminShell] Misplaced the debug message. 2019-05-07 11:31:26 +09:00