Commit Graph

131 Commits (af92e29e3c3e7e08b37196d1e90e906229f53106)

Author SHA1 Message Date
Iglocska a05afbdd11 GnuPG.binary demoted to optional setting as it should be 2015-07-01 09:01:32 +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 3f215743f0 Complete rework of the ZeroMQ implementation
- python server running in the background doing the publishing
- MISP -> python script communication via redis
- configurable / controllable via the admin UI
2015-06-29 08:56:45 +02:00
Iglocska 3d2b8c3c10 Added pub/sub feature using ZeroMQ, fixes #540 and fixes #526
- by installing the requirements described in the update and the install instructions (ubuntu only for now, centos/red-hat versions to be tested and described), administrators can enable the pub/sub feature
- assign a port to the service via the interface
- each time an event is published, MISP will use ZMQ's PUB feature to push out a MISP JSON package using the "misp_json" prefix
2015-06-24 17:38:15 +02:00
Iglocska c120c5bdd3 Some merge issues resolved 2015-06-23 17:21:19 +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 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 3c6f73e41c Some further cleanup / refactoring 2015-06-10 13:01:36 +02:00
Iglocska 707140243a Updated the documentation to reflect the correct STIX / CyBox versions required
- Updated the admin tool to check the STIX / Cybox versions
2015-06-10 12:47:00 +02:00
Iglocska 47d02845d2 Added the option to use an alternat executable for gpg, fixes #498
- users can specify an alternate gnupg executable
- Since GnuPG2 is not compatible with the last stable CryptGPG version, there are 3 options for CentOS / Red Hat users:
  1. Don't use a passphrase for the server's PGP key
  2. Install the beta version of CryptGPG (1.4.0b4)
  3. Install GnuPG classic and point MISP to the executable

- This patch enables option 3, administrators can point MISP to the alternate executable in the server settings
2015-06-09 13:04:33 +02:00
Iglocska d4b72bd0cc Disablerestalert setting clarified and default set to true, fixes 511 2015-06-02 12:06:32 +02:00
Iglocska b467f0a9a9 Events without attributes are now blocked from pull/push, fixes #476
- Events published / pushed will now refuse to sync if the situation arises where no attributes would be eligible to be synced
- Events pulled that contain no attributes will be thrown away
2015-06-01 17:45:50 +02:00
iglocska ecf9facf07 Further progress 2015-05-25 20:54:10 +02:00
iglocska 3431d2cc0d Rework of the e-mailing, part 1
- Reworking the way e-mails are sent - all of it goes through a centralised e-mail method
- just pass the recipient, recipient encryption key collection, body, alternate body if the message cannot be encrypted, subject, reply to address and pgp key for reply to along and the method will do the rest

- encrypt if possible, check if sending without encryption is allowed, signing, adding attachment for reply to encryption key, using alternate sanitised body if it is enforced for accounts that cannot use encryption is all done in one place

- easy to maintain and expand with future changes (such as the S/MIME pull request on github)
2015-05-25 17:18:39 +02:00
iglocska 9b4974d394 Merge branch 'unencrypted' into hotfix-2.3.69 2015-05-25 10:25:25 +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 81bd84af11 Further progress, still rough around the edges
- server settings and validation work
- configurable template via settings
- configurable via API as well

- Also trying to define the structure for future Plugin settings
- The idea is to have them in a separate tab all prepended with the plugin name
- since this is not yet part of the future flexible plugin system, it is still kept in the main codebase, but the idea is to get the naming conventions ready for the future version
2015-05-19 15:25:45 +02:00
Iglocska 3abf1d0536 Progress on the sync
- Creating objects whenever necessary during sync (sharing groups, organisations, etc)
- it's still WIP, but time to sleep
2015-04-27 00:44:28 +02:00
Iglocska 6b43b94811 More changes to the sync
- pushes are now taking into account the push_rules and pull_rules fields
2015-04-26 20:13:34 +02:00
Iglocska 3e28f80f66 checkVersionCompatibility tool finished
- compares the local to the remote version
- creates log entries for mismatches / connection issues
- should be used for any server to server action
2015-04-26 11:40:54 +02:00
Iglocska ee3e2b0007 Version negotiation 2015-04-26 10:55:39 +02:00
Iglocska 38f50e3917 Finished the connection test tool 2015-04-21 00:31:43 +02:00
Iglocska 9f1d47b6bc Added connection test
- also a fix to checkAuthUser
2015-04-20 23:49:18 +02:00
Iglocska 3bbaae6439 New Server add / edit
- add the remote organisation while adding a server
- remote organisation can be chosen from the list of local or known remote organisations. Alternatively a new remote org can be created on the fly
- Several UI changes
2015-04-20 22:36:29 +02:00
Iglocska 00dd47ef5e Server moved to new org object
- relation added
- index updated
2015-04-20 15:12:36 +02:00
Iglocska 28069a0a0f Further work and some cleanup
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
2015-04-13 16:20:21 +02:00
Iglocska 06f8a9bbd6 Merge branch 'proxy' into hotfix-2.3.59 2015-04-08 22:36:13 +02:00
Richard van den Berg 2ccab722d7 Add proxy section to server diagnostics 2015-03-19 12:15:28 +01:00
Richard van den Berg 9e7ea8fe74 Add proxy support to SyncTool 2015-03-19 10:03:25 +01:00
Richard van den Berg 12dc5b6579 Make unpublished events private if MISP.unpublishedprivate == true 2015-02-05 17:16:40 +01:00
iglocska 1b4f2a6408 Password complexity definable by admin
- administrators can use a regex and a length setting to define password requirements
- old behavior used if left untouched
2015-01-27 10:41:43 +01:00
Richard van den Berg 886d36438e Do not send details of events unencrypted 2015-01-27 09:26:25 +01:00
iglocska 6b6c62bd53 Fix to the new sync issues since 2.3.39, fixing #365
Incorrectly trying to look up authenticated user in the model fixed
2015-01-15 13:46:11 +01:00
iglocska cedaac360a Fixes to the scheduled tasks and some documentation issues
- Scheduled pulls should work correctly now
- Scheduled pushes and pulls correctly display in the logs
- Scheduled caching correctly sets the next date of execution
2015-01-12 17:35:08 +01:00
iglocska 71d36b9c64 Several issues fixed
- MYSQL.sql file now correctly includes the task entries
- GenerateCorrelation admin task is now a background job
- Organisation of events pulled now get the org in the server object as the owner instead of the one who initiates the pull
- Small fix to wrapping text in the pivot graph
2014-11-27 14:47:13 +01:00
iglocska 9fae7a2193 Alternate event org display
- shows both orgc and org to normal users
- naming convention changed (orgc => source org, org => member org)
- this should allow users to see if an event was generated on their instance or not.
2014-11-25 13:21:25 +01:00
iglocska 4568589044 File management added and various small changes
- Important! Logo images have now moved to a different location! Make sure that you update your settings!
- Site admins can now manage the uploaded image files and the terms of use file via the server settings interface
- add, link, delete files directly from the interface
2014-10-29 15:20:30 +01:00
iglocska 15fa296fdb Update to the terms and conditions
- use terms file as before if nothing else specified
- specify a file in the app/files/terms directory via the server settings tool
- specify whether to show it inline or create a download link for users instead
- by default everything is the same as before, except that the MISP installation path is no longer exposed by a non-existing terms file
2014-10-28 15:11:40 +01:00
iglocska 6d73409b90 Version check tool added
- check the latest tag on github and compare it to the local version
- from here on all hotfix, minor, major releases should be tagged apropriately.
2014-10-27 16:03:43 +01:00
iglocska 06ef98af40 Another change to the baseurl check 2014-10-02 11:06:08 +02:00
iglocska 0e2d8e9a55 Update to the baseurl check in the health tool
- https was checked incorrectly before
2014-10-02 11:00:30 +02:00
iglocska 5f69830d0b Incorrect naming fixed 2014-09-15 12:33:21 +02:00
iglocska eac25e3d3a Added the option to take ownership of an event uploaded via the Add MISP XML button
- server setting has to be enabled to allow for this
- can cause issues if the event gets synchronised with an instance that has a different creator organisation for the same event
- it is recommended not to use this, but in some cases it can be very helpful - the setting for it in the configuration is called MISP.take_ownership_xml_import
2014-09-15 12:30:26 +02:00
iglocska fc806b8919 Some missing tests added 2014-09-11 17:28:57 +02:00
iglocska b69e51e867 No feedback from the failed numeric test for incorrect server settings 2014-09-11 13:02:38 +02:00
iglocska b178358f2a Default config.php added 2014-09-10 11:48:48 +02:00
iglocska 2521106254 Reworked the server settings for boolean settings and settings that have a few options as values.
- Toggles instead of free-text
2014-09-10 10:37:58 +02:00
iglocska 79127902b7 Cleanup, MISP health tool
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
2014-09-10 09:43:22 +02:00
iglocska 7dacf1c8e7 Fix to the push failing 2014-08-15 12:06:37 +02:00
iglocska bd6b206ac5 Further work on the sync
- changed the pull implementation for proposals
2014-08-14 11:33:33 +02:00
iglocska 77971d97db Publishing now also pushes proposals
This is especially important to push deleted proposals once a proposal has been accepted
2014-08-13 14:29:39 +02:00
iglocska 0a10844dec Work on the proposal sync for push - from the sender's side 2014-08-13 10:47:39 +02:00
iglocska 9799c1d9dd More work on the sync fix 2014-08-12 17:25:09 +02:00
iglocska 6bca13b3e5 Further work on the sync fixes 2014-08-12 15:35:32 +02:00
iglocska 8b16f0cf18 Push now also only does a differential push
- send uuids of events to be pushed together with timestamps to the other instance
- other instance removes events that are already up to date or locally created from the array
- sends the remaining uuids back
- first instance initiates the push of events that were not filtered out
2014-08-12 11:54:00 +02:00
iglocska 1bbf678f70 Further changes 2014-08-11 16:26:49 +02:00
iglocska 8fc85f95b9 Fixes with the synchronisation
- background pulls fixed
- now correctly logs changes
- now correctly updates attributes
2014-02-25 12:27:20 +01:00
iglocska e06c4b9299 Incremental pull and fixes to pulling shadow attributes
- during the event id pull, the local server already checks the timestamps, removing the ids of events that are not newer than the local version
- this results in only the event metadata being pulled for all events, and the attributes of only those events that need to be updated are pulled resulting in much quicker pulls

- Fixed an issue with proposals that got pulled not finding the attribute that they are proposals to (for proposals that belong to an attribute)
2014-02-20 17:28:39 +01:00
iglocska 70c7f650f6 Changes to the logging and scheduling
- Scheduled tasks for pull / push now working as intended
- Rescheduling of all tasks fixed
- protection against the rescheduled task ending up in the past

- further event history fixes
- fixed lots of erroneous logging
- performance improvement with logging (no longer loading controllers for no reason)
- logging extra actions that weren't logged before (proposal accept / discard, server pull / push)
2014-01-29 15:52:09 +01:00
iglocska c10d3e9b95 SSL certificate changes
- you can now upload a certificate file and allow a server link to use a provided self signed certificate. This should solve the issues that some organisations are having when trying to connect their instances
2014-01-16 08:47:25 +01:00
iglocska cbcd7ac625 Some small fixes
- Corrected some weak notifications on background jobs
- Changed the view slightly to view background jobs
- fixed an issue where editing a sync server setting would cause an error due to the id not being passed to the logging plugin
2014-01-07 11:08:21 +01:00
iglocska c6fd29fb29 Several features
- Sync for background jobs (pull + push)
- more e-mailing delegated to background jobs
- A bunch of bug fixes and minor changes
2014-01-06 05:15:47 +01:00
noud eff2f77126 trim
use the TrimBehavior on all inputable models.
2012-11-29 09:35:57 +01:00
noud be472df5b5 trim
add TrimBehavior to use in Servers and lateron in Attributes.
2012-11-26 15:34:54 +01:00
noud fb41a0c2ca validation
trim all string fields in server.
(later bring this to AppModel or behavior level)
2012-11-26 12:19:06 +01:00
noud 016df03ba7 sync
validation on server.authkey having minlenght of 40 like user.authkey.
2012-11-20 17:18:16 +01:00
noud 8f3d624c1a Merge branch 'master' into develop
Conflicts:
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Attributes/edit.ctp
	app/View/Attributes/index.ctp
	app/View/Elements/actions_menu.ctp
	app/View/Events/add.ctp
	app/View/Events/index.ctp
	app/View/Events/view.ctp
	app/View/Events/xml/view.ctp
	app/View/Servers/index.ctp
	app/View/Users/admin_index.ctp
2012-09-24 16:02:01 +02:00
noud 113b445bcf Better placement of plugins (touching RBAC & Audit log)
If it's just an existing behavior or lib,
place it in a plugin directory structure in <cydefsig>/plugins.

If there is a need to change an extern existing plugin,
extend the existing plugin by a new plugin in <cydefsig>/app/Plugin.

This way there is a very clean devision between own and external code.
The external code can be updated without touching own nor changed code.
2012-09-20 11:34:41 +02:00
noud 94a367c2f5 CakePHP Coding Standards
http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html

Eclipse:
Window->Preferences
	General->Editors->Text Editors
		Displayed tab width:	4
		Insert spaces for tabs	NOT
	PHP->Code Style->Formatter
		Tab policy:	Tabs
File->Convert Line Delimeters To->Unix [default]

http://mark-story.com/posts/view/static-analysis-tools-for-php
for instance:
phpcs --standard=CakePHP app/Model/

Not yet done is all camel caps format.
2012-09-18 15:30:32 +02:00
noud 253d8e1b58 Merge branch 'master' into develop
Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/View/Events/view.ctp
2012-09-17 13:02:53 +02:00
Christophe Vandeplas 35e1a455cd further cleanup of logo improvement 2012-08-31 10:45:54 +02:00
noud 4ae71fc963 Sync.
Sync worked, but we did not know what to do with user_id and org.
Now, on sync, anonymize the user_id, get the Server.organization and put
that into Event.org.
And, display owning flag if Event.user_id or get the Server.logo
belonging to Event.org (=Server.organization) when Event.user_id is
empty (=0).

To this there is organization name and logo in bootstrap and
other organizations names and logos in Servers.
2012-08-28 15:36:14 +02:00
Andrzej Dereszowski 3ff180e898 Merge branch 'develop_0.2.2-0.2.3' into develop
Conflicts:
	app/Config/Schema/schema_0.2.2.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/README.txt
2012-07-24 16:09:48 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
root b4558887ce Revert "Audit and ACL first cut."
This reverts commit 5818231f48.
2012-06-26 09:40:52 +02:00
noud 5818231f48 Audit and ACL first cut. 2012-06-25 15:54:52 +02:00
Christophe Vandeplas 2d335f5dbe cleanup of comments and todos
minor memory performance improvement
2012-06-11 11:01:58 +02:00
Christophe Vandeplas 747c211723 auto-upload when publish event 2012-05-25 09:31:14 +02:00
Christophe Vandeplas 9e9837d59d Basic sync push seems to work 2012-05-03 14:32:49 +02:00
Christophe Vandeplas a45b70bc8d Add, edit, delete and (basic) Manual Sync server functionality added 2012-04-04 20:22:22 +02:00
Christophe Vandeplas aa8ba55dac First experimental test of importing events from a remote server.
Only new events are imported.
2012-03-31 19:06:43 +02:00