Commit Graph

625 Commits (9e3e362ea6424a4e74c83e65f304faefe1d3a4b3)

Author SHA1 Message Date
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
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 39945ca39e Fixes to the logging
- in some places MISP tried to save the org ID instead of the org name in the logs

- fixed
2015-12-03 10:20:29 +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 7763b63dc2 Junk left in the previous commit 2015-12-02 22:12:54 +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 864298e9e5 Fix to an incorrect call on sending out alert emails on edit 2015-12-02 01:15:43 +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 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 0fb9a70449 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-11-20 00:15:17 +01:00
iglocska 56adab6122 Bugfix pack, fixes #724, fixes #721
- Fixed an issue with the new UUID generation method call in OpenIOC
- Fixed an invalid validation check on the salt key

- Added a note on the server page to make it more obvious that values can be changed by double clicking them
2015-11-19 16:50:14 +01:00
iglocska 866641fb40 Fixed an issue with the blacklists not saving the event org 2015-11-17 00:47:51 +01:00
iglocska 8cc0996c3c Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
2015-11-14 17:16:38 +01:00
iglocska afdcc1af0c Fixed a security issue with the CSRF protection being avoidable using some site admin functionality
- as discovered and reported by Egidio Romano of Minded Security

- Lacking checks of HTTP methods in some functionality could lead to a site admin uploading and executing malicious scripts

- Tightened HTTP method verification across the board for actions that modify data
- Turned some administrative tasks to POST only actions
2015-11-13 23:57:03 +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 9f85c40145 Fix to a security issue
- as reported by RichieB2B
- Trying to view an event that doesn't exist and one that the user has no access to resulted in different error messages
2015-11-10 15:18:33 +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 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 04a4738c1c Fix to loading the correct logos in the graph view 2015-10-19 07:27:20 +02:00
iglocska 593f166386 Fixed an issue where orgs without a logo would not have the placeholder logo shown on graphs 2015-10-19 00:23:29 +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