Commit Graph

392 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska b8591674ef Further fixes to the contact e-mail 2016-02-02 18:19:09 +01:00
Iglocska 176ad85b88 Rework of the scheduled caching jobs
- fixed a series of issues with the exports
2016-01-10 19:45:33 +01:00
Iglocska a06da3e90b Fixes to the first user initialisation
- updated the UserInit command line tool
- updated the built in user initialisation
2015-12-30 09:54:43 +01:00
iglocska 1f5f963bb6 Create cached export dirs if they don't exist, fixes #791
- until now it was assumed that the dirs are already created
- just create them if they don't exist
2015-12-28 00:03:52 +01:00
iglocska 79a074880f Invalid lookup of servers for the scheduled pull
- it was erroneously looking up servers that have push enabled instead of pull
2015-12-27 23:29:12 +01:00
iglocska 66a90cd60c Several fixes to the exports, fixes #790
- New generic fetch attribute method was mistakenly using the order field as a condition, resulting in some exports only displaying a subset of the data
  - the fix to this fixes the issue described in #790 for text exports
- Fix to the RPZ exports not working correctly
- Fix to the horrible performance of RPZ exports
- Fix to several background worker issues with exports
2015-12-26 02:50:50 +01:00
iglocska ba95648fa5 Fixed some background worker issues
- scheduled pulls would fail because of invalid user object passed
- invalid permissions checks / org checks would cause the RPZ export to fail when using background workers
2015-12-26 01:35:34 +01:00
iglocska 3061b37fc3 Fixed a serious issue with the snort/suricata export which would keep appending all eligible attributes over and over to the file instead of properly fetching them event by event resulting in a massive export file 2015-12-23 00:51:57 +01:00
iglocska 0a48ee2c44 Fix to the correlation peformance 2015-12-17 10:25:30 +01:00
iglocska ffe8dbb011 More fixes to the background correlation generation 2015-12-17 01:40:02 +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 714ed198e5 Various fixes throughout the application
- org field still used in some places other than the legitimate use-cases
2015-11-28 23:49:52 +01:00
iglocska db359170f6 some left over merging issues among other things 2015-11-17 22:01:22 +01: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 e242c9add2 Set of changes to the sync
- finished preview feature
  - can now view events and attributes remotely
  - can copy over new event to local instance

- new sync mode (update)
  - allows to only pull changes to events that exist locally already
  - works well with the manual pull of events, no need to pull events that we didn't manually confirm, but can still update all events that we pulled over

- Fixed an issue with background tasks causing the logging to fail

- reworked connection test showing version numbers of both instances
  - also telling the admin whether the sync is compatible or not

- Further refactoring / tweaking of the vent view
2015-10-06 01:16:48 +02:00
Iglocska 4a75b1d2b5 Fixed an issue where the recorrelation of all events would run into memory issues
- before the recorrelation admin tool would load all attributes into memory in one go
- now it loads them in chunks of 1k attributes at a time
2015-09-24 10:36:02 +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 d7bab21919 Left off shell script 2015-09-10 00:30:34 +02:00
Iglocska 3feeee920e Initialise first user via the command line
usage:

/var/www/MISP/app/Console/cake userInit -q

returns the created auth key or an error message if users already exist

The created account is an admin user, with the login being admin@admin.test / admin
2015-09-09 20:52:01 +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 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 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 b36c0da66a Timing for rescheduling of tasks changed slightly
- The rescheduling now happens before the task is executed - this way a failed job will not prevent the rescheduling of the next execution time
2015-06-03 23:49:37 +02:00
iglocska de50a99f44 Merge branch 'email-notifications' into hotfix-2.3.69 2015-05-25 10:24:04 +02:00
iglocska 2afea61ea0 Added the missing ways to exploit the rpz functionality
- rpz added to exports, both old-style and with background workers
- per event rpz functionality added
2015-05-20 16:23:42 +02:00
iglocska 644b0cd512 Password reset fix 2015-05-12 11:28:36 +02:00
Iglocska c44bee0e96 Further progress
- removed some junk
- more work on the background workers
- rewrote the correlation background job - should work correctly now and be a lot more memory efficient
2015-04-20 13:50:14 +02:00
Iglocska 93c2194e5f Some fixes to the background workers
- also added date tracking on jobs
2015-04-20 13:32:34 +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 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 e8bcab19db Background job for pull incorrectly checks the push flag on the server, fixes #457
- Issue fixed: When background jobs are enabled the wrong flag is checked when attemptying to enqueue a pull
2015-04-13 14:40:42 +02:00
Iglocska 5f70207051 Progress in moving all exports to the new distribution system 2015-04-13 12:42:26 +02:00
Iglocska 116bf8e425 Fix to an issue with the caching
- CSV caching was saving to file on each attribute, creating extremely high amounts of I/O
- reduced it to saving to file / event

- fixed incorrect pathing
2015-04-08 22:47:28 +02:00
Richard van den Berg fa112d77c3 Use correct CakeResque queues 2015-03-23 17:58:41 +01:00
Richard van den Berg 11052d85ce Fix posts alerts 2015-01-28 13:24:51 +01:00
Richard van den Berg 506e1fcb0d Send E-mail notifications for new posts in discussion and event threads 2015-01-28 13:24:51 +01:00
iglocska 2018f822ec Fixed a bug with the way scheduled syncs are logged 2015-01-27 10:42:31 +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 bfdeda99dc Further corner case fixed (shadow attribute to attribute, not event) 2014-11-14 11:59:38 +01:00
iglocska 01fd0b93ce Comments also sanitized 2014-11-14 11:28:42 +01:00
iglocska c67af817e0 Related events not correctly sanitized in the xml export 2014-11-14 11:15:52 +01:00
iglocska 7a31e03021 Added to the caching mechanism 2014-11-14 11:05:37 +01:00
iglocska 4b7e56a43c Fix to an issue with the CSV export
- missing linebreak after header row added
- fixed an issue with quotes in the value field not being escaped properly
2014-11-12 15:36:07 +01:00
iglocska 982727819b debug left in code 2014-09-02 16:13:22 +02:00
iglocska 5a993dc120 Changes to the exports, fixes #285
- XML export was slow, replaced SimpleXML with a simple script that outputs XML for massive performance gains
- New option in bootstrap to allow the cached XML export to also include the attachments
- CSV caching slightly rearranged, it's much more memory efficient now
- Some fixes to relatedevent orgs being shown even if showorg is disabled
- Added a new site admin action to generate several 3k events for load testing (slow)
2014-09-02 15:56:28 +02:00
iglocska 6ac105e132 Merge branch 'hotfix-2.2.32' into develop 2014-06-24 13:44:22 +02:00
iglocska b1dafb7057 Removed junk left in the previous commit 2014-06-24 13:43:13 +02:00
iglocska aab50a9c44 Update to the way xml files are cached 2014-06-24 13:19:40 +02:00
iglocska 291892be05 Merge branch 'develop' into features/ajaxification
Conflicts:
	app/View/Elements/img.ctp
2014-05-05 09:56:42 +02:00
iglocska dac1c2b17c CSV export now includes date for each attribute, fixes #255 2014-04-30 11:00:20 +02:00
iglocska 705964a556 First commit of the event view ajaxification
- pagination of the attribute index within the event view
- add attributes in a pop-up window
- instantly refresh attributes
2014-03-24 16:33:40 +01:00
iglocska 4865121b7b Fix to the csv export in the automation not allowing a full export ignoring ids flags 2014-03-24 15:30:49 +01:00
iglocska 1a777901b2 CSV exports have a new column: to_ids
- event level exports from the event view now export all attributes regardless of to_ids value

- to_ids value now has its own column in the csv exports
2014-03-13 15:23:29 +01: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 411c017707 Bug fixes
- issues with the way users were passed to the related event finder during a publish
2014-02-14 13:32:19 +01:00
iglocska 07c4536932 Fixed various things
- logging of event publishing enabled for background jobs
- disabled a gpg debug mode that was enabled by accident
- better feedback for publishing
2014-02-10 00:29:46 +01:00
iglocska 0e1bf5567f Various changes
- regexp structural changes added to the upgrade script (type)
- Added publish / alert to the background jobs
- fixed a misalignment with the statistics
2014-02-09 22:09:29 +01:00
iglocska bfc4a1a8d4 Further work on the upgrade scripts / description 2014-02-06 15:55:29 +01:00
iglocska 22c8105f58 Mass replace replace of the old CyDefSig name to MISP - fixes #82 2014-02-05 15:01:26 +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
iglocska 54b1b44080 More work on the background jobs
- added scheduler to the export caching
- site admins can set up the intervals of the automated caches, and the exact times at which they should be executed.
2014-01-03 15:26:35 +01:00
iglocska 0e744871bd Further work on the scheduled tasks
- Also some changes left off from the previous commit
2013-12-17 11:38:06 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
iglocska 48383fe25b Next version of exports done 2013-11-19 11:03:30 +01:00
iglocska 6015a6f201 Further work on the exports 2013-11-18 11:35:02 +01:00
iglocska d54793ffe6 Most of the export caching done
- also a fair bit of refactoring of the code, fatter models, thinner controllers, component moved to Lib
2013-11-15 15:39:34 +01:00
iglocska fcc7a66a55 More work on the background jobs
- Started work on the exports
2013-11-07 15:58:29 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska ade17b3214 Shell scripts updated to populate the ACL 2013-03-12 09:13:57 +01:00
Noud de Brouwer ce44cdb529 coding standards
this is to the new php53-pear-CakePHP_CodeSniffer-0.1.11.
2013-02-15 14:20:03 +00:00
Noud de Brouwer 48ad60eb61 GPG
start of check/correct.
2013-01-23 15:22:21 +00:00
Noud de Brouwer eb39796472 DB
clean up conversion.
2012-12-19 12:12:33 +00:00
Noud de Brouwer 5ecbfd1bbf coding standards
Coding Standards.
2012-12-19 02:57:30 +00:00
noud 26c8ad57ee Role
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:15:01 +01:00
noud 957b3e27b8 Merge branch 'master' into develop
Conflicts:
	app/Controller/ServersController.php
2012-11-20 11:01:18 +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 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
noud 6b52841521 Login.
small shell script to reset password. Used like:
./Console/cake password <email> <passwd>
2012-09-05 13:46:24 +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
Christophe Vandeplas 9a30ba883f updated console version from newer cakephp 2012-06-08 17:00:07 +02:00
Christophe Vandeplas 865a24d0bd Migration to CakePHP 2.1.
Most of the functionality migrated, Q&A review required.
2012-03-15 15:06:45 +01:00