Commit Graph

317 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska cf62635655 Default threat level setting for instance added 2016-02-04 14:19:41 +01:00
Iglocska b8591674ef Further fixes to the contact e-mail 2016-02-02 18:19:09 +01:00
Iglocska 85ae360324 Fix to the e-mail contents of the contact message 2016-02-02 17:53:30 +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 3560b3bc06 Fix to the initial version of the correlation on the event index
- also removed an expensive lookup of sharing group permissions required for event views utilising the pagination from being run on actions that do not make use of it
2016-01-31 00:32:17 +01:00
Iglocska 12e32d4673 Correlations on the event index, first implementation 2016-01-30 19:26:47 +01:00
Iglocska 543782b6a5 Fixed a bug that caused the "last" parameter in automation to fail 2016-01-26 09:55:27 +01:00
Iglocska 2b9887cd42 Show event owner in the alert e-mail, fixes #361 2016-01-24 21:17:08 +01:00
Iglocska 7e12f3b693 Cleanup of loading attachments into the data fields of event data views
- was done inconsistently between attributes and proposals
- adding it via the fetchEvent method instead of the controller action
2016-01-22 09:24:13 +01:00
Iglocska 7d1cb4a7fa Fixed an issue with the visibility of proposals to attributes
- proposals to attributes didn't adhere to the visibility of the attribute
- users that were allowed to see an event but not a specific attribute could see proposals to the attribute
2016-01-20 09:33:55 +01:00
Iglocska 038d12a4c0 Fix to an issue with the XML cleanup method
- lead to the XML REST add failing
2016-01-19 15:42:57 +01:00
Iglocska 0eb1a0baa4 Reverted a change that leads to the pull failing 2016-01-15 19:44:18 +01:00
Iglocska a9c07371ca Fixes to the proposal system
- proposals were not synchronised during pulls due to a bug
  - affects both 2.3 and 2.4, the bug comes from the switch to json
  - missing JSON view for proposal interface
  - Also, 2.4->2.4 the organisation objects were incorrectly ommited from the sync
  - Fixes:
    - reverted back to XML for the old style proposal exchange
    - 2.3->2.4 is now fixed
    - 2.4->2.4 below 2.4.7 version will still not synchronise proposals on pull

- Proposal pull reworked
  - requires 2.4.7 on both ends or higher
  - proposals are now synced in one go
  - massive increase in speed and reduction of log entries

- Proposal e-mailing reworked
  - tied into the new 2.4 e-mailer, which was left out on 2.4's release by accident
  - triggers correctly now when a proposal is added (also on pull)
2016-01-14 02:46:10 +01:00
Iglocska d04e583dd6 Order attributes by UUID for the CSV export, fixes #849 2016-01-13 11:35:25 +01:00
Iglocska 5306351c00 Added proposals to the event view attribute filters and fixed some descriptions, fixes #828, fixes #827, fixes #821 2016-01-07 17:53:22 +01:00
Iglocska 62a20a2321 Fixed an issue where an event's sharing group ID would get set to the first available option even when a non sharing group distribution level is selected 2016-01-07 16:33:35 +01:00
Iglocska da57e038c0 Some cleanup 2016-01-05 23:53:23 +01:00
Iglocska 62b9f86517 Added tags to the CSV export, fixes #809 2016-01-05 23:50:44 +01:00
Iglocska 5d7aa73e27 First version of the quick filters for the event view 2016-01-04 10:23:07 +01:00
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