MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,826 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

2826 Commits (5e79c309742103399c9351735fa2b99f829c78f4)

Author SHA1 Message Date
iglocska 5e79c30974 Fix to the previous fix 
- Flipped it the wrong way, fixed now
 2015-12-04 14:28:02 +01:00
iglocska 3b9f6fa5bb Merge branch 'hotfix-2.3.174' 2015-12-04 14:25:15 +01:00
iglocska a82addb981 Small fix to the previous commit 
- Small fix to a copy-paste fail
 2015-12-04 14:23:42 +01:00
iglocska 76b231c5bb Merge branch 'hotfix-2.3.174' 2015-12-04 11:34:08 +01:00
iglocska 65faeb48d9 Further tweaks 
- fixed some corner cases
- added support for the same defanging to the freetext import tool
 2015-12-04 11:33:14 +01:00
iglocska 744cf50fb9 Update to attribute validation and the freetext import tool, fixes #742 
- defanged URL type attributes are refanged on input
- admin script to do the same for all existing attributes

- admin tool doesn't recognise a word followed by a . as a url
 2015-12-04 10:43:38 +01:00
iglocska 4c7af3e62f Merge branch 'hotfix-2.3.173' 2015-12-02 22:13:14 +01:00
iglocska 7763b63dc2 Junk left in the previous commit 2015-12-02 22:12:54 +01:00
iglocska d9ab688294 Merge branch 'hotfix-2.3.173' 2015-12-02 22:11:03 +01:00
iglocska 9f684d230d Filter and discussion changes 
- event index filtering now accepts POST requests with a json object
  - format has to be filter syntax passed for each field. Example:
    - {"tags":"OSINT|TLP:WHITE|!PRIVINT", "published":"1"}
  - Fixed an issue with no tags being recognised leading to the index returning an unfiltered list
  - Required for filtered pulls from 2.4

- Discussions
  - Event discussion thread initiated on first post instead of first view
 2015-12-02 22:07:54 +01:00
iglocska 58034573a3 Merge branch 'hotfix-2.3.172' 2015-12-02 01:16:07 +01:00
iglocska 864298e9e5 Fix to an incorrect call on sending out alert emails on edit 2015-12-02 01:15:43 +01:00
iglocska 7a9029ec82 Merge branch 'hotfix-2.3.172' 2015-12-02 00:47:20 +01:00
iglocska 0265e92486 Fix to a newly introduced bug that breaks updates of attributes via pulls 2015-12-02 00:46:41 +01:00
iglocska 8b97700325 Merge branch 'hotfix-2.3.171' 2015-12-01 15:40:03 +01:00
iglocska 268c7683a0 Rework of the event add/edit 
- allows for saving an event even if an attribute fails
  - logs attributes that fail validation

- same for edit

- add_misp_export updated with the above in mind
 2015-12-01 15:39:12 +01:00
iglocska 2b7b05b129 Merge branch 'hotfix-2.3.170' 2015-11-30 02:30:39 +01:00
iglocska 85eaea724c Version bump 2015-11-30 02:29:52 +01:00
iglocska 9eb5680ee8 Reimplementation of the Add XML feature 
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures

- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
 2015-11-30 02:28:07 +01:00
iglocska 0611648989 Merge branch 'hotfix-2.3.169' 2015-11-27 09:17:13 +01:00
iglocska b30bfab0a5 Delete proposal attachment if the proposal was accepted / discarded 
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
 2015-11-27 09:16:17 +01:00
iglocska d2972ffaee Merge branch 'hotfix-2.3.168' 2015-11-27 08:49:50 +01:00
iglocska 91c4f67ebd Fix to an issue where a proposal with an attachment could not be correctly accepted 2015-11-27 08:49:13 +01:00
iglocska 33bd270c5d Merge branch 'hotfix-2.3.167' 2015-11-26 18:36:43 +01:00
iglocska 8cac54fd66 Updated CakePHP version to 2.7.7 2015-11-26 18:36:25 +01:00
iglocska 04c0581ae1 Merge branch 'hotfix-2.3.166' into develop 2015-11-26 17:13:45 +01:00
iglocska f25920e3a3 Merge branch 'hotfix-2.3.166' 2015-11-26 17:13:21 +01:00
iglocska 72db1ab211 Left off the view file from the previous commit 2015-11-26 17:13:01 +01:00
iglocska f6f3afbdb4 Merge branch 'hotfix-2.3.166' into develop 2015-11-26 17:07:53 +01:00
iglocska 2dca12fbb0 Merge branch 'hotfix-2.3.166' 2015-11-26 17:07:12 +01:00
iglocska 57c5696d96 Backport of a fix to 2.4 adding comments to proposed attachments 2015-11-26 17:06:33 +01:00
iglocska c6d11ecb85 Merge branch 'hotfix-2.3.165' into develop 2015-11-26 16:41:17 +01:00
iglocska 51c4047d6a Merge branch 'hotfix-2.3.165' 2015-11-26 16:39:57 +01:00
iglocska c94d67275f Fix to an issue with the proposal uploader 
- also a small fix to the baseurl auto detection
 2015-11-26 16:38:39 +01:00
iglocska 9cc80d7c0c Merge branch 'master' into develop 2015-11-22 17:41:54 +01:00
iglocska cb0ac8b0c3 Merge branch 'master' of https://github.com/MISP/MISP 2015-11-22 17:41:38 +01:00
iglocska 751f57830e Merge branch 'hotfix-2.3.164' 2015-11-22 17:41:00 +01:00
iglocska ca51b55d6b Changes to the OpenIOC Import, fixes #725 
- Removed the OpenIOC Indicator UUID persistence and moved it to a comment
  - this allows for the same OpenIOC report to be imported into separate events and won't result in a UUID collision

- Reworked the composite indicator resolver
  - more generic, allows for 3 part composites (to allow for regkeypath/regkey/regvalue combinations)

- Registry values now correctly recognised
 2015-11-22 17:38:11 +01:00
Alexandre Dulaunoy 1cd7f6bd04 Initial JSON schema - MISP event (version 2.3) 2015-11-20 10:28:11 +01:00
iglocska 352c7d31c7 Merge branch 'hotfix-2.3.163' into develop 2015-11-19 17:13:41 +01:00
iglocska 7f8ee7ddba Merge branch 'hotfix-2.3.163' 2015-11-19 16:52:41 +01:00
iglocska 2daaee5333 Version bump 2015-11-19 16:52:25 +01:00
iglocska 56adab6122 Bugfix pack, fixes #724, fixes #721 
- Fixed an issue with the new UUID generation method call in OpenIOC
- Fixed an invalid validation check on the salt key

- Added a note on the server page to make it more obvious that values can be changed by double clicking them
 2015-11-19 16:50:14 +01:00
iglocska f8fbcc1c60 Merge branch 'master' into develop 2015-11-17 12:07:54 +01:00
iglocska b02480c5eb Merge branch 'hotfix-2.3.162' 
Conflicts:
	app/View/Elements/side_menu.ctp
 2015-11-17 12:07:05 +01:00
iglocska bda6923018 Security fix fixing an XSS issue with the templates 
- as discovered and reported by Rafael Pablos García of INCIBE

- fixed a reflected XSS for template creator users when viewing a template
 2015-11-17 11:58:56 +01:00
iglocska 41b3ef3d9f Merge branch 'hotfix-2.3.161' into develop 2015-11-17 10:22:57 +01:00
iglocska ce49216514 Merge branch 'hotfix-2.3.161' 2015-11-17 10:22:40 +01:00
iglocska e96c05b987 Fix to a recent patch breaking the publish button 2015-11-17 10:21:44 +01:00
iglocska 7ee1a9bab2 Merge branch 'hotfix-2.3.160' into develop 2015-11-17 01:18:18 +01:00