Commit Graph

297 Commits (f580dc2ecec9224601b1a462e6688b4d6a266bba)

Author SHA1 Message Date
Iglocska bc85591757 Fixes to the CSV export 2015-12-31 09:56:32 +01:00
Iglocska 6ea6addb16 Add today's date as the event date field if not set 2015-12-30 11:20:04 +01:00
Iglocska 007b4dbfae Fixes to some of the exports, fixes #798
- Fixed a typo that prevented the event level parameters to be used in the CSV export
- Fixed an issue where adding the contextual info in a CSV could lead to an invalid CSV if an event info field had a linebreak in it
- Tuned the performance of time based filtering (until now it would lookup events that should have been excluded in the first place, only to throw them away after the lookup again)
2015-12-29 20:04:26 +01:00
iglocska 9e3e362ea6 Fixes a bug on invalid event IDs passed to the STIX export causing long execution times, fixes #747
- Running a stix export for a specific ID that doesn't exist results in a full STIX export for the user (events visible to the user)
- This leads for an unnecesarily long export process when a quick export is expected
2015-12-26 11:32:31 +01:00
iglocska 627f9abbd6 Fix to several issues with the sync and and an issue preventing the editing of events, fixes #788, fixes #784 2015-12-24 15:22:05 +01:00
iglocska 9b85428897 Event tags correctly saved on rest add if they are set in the compressed format (event->tag instead of event->eventtag->tag) 2015-12-22 11:27:27 +01:00
Iglocska 692ced8590 typo 2015-12-18 09:48:34 +01:00
Iglocska 85d22aa3a8 Missing subject added back 2015-12-18 09:44:25 +01:00
Iglocska cf119bc315 Fix to a previous merge issue with the e-mailer 2015-12-18 09:38:36 +01:00
Iglocska f8ad9a14fe Fix to the email target on publish 2015-12-18 09:17:57 +01:00
Iglocska b0e8214cbf Added some fixes to corner cases
- publishing an event when push is enabled to a 2.3 instance failed with an error instead of blocking
- publishing an event wth the remote instance blocking it due to a sync user sharing group conflict resulted in an exception, handled gracefully now

- Added mangle-sync towards 2.3
  - gracefully push non sharing group events in a 2.3 format
  - timestamps downgraded by 1 second - upgrading the 2.3 instance should automatically allow a resync of mangled events
2015-12-14 03:11:45 +01:00
Iglocska 225c48ce4b Merge branch '2.4-syncrework' into 2.4-beta
Conflicts:
	app/Model/Event.php
2015-12-14 00:26:27 +01:00
Iglocska 98756cdaa9 Extend field added to sharinggrouporg object on fetchevent 2015-12-12 22:49:19 +01:00
Iglocska 67fb8bfdcf Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework
Conflicts:
	app/Model/Event.php
2015-12-11 14:14:16 +01:00
Iglocska 73ab39aa26 Further fixes to the sync
- corrected the edit access rights for sync users with sharing groups
- Various fixes to the organisation sync and how creation / modification dates are transmitted
- Internal format differences compared to 2.3 causing mismatched field lookups fixed
2015-12-11 14:11:37 +01:00
Iglocska 26f75591d3 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-11 14:09:39 +01:00
Iglocska 55e66d7d74 Correct conversion of the own server before sync
- also a small fix to the event tags and unicode chars
2015-12-11 14:08:45 +01:00
Iglocska e103e84b21 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-10 13:30:22 +01:00
Iglocska 45b3eb25ec Only capture objects when adding an event via the API 2015-12-10 13:30:03 +01:00
Iglocska 7ac9b2c70a Further fixes on the sharing group sync 2015-12-10 13:28:58 +01:00
Iglocska f867301c35 Fixed the locked field not being set on push 2015-12-09 02:47:17 +01:00
Iglocska b40e0fdc7c Merge branch 'master' into 2.4-syncrework
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/ComplexTypeTool.php
	app/Model/Attribute.php
	app/View/Pages/administration.ctp
2015-12-09 02:00:23 +01:00
Iglocska af92e29e3c Further progress on the sync
- also, added maintenance mode
- various fixes
2015-12-09 01:43:54 +01:00
Iglocska 215bca0954 Fix to the download as failing due to an incorrect fetch to check if the event is visible to the user 2015-12-08 11:08:37 +01:00
Iglocska 24fc2399cc Further progress 2015-12-07 02:02:32 +01:00
Iglocska 3831ee2e90 Further work on the sync 2015-12-07 01:32:51 +01:00
Iglocska fa7fa322cb First stab at the push filters influencing the pull of a remote instance 2015-12-06 19:41:29 +01:00
Iglocska d66d26d383 Merge and rework of the thread pagination
- not complete yet

Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
2015-12-05 22:17:43 +01:00
iglocska 63ca467a0c Fix to a missing Log Model init causing an exception 2015-12-04 15:56:39 +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 0265e92486 Fix to a newly introduced bug that breaks updates of attributes via pulls 2015-12-02 00:46:41 +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
iglocska 61282db28e Fix to the ZMQ call on publish incorrectly passing data to the event fetcher 2015-11-20 03:53:46 +01:00
iglocska 866641fb40 Fixed an issue with the blacklists not saving the event org 2015-11-17 00:47:51 +01:00
iglocska 053c27ae9a Removed a crappy solution to an issue with attributes being overwritten that was fixed a long time ago correctly on data entry 2015-11-16 19:51:38 +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 620aab4e0e Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Event.php
2015-11-12 08:44:23 +01:00
iglocska 0d758de89b Fixed an issue where a linebreak in an event info would break the CSV export, fixes #710
- also added comment field for attributes
- until now multi line fields were both escaped and the line breaks removed
  - this was overkill, linebreaks are now kept intact
2015-11-10 13:45:40 +01:00
iglocska 34e4183854 Moved the logic for flagging an attribute for a validation issue to the model 2015-11-09 14:50:57 +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
iglocska c83b1e2dd0 Fix to the CSV export, fixes #710 2015-11-08 22:56:00 +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 e63d10f0d4 Various bugfixes 2015-10-18 23:10:25 +02:00
iglocska 479a3bfde4 Check if a tag is pushed with an event before trying to loop through the tags... 2015-10-18 20:57:20 +02:00
iglocska 37faddff62 Further progress
- rework of the push mechanism
- rework of the object capture on add
- rework of the sync filter UI
2015-10-18 18:03:48 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
2015-10-16 23:49:04 +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 dc638adac2 Upgrade to CakePHP 2.7, fixes #684
- cakephp submodule updated to 2.7
- make sure that you update your instance!

- not updating will not break compatibility
2015-10-09 15:59:25 +02:00