Commit Graph

652 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 ba300fcf11 Added option to download CSVs of non published events
- automatically overrides IDS flag too
2016-02-08 17:45:13 +01:00
Iglocska 1ffa52e032 Fixed the progress bars on the export view, fixes #902 2016-02-03 11:55:05 +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 12e32d4673 Correlations on the event index, first implementation 2016-01-30 19:26:47 +01:00
Iglocska d3d2c8a46f Flash message if the current user can accept/discard proposals on the currently viewed event 2016-01-28 15:40:32 +01:00
Iglocska 9580583b8a Fix to the download as... -> CSV export
- incorrect parameter passed blocked CSVs from being exported when non IDS worthy attributes were meant to be included
2016-01-28 13:58:35 +01:00
Iglocska 1362cf40b7 Added org merge tool
- allows a site admin to merge all objects belonging to an organisation into another
  - this can be useful if duplicate organisations exist for example
  - the tool overrides the built in mechanism and should only be used if absolutely required
  - at the end of the process the original organisation is removed

- the tool generates 2 files that are dropped in the log directory of MISP
  - 1 contains a JSON with all the changed fields and the IDs
  - 1 contains an SQL script that allows an admin to revert the changes
2016-01-27 23:59:34 +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 921b42badf Use freetext import tool for proposals, fixes #871
- Added the ability to use the freetext import tool for proposals
2016-01-24 21:50:09 +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 a4987eb9bd Fix to a translation of the orgs to IDs in the event index filters, fixes #868
- it will now use the org name instead of the org ID
- also, orgs are now sorted alphabetically instead of by ID
2016-01-21 15:49:02 +01:00
Iglocska f0bf6b9339 Attributes not included in the .json / .xml views of an event, leading to attachments not being synchronised, fixes #862
- it looks like I've left off the attachment encoding for the REST event view
- Should be fixed now
2016-01-19 13:47:52 +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 1d089acc5b Fix to an issue with the quickfilters not working, fixes comment by ztormhouse
- invalid search on the org field, a remnant from 2.3
- didn't cause exceptions on migrated issues as the field isn't removed post upgrade
- throws an exception on fresh installations

- fix now correctly looks up organisation names matching the entered string and uses the result set to filter the events
2016-01-14 21:23:55 +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 17c09157a1 Fixed an issue where single event exports would fail
- event id not stored in the events array from the passed parameters
2016-01-12 12:29:55 +01:00
Iglocska 6bf683cac6 FIxed several issues
- some performance tuning for the restSearch API
- fixed an issue where overriding the contain parameters in the attribute fetcher would lead to an exception
- fixed an issue where accepting a proposal would try to copy the sharing group of the event incorrectly (it now simply gets set to inherit event)
- fixed an issue with the rest search API failing when some fields were not set
2016-01-08 11:10:02 +01:00
Iglocska 62b9f86517 Added tags to the CSV export, fixes #809 2016-01-05 23:50:44 +01:00
Iglocska 7c1e729524 Rework of the CSV export to include tags 2016-01-05 23:26:13 +01:00
Iglocska 52f429e3c7 Quickfilter added for users 2016-01-04 11:57:21 +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 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
Fafner [_KeyZee_] be3d35c014 Solving #786 2015-12-28 16:12:31 +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 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 a421b71443 CSV memory usage reduction on automation
- reduced the number of attributes at the cost of some additional processing time
- this should reduce very slow processing of large data sets
2015-12-23 01:20:41 +01:00
iglocska 000449ee81 Editing an event via REST would not capture the tags
- if a user is a tagger the tag should be created (if not existing on the current instance) and added to the event
2015-12-21 11:46:33 +01:00
iglocska cb42337f9b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2015-12-21 10:39:39 +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 2c8940359c Editing an event with new attributes fails because a new id is not assigned correctly, fixes #773
- the process of detecting and editing existing attributes did not account for a case where the uuid is not set for an attribute and therefore should be saved as a new attribute. Fixed
2015-12-19 16:03:53 +01:00
Iglocska 5a44d79013 Fix for an issue with event edits containing a new attribute and it not getting an ID as expected 2015-12-18 18:31:43 +01:00
iglocska 3a682faf01 Various fixes
- resolved a missing variable issue on event views with no posts fixes #753
- removed some obsolete code
- sorted tags on the event view when assigning one to an event by name, fixes #416

	modified:   app/Model/Taxonomy.php
2015-12-16 00:48:30 +01:00
Iglocska 0161612d94 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-12-14 11:59:23 +01:00
iglocska 4b115c8bfa Fixed an issue with the freetext importer where unsetting a duplicate value would not be reflected in the entry IDs
- this caused some attributes to be dropped from the end of the list
2015-12-14 11:50:37 +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 f1a54885ba Fixed the editing of sharing groups via event updates
- if a sync user adds / edits an event with a newer version of a sharing group
and the sync user is the local sync user of the SG or is an extender of the SG
then the sharing group will be updated

- valid changes:
  - Sharing group metadata changes
  - organisation detail changes (except uuid/name)
  - add / remove extend flag from orgs in the SG
  - add / remove all_orgs flag from servers in the SG
2015-12-14 00:03:45 +01:00
Iglocska 695e892d3c Fix to the event filtering on organisation
- org filters now accept org ID or org Name as parameter, fixing the sync filter

- Also, fix to saving sharing group IDs on sync edits on an attribute level
2015-12-13 17:20:40 +01:00
Iglocska 02143bbdc0 Capture the sharing groups of attributes on event edit 2015-12-12 22:51:32 +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 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 1f3bfc3d6a Org and SG fixes for issues that are breaking the functionality 2015-12-10 10:54:31 +01:00
Iglocska 79b2ae520e Further progress on the sync rework 2015-12-09 23:00:21 +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 fbd97df3ac Several fixes, among others fixes #748
- Double sanitisation when edditing an attribute/proposal comment removed
- Fixed an issue where an ip/resource was recognised as a CIDR notation IP range instead of a url
- Changed the flash message for publishing without e-mails to something less scary
2015-12-08 15:12:13 +01:00
Iglocska 1b46840f66 Merge artifact removed 2015-12-08 11:17:23 +01:00