Commit Graph

101 Commits (898ea1d97c5aae2841450b1afc2fa7cb88f65277)

Author SHA1 Message Date
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska be7b534a9e fix: cleanup of the password reset tool 2016-05-26 12:10:10 +02:00
Andreas Ziegler dc0974a55b misc cleanup 2016-05-21 05:10:49 +02:00
Iglocska d02adf2085 new: Added the news functionality back
- admins can add/edit/delete news items
- users get redirected if there is a newsitem that they haven't seen yet
2016-05-20 01:17:26 +02:00
Iglocska 24c7fa61fe Merge branch 'permissionfix' into 2.4 2016-04-18 17:41:59 +02:00
Iglocska 8565ce198b Merge branch 'feature/feeds' into 2.4 2016-03-10 15:27:47 +01:00
Iglocska e1b384c5b0 Scheduled push incorrectly used the user e-mail address instead of a user object to initiate the sync, fixes #1000 2016-03-09 11:25:05 +01:00
Iglocska 79e41da383 First version of Feed system ready
- tied into background processes
2016-03-09 02:31:55 +01:00
Iglocska 1ba8d1c1f0 Added correlations on a proposal level
- tied into automatic datamodel updates
- correlation is one way only (from proposal to attribute)
- proposals don't correlate with one another

- all distribution rules are adhered to
- further improvements on the upgrade mechanism pipeline
2016-02-17 14:43:33 +01:00
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