Commit Graph

226 Commits (af92e29e3c3e7e08b37196d1e90e906229f53106)

Author SHA1 Message Date
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 3cc3b4f34d fixed too restrictive generateCorrelation attribute fields 2015-11-20 01:21:44 +01:00
iglocska db359170f6 some left over merging issues among other things 2015-11-17 22:01:22 +01:00
iglocska 866641fb40 Fixed an issue with the blacklists not saving the event org 2015-11-17 00:47:51 +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 3716b38a60 Bin number added to validation 2015-11-09 13:42:22 +01:00
iglocska cd886b4a79 Relaxed financial attribute validation
- also added 2 new types: bank-account-nr and aba-rtn
- validation is completely relaxed
- idea is to add a visual notification in the view for these attributes types if they are not valid (invalid financial indicators are still interesting)
2015-11-09 12:36:49 +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 ef1d3949e7 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
2015-10-22 09:59:00 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
2015-10-21 23:44:07 +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
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 14188f1367 Fix to a new bug introduced with the correlation engine
- an attribute could correlate with another attribut of the same event
2015-09-16 15:34:00 +02:00
iglocska 26e640e19c Further progress on several issues 2015-09-16 12:15:43 +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 e7b54c2c61 Fix to a serious bug with adding attributes via the API and performance fixes
- due to a bug, setting an attribute ID in the /attributes/add API call can lead to overwriting an existing attribute

performance improvements:

- massive improvements to the correlation performance
- improvements to the attribute validation process
2015-09-07 10:06:34 +02:00
Iglocska 43c2290097 Enhancements to the reportValidationIssuesAttributes action
- now also shows issues not related to the value field
- takes an optional parameter to validate a single event's attributes
2015-09-03 10:58:54 +02:00
Iglocska 3fb7764c00 First revision of the upgrade scripts
- .sql file to add all the new fields / tables
- admin tool to convert the old organisation fields to the new objects
- still missing a cleanup method (to remove the old organisation fields once the conversion is done)
2015-09-02 01:34:52 +02:00
Iglocska 186452cd5b Further progress 2015-08-31 02:32:37 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
2015-08-30 13:29:05 +02:00
Iglocska 556688069a Resolved an issue that can lead to duplicate events showing up in MISP
- UUID uniqueness was previously not enforced
- changed the MYSQL.sql file to reflect the changes
- Added upgrade admin tool to remove duplicate events and make the database changes required
- Tweaked the tool for the attribute uuid fix so that it cannot created duplicate keys

- some minor fixes, such as automatically removing eventTag objects on event deletion
2015-08-25 10:32:26 +02:00
iglocska a93807439d Several bigger changes
- new functionality: Event blacklisting by UUID
  - site admins cna enable this feature in the server settings
  - enabling the feature will make the required db changes
  - any deleted event will automatically get blacklisted
  - this prevents deleted events from flowing back from a synced instance
  - site admins can manually add UUIDs to the list and remove entries

- fix to UUID duplication issues for attributes
  - simply run the admin script and it will regenerate the UUID of attributes that are duplicates, if any such exist
  - timestamps/event published status will not be affected

- config.core.php now includes a change that prevents from 404 exceptions being logged
  - the sync uses 404s to signal that an event with a given uuid does not exist when negotiating proposal synchronisation
  - this causes a dangerously high amount of noise in the logs
2015-08-17 16:10:10 +02:00
Iglocska 5273c2c5aa New functionality: API to download sample by hash
- simply pass an MD5 hash along and receive a sample if available zipped and base64 encoded in a response object
- pass any hash along with a flag set and receive any samples from events that have the passed hash

- Also, fix for an issue with the freetext import not using semi-colons as separators
2015-08-07 12:04:44 +02:00
Iglocska 7db6e9ac47 A list of changes to the way attachments are uploaded, fixes #559, fixes #482
- new API for uploading malware samples
  - allows the upload of several files
  - can be used to populate a pre-existing event, or create a new event
  - expects a JSON or an XML object with the samples base64 encoded
- new way of storing malware samples
  - original filename not used any longer
  - samples are renamed to their md5 hashes
  - original filename preserved in a secondary txt file
- removed filename validation as it is no longer used for the command line execution
  - this allows unicode name files to be uploaded!
  - changed the UI attachment upload to reflect these changes
  - code more centralised and extendible
2015-08-04 02:00:21 +02:00
Iglocska 00005bca97 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
2015-07-22 19:30:45 +02:00
Iglocska 616629e9b5 Fixed an issue with the NIDS export not correctly working for single events 2015-07-22 19:27:56 +02:00
Iglocska 47cc0e4d18 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
	app/Model/Event.php
2015-07-22 18:04:02 +02:00
Iglocska 684be69ed0 Incremental export generation for HIDS and NIDS exports
- Instead of fetching all events at once for the export, events are fetched one by one
- Greatly reduces memory footprint (It mostly depends on the event with the most eligible attributes now, instead of the combined list of all events)
- Because of the lower memory usage, the time taken for the export is also slashed to a fragment of what it was before
2015-07-20 16:25:16 +02:00
Iglocska 93f9a01c87 Changes to the hids exports
- fixed some issues with unset variables (from, to, last) when triggered by the background workers
- reduced memory usage of the hids exports (removed storing the hashes twice in memory, drastically removed the data retrieved from the db when preparing the export)
2015-07-17 10:50:50 +02:00
Iglocska f1a5ba52e5 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
2015-07-08 14:02:54 +02:00
Iglocska e706562cd5 Fixes to the RPZ export based on the testing of elhoim
- some errors in the format (wrong comment character used, rpz-ip not appended to IP addresses, missing semi-colon)
- removed hostnames that are on domains blocked by the rules based on domain attributes
2015-07-07 14:42:28 +02:00
Iglocska 038ccd99bd Work on the new attribute types 2015-07-06 18:19:51 +02:00
Iglocska 0481e6eb02 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ServersController.php
	app/Controller/ShadowAttributesController.php
	app/Controller/UsersController.php
	app/Model/Event.php
	app/webroot/js/ajaxification.js
2015-06-29 14:27:16 +02:00
Iglocska ae0e1aeacb Merge branch 'feature/rpz' into hotfix-2.3.86
Conflicts:
	app/Console/Command/EventShell.php
	app/Model/Server.php
2015-06-23 17:19:08 +02:00
iglocska a0afab66a7 Various changes and bug fixes
- contact reporter first tries to contact orgc users on the instance, if they don't exist, it will contact the owner (instead of going straight to the owner)
- hostname / domain name validation change broke validation of hostnames/domain names / email addresses with a "-"
- Some documentation changes for the REST API (more coming)
- some tuning of the freetext import
2015-06-18 14:49:25 +02:00
iglocska 3d51e34386 Small tweak to the email/domain/hostname validation, affects #551 2015-06-17 10:31:25 +02:00
iglocska 5820d899c0 Relaxed validation of tlds in domain/hostname/email-src/email-dst attributes to allow for longer custom tlds 2015-06-16 16:34:15 +02:00
Iglocska c73f71f243 Merge branch 'master' into feature/sg
The merging is complete

Conflicts:
	VERSION.json
	app/Console/Command/ServerShell.php
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/PostsController.php
	app/Controller/UsersController.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/Users/admin_index.ctp
	app/webroot/js/ajaxification.js
2015-06-10 22:54:20 +02:00
Iglocska 822172d425 Fixes to the e-mailer and the HIDS export
- HIDS exports did not include filename|hash types
- Sending a password reset / welcome message picked the opposite subject line
- line breaks were sent as literals.
2015-06-10 09:50:38 +02:00
Iglocska 71635b00a1 Added a new API parameter that allows to restrict events to the most recently published ones, #527
- added the new flag "last" to the list of parameters
- exports affected: XML, CSV, NIDS, HIDS, STIX, Text, RestSearch
- Valid values: number + format where format can be d, m, h for day, minute, hour (examples: 5d or 12h or 30m)
2015-06-06 20:00:57 +02:00
iglocska dedc9f5ef2 First revision of the RPZ export complete
- documented in automation view
- right now it follows the simple rule of user > admin settings > default values when generating the export
- Parameters can be passed via url / JSON object / XML object
- filters include filter on event ID, date range, tags

TODO:
- buttons for a per event download via the UI
- introduce new export option for normal users (via background workers and the old style export)
2015-05-20 15:04:41 +02:00
iglocska 99f79ec318 First version of the RPZ export
- still undocumented
- very naive policy settings
- limit per event / tags / date range
2015-05-15 14:58:53 +02:00
Iglocska c24704a6c2 Lots of progress
- further work on implementing the SG changes everywhere
- reworked the alert e-mails
- reworked a lot of the logging
- several convenience methods
2015-04-20 11:46:55 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
Iglocska 5340abed2e Sharing groups correctly selectable in attributes
- still needs work
2015-04-14 18:11:51 +02:00
Iglocska 1e3db8a8ba Further work on the new version
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
2015-04-14 17:51:38 +02:00
Aaron Kaplan 782be3bd0b Merge branch 'master' of https://github.com/MISP/MISP 2015-04-14 15:38:52 +02:00