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

10522 Commits (745512e71e09580ae533a1e14dfc3026cd9f9cd2)

Author SHA1 Message Date
iglocska a18e49f07e
fix: [user_settings] added timestamp field 2019-09-29 22:20:46 +02:00
iglocska a20a49ffcb
fix: [internal] removed debug calls 2019-09-29 21:49:51 +02:00
iglocska 8f5f3ed08a
fix: [debug] Removed internal breakpoint that was left in 2019-09-29 21:17:08 +02:00
iglocska c53f34e33d
fix: [correlation] Skip correlation on tasks that modify an attribute in a way that wouldn't warrant a recorrelation, fixes #5204 
- Only recorrelate attribute if:
  - attribute is new
  - attribute already exists and value, disable_correlation, type is updated
 2019-09-29 21:07:35 +02:00
iglocska 8168cc79db
fix: [API] proposals overriding attributes wasn't always working as expected, fixes #4032 
- until now it was bound to the to_ids setting (badly) which caused nothing but headache
- moved the new configuration to instead use the non-permissive nature of the given export formats

- non-permissive export: if the proposal block is enabled, override attributes
- permissive export types: ignore the proposals

The reasoning is simple: we use the permissive export types for types that can express additional structures such as proposals, IDS flags, publish flags etc (meaning the MISP JSON/XML formats for example)
 2019-09-29 20:35:51 +02:00
iglocska 480e3b2969
Merge branch 'dev_session' into 2.4 2019-09-29 20:23:00 +02:00
iglocska 5248b86d73
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-29 20:21:59 +02:00
iglocska c7488f93c1
fix: [user setting] Left off missing changes to the controller 2019-09-29 20:21:35 +02:00
iglocska 9ac6552ffa
new: [user settings] Finalised first revision 
More to come in the future
 2019-09-29 20:20:39 +02:00
iglocska bf35987835
fix: [internal] Proposals block attributes setting broken when to_ids is an array 2019-09-29 18:33:32 +02:00
chrisr3d 3b11f6f2a2 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-28 02:36:54 +02:00
chrisr3d 1784b5d76f
fix: [stix 1/2 import] Making the publish checkbox work as expected 
- Publishing as exxpected when the option is
  checked AND the user has the right to publish
 2019-09-28 02:35:22 +02:00
chrisr3d de9184d4de
fix: [stix 1/2 import] Avoid adding the original stix file in the event if the option is not checked 2019-09-28 01:47:23 +02:00
chrisr3d 6239738192
fix: [stix 1/2 import] Adding misp event json data within the 'Event' field if it is not already in 2019-09-28 01:46:06 +02:00
Andras Iklody 7a71d76d82
Merge pull request #5198 from JakubOnderka/redis-info 
new: [internal] Redis diagnostic
 2019-09-27 22:19:05 +02:00
Andras Iklody a7a5226373
Merge pull request #5202 from JakubOnderka/patch-30 
fix: [UI] GnuPG diagnostic message
 2019-09-27 22:18:33 +02:00
Andras Iklody 5fe0f80fff
Merge pull request #5222 from JakubOnderka/patch-37 
fix: [UI] Notices margin
 2019-09-27 22:17:57 +02:00
Andras Iklody 7cd4da64f2
Merge pull request #5225 from JakubOnderka/patch-38 
fix: [UI] MISP logo is in center at login page
 2019-09-27 22:17:25 +02:00
Andras Iklody 277dfcc6ad
Merge pull request #5230 from JakubOnderka/patch-41 
fix: [shell] Update updateWarningLists from CLI
 2019-09-27 22:16:30 +02:00
Andras Iklody 9846a0d587
Merge pull request #5231 from StefanKelm/2.4 
Update global_menu.ctp
 2019-09-27 22:15:43 +02:00
Jakub Onderka c4f9afe27d
fix: [UI] Remove duplicate condition in footer.ctp 2019-09-27 17:57:38 +02:00
StefanKelm 8e947f182b
Update global_menu.ctp 
Align menu with other entries
 2019-09-27 15:39:10 +02:00
Jakub Onderka bd9d65a2a1
fix: [shell] Update updateWarningLists from CLI 2019-09-27 14:18:35 +02:00
chrisr3d d0b99bebda Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-26 16:54:09 +02:00
Andras Iklody 90e1b8807e
Merge pull request #5215 from ancailliau/add_localtag_api 
Add support to add local tags to an event using the API.
 2019-09-26 12:59:14 +02:00
iglocska 6d6f6b9f75
new: [UI] Added JSON as valid index table field 2019-09-26 10:30:18 +02:00
iglocska dc25176384
fix: [internal] paranoid log body didn't contain full body for API calls 2019-09-26 10:28:53 +02:00
iglocska 213cd99ebf
fix: [logging] paranoid log entry not logging request body via the API 2019-09-26 10:26:32 +02:00
iglocska 6cef8bb5c3
fix: [UI] Double side menu fixed 2019-09-25 22:21:10 +02:00
iglocska 1a6ab3bec7
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-25 20:18:10 +02:00
iglocska 40cf160c53
new: [API] Netfilter added as new export format 2019-09-25 20:17:25 +02:00
Jakub Onderka 96ba73e50f
fix: [UI] MISP logo is in center at login page 2019-09-25 19:34:20 +02:00
chrisr3d 78dc7e7512
fix: [stix 1/2 restSearch] Deleting temporary files in case of an error in the python side 2019-09-25 18:28:37 +02:00
Jakub Onderka e8cede8d09
fix: [UI] Notices margin 2019-09-25 17:02:46 +02:00
Alexandre Dulaunoy e901d1f1f5
chg: [misp-galaxy] updated to the latest version 2019-09-25 12:17:05 +02:00
Alexandre Dulaunoy 621390d937
chg: [misp-objects] updated to the latest version 2019-09-25 12:15:32 +02:00
Alexandre Dulaunoy ee1c861881
chg: [misp-galaxy] updated to the latest version 2019-09-25 11:57:58 +02:00
iglocska b887c3d71c
new: [index table] added json field 2019-09-25 11:53:04 +02:00
iglocska 946602a696
new: [User settings] Added user settings system 
- set settings / user
- settings can be set by user themselves or their org admin / site admin
- added first setting: publish_alert_filter
- accepts boolean branched filter options
  - supports deep logical trees
  - OR/NOT/AND
  - currently supports filtering on tags and the creator organisation
 2019-09-25 11:50:54 +02:00
mokaddem d3f9d17908
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-25 11:20:40 +02:00
mokaddem 8669b8f73f
chg: [decaying-model] Track latest version of misp-decaying-models 2019-09-25 11:19:58 +02:00
Antoine Cailliau 453a54ca0d Add support to add local tags to an event using the API. 2019-09-25 09:19:30 +00:00
Jakub Onderka 22aac8e235
chg: [internal] Use checkMISPVersion rather than duplicate impl 2019-09-24 18:30:19 +02:00
chrisr3d cebe7de575 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-24 14:23:19 +02:00
chrisr3d cfbb0ca8b2
fix: [stix import] Avoiding error with no hashes in pe objects 2019-09-24 14:22:08 +02:00
chrisr3d fa3c566116 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-24 14:19:27 +02:00
chrisr3d 97c298f898
fix: [stix2 export] Catching errors that could happen with custom tags 2019-09-24 14:18:07 +02:00
chrisr3d fdb418de0b
fix: [stix test] Updated STIX1 test files with the most recent fixes on the export script 2019-09-24 11:11:33 +02:00
chrisr3d 8b9a9c1326
fix: [stix export] Fixed dictionary key used to check pe sections to parse 2019-09-24 11:03:44 +02:00
chrisr3d 0a563c99d6 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-24 00:43:43 +02:00