Commit Graph

459 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 5c1a5fad75 Fixes to the event downloads / APIs
- download event as JSON now has the option to include attachments
- switched to using the restsearch api instead of the deprecated /events/xml API

- added attachment inclusion to both restsearch apis

- fixed some bugs with the API
2016-02-09 15:43:09 +01:00
Iglocska cf62635655 Default threat level setting for instance added 2016-02-04 14:19:41 +01:00
Iglocska d6c0b6d853 Fixes to several permission issues with the e-mailer
- contact e-mail recipients were incorrectly set resulting in the e-mails landing at the wrong recipient
- disabled users were not excluded from certain e-mails
2016-02-02 15:30:23 +01:00
Iglocska 7f97a49b45 Reverted the automation change 2016-02-01 15:16:32 +01:00
Iglocska 5074ee948f Merge branch 'update_script' into 2.4 2016-02-01 15:13:55 +01:00
Iglocska 12e32d4673 Correlations on the event index, first implementation 2016-01-30 19:26:47 +01:00
Iglocska 3280338205 Added the option to override attribute creation in the freetext import tool for site admins
- site admins can now choose to create proposals instead of attributes via the freetext import tool via a checkbox
2016-01-25 02:01:59 +01:00
Iglocska 98c1aadfa4 Fix to a bug allowing regular users of the owner organisation to edit/delete a synced event as discovered by @h122015
- requirements for the actions changed from an org_id match to an orgc_id match
2016-01-15 11:43:37 +01:00
Iglocska 52f429e3c7 Quickfilter added for users 2016-01-04 11:57:21 +01:00
iglocska fea225c409 Rework of the contributor field, some MYSQL.sql tweaks
- added indeces to the MYSQL.sql file
- contributors now looks for shadow attributes instead of log entries (should make the event view much faster and resolve some timeout issues on sync when the log is massive)
2015-12-27 19:00:35 +01:00
iglocska f963f8d7d8 Fixed a menu and some cleanup
- Freetext import was loading the wrong menu
- some leftover profiling code removed
2015-12-21 10:37:45 +01:00
Iglocska 1f3bfc3d6a Org and SG fixes for issues that are breaking the functionality 2015-12-10 10:54:31 +01:00
aaronkaplan 32344f3bee Merge branch 'master' of https://github.com/MISP/MISP 2015-12-07 14:23:46 +01:00
Iglocska d433618c71 Also, enabled the filtering on pull
Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/Server.php
2015-12-03 00:27:56 +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 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
aaronkaplan 53b74f722c fixed the documentation (automation) page. The JSON URL was wrong 2015-11-27 19:36:25 +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 043057f133 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 15:13:55 +01:00
iglocska b59ab5cd8b Added logo to organisation page 2015-11-17 08:52:24 +01:00
iglocska 332d5fa666 Reverted the sanitisation of the baseurl variable on the view level
- sanitising it in appcontroller instead
2015-11-17 01:17:10 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
2015-11-17 00:33:34 +01:00
iglocska 1c6f45de52 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
2015-11-12 09:26:29 +01:00
iglocska 324418dcf9 Merge branch 'master' into 2.4-beta
Merge and upgrade of several new features

Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Controller/TagsController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
2015-11-08 23:26:19 +01:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05:00
iglocska 4b24cf0c65 Documentation changes 2015-10-31 00:29:15 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
2015-10-30 13:39:12 +01:00
Iglocska 059a8aa43a Added API for proposals
- APIs for the following actions:
  - Add new proposed attribute to an event
  - Add proposed change to an attribute
  - View a proposal
  - Accept a proposal
  - Discard a proposal

- new APIs described on the automation page
2015-10-28 23:32:30 +01:00
iglocska a59a68366a Damn d3.js... Finally it doesn't bug out. 2015-10-19 02:00:39 +02:00
iglocska e63d10f0d4 Various bugfixes 2015-10-18 23:10:25 +02:00
iglocska 96c6ac8487 Fixed the index view to include the new objects in json view 2015-10-18 21:11:34 +02:00
Iglocska 94963852e2 Fixed an issue with ajax forms 2015-10-17 01:06:58 +02:00
Iglocska 5007388c1d removed debug 2015-10-14 03:47:20 +02:00
Iglocska 888042dbd6 Added the first version of the correlation graphing
Conflicts:
	VERSION.json
2015-10-14 03:45:34 +02:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
2015-10-12 09:41:20 +02:00
Iglocska e242c9add2 Set of changes to the sync
- finished preview feature
  - can now view events and attributes remotely
  - can copy over new event to local instance

- new sync mode (update)
  - allows to only pull changes to events that exist locally already
  - works well with the manual pull of events, no need to pull events that we didn't manually confirm, but can still update all events that we pulled over

- Fixed an issue with background tasks causing the logging to fail

- reworked connection test showing version numbers of both instances
  - also telling the admin whether the sync is compatible or not

- Further refactoring / tweaking of the vent view
2015-10-06 01:16:48 +02:00
Iglocska 6bcf104724 Progress on several features
- implemented a custom pagination tool for data sets that are not directly taken from teh db
  - currently creates a pagination object that mocks CakePHP pagination
  - supports the CakePHP pagination view helper
  - supports: pagination, sorting, custom filters

- implemented first step of the remote instance browser for admins
  - view an index of events on another instance
  - filter the events
  - uses the new pagination

- still missing:
  - remote event view
  - fetch event from remote instance

- reworked the event view
  - separated API and UI code path
    - major speedup for the API!
    - cleaner code as there was almost 0 overlap
  - discussions and attributes are now loaded separately from the event view
    - added after the event view loads via ajax
    - cleaner pagination
  - attribute pagination now finally allows for sorting
    - future improvement (coming soon): Show proposals only filter
    - filtering on the attributes in general
2015-09-29 02:54:25 +02:00
iglocska 6fa13b4ad0 Fix to the text export ignoring the rule to exclude unpublished and non-IDS flagged data, fixes #646 2015-09-18 10:53:03 +02:00
Iglocska b6857b4743 fix to a display bug on the event index when short tags are used 2015-09-10 16:21:16 +02:00
Iglocska e1a95c62b0 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Attribute.php
	app/View/Users/statistics.ctp
2015-09-10 15:02:44 +02:00
Iglocska 2902c96f3c Merge branch 'hotfix-2.3.125' 2015-09-10 00:41:32 +02:00
Iglocska bc06362d19 Fixed XSS in several views
- reported by Roberto Suggi Liverani from NCIA
2015-09-09 19:26:06 +02:00
David André a07346cfa2 Added comment in text export paragraph that
non IDS flagged attributes are also exported by default.
2015-09-09 17:07:03 +02:00
Iglocska 8685e93e22 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Tag.php
	app/files/scripts/misp2stix.py
2015-09-02 10:26:56 +02:00
Iglocska 809ac8f88b Merge branch 'master' of https://github.com/MISP/MISP 2015-09-02 10:21:46 +02:00
Iglocska 62532260ef Addition to the previous commit 2015-09-02 10:18:08 +02:00
Iglocska 77adf624d9 Fix to a reflected XSS in the event choice 2015-09-02 09:57:59 +02:00