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

3129 Commits (52f429e3c7023725139e43a9c9b37fcefc329072)

Author SHA1 Message Date
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 5dbbe84069 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
 2015-11-30 09:37:22 +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 184949cc9f Some small taxonomy fixes 2015-11-29 22:36:14 +01:00
Iglocska 714ed198e5 Various fixes throughout the application 
- org field still used in some places other than the legitimate use-cases
 2015-11-28 23:49:52 +01:00
Iglocska 908f2c4c46 Rework of the taxonomies 
- users can now add taxonomy tags separately from normal tags on the event view
- tag index now shows taxonomy
 2015-11-27 17:41:41 +01:00
Iglocska d20946f5ed Fix to logging causing certain functions to fail on migrated installations 2015-11-27 14:10:25 +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 93af832abe Blocked the colour update when the taxonomies are updated 
- better to not overwrite the local tag colours unless the tag is refreshed from the taxonomy view. A gree tlp:red looks silly.
 2015-11-26 09:21:51 +01:00
Iglocska c104a1763b Temporarily re-added org field for jobs 2015-11-26 04:38:57 +01:00
Iglocska 0572b2030e Further work on the taxonomies 
- colour coding
- filters on the index
- mass tag creation
 2015-11-26 04:31:24 +01:00
Iglocska 1328d83fe5 Updated taxonomies 2015-11-25 15:43:45 +01:00
iglocska b5857696e9 Update to the Taxonomies 2015-11-24 12:02:39 +01:00
Benjamin Gathmann 17d9c4da3e Merge pull request #1 from abulhol/abulhol-patch-1 
added domain|ip composite attribute
 2015-11-24 10:44:00 +01:00
Benjamin Gathmann 9cd9259f98 added domain|ip composite attribute 2015-11-24 10:40:43 +01:00
iglocska 3784209cf5 First bash at Taxonomies 
What works:
- added submodules for taxonomies
- added import tool for taxonomies
- added models and convenience functions for taxonomies

- site admins can update taxonomy libraries
- list taxonomies / view indvidual ones (with all resolved tags)
- create tags manually if a taxonomy is enabled
- view related tags / events quickly from the Taxonomy view

What doesn't work:
- Users still cannot choose a tag from taxonomy lists (this will be the main functionality)
- Feature cannot be disabled
 2015-11-24 03:27:14 +01:00
iglocska c5ef4e1d2d update to the gitignore 2015-11-23 19:45:44 +01:00
iglocska 71cbaefae3 Removed nested gitignores 2015-11-23 19:44:57 +01:00
iglocska ba8728abb9 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
	app/Controller/Component/IOCImportComponent.php
 2015-11-22 17:53:08 +01:00
iglocska 97f6da18da Added file as an option when a url like google.com is recognised 2015-11-22 17:50:22 +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
iglocska 74ab203fda Memberslist now links to the organisations 2015-11-21 23:55:48 +01:00