Commit Graph

155 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 430f8ea479 URL fallback when adding users fails for the sync user dropdown 2016-01-26 10:03:46 +01:00
Iglocska be62a6b053 Entering a valid controller/action and an invalid one produced a different result pre-auth
- not authenticated users now automatically get redirected to the login page, no matter what action they requested
- This as a nice side effect also removed the bug that was caused by a site admin looking at an admin function before logging out / timing out and being incorrectly redirected to /admin/users/login
2016-01-21 14:52:06 +01:00
Iglocska b92c1c8db4 Added full text search to organisation index, fixes #803
- also some fixes and enhancements in general for this
2016-01-19 16:25:54 +01:00
Iglocska aab2752cbe Sort orgs alphabetically in user index filters 2016-01-13 15:56:59 +01:00
Iglocska f9d60d1b2c Small fix to the contact users form for org admins 2016-01-12 15:36:58 +01:00
Iglocska 52f429e3c7 Quickfilter added for users 2016-01-04 11:57:21 +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 af062c7b84 Fixed a typo in the logging that prevented users from being edited, fixes #586
- A wrong variable lookup in the logging caused user edits to fail
2015-12-29 20:08:09 +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 d769942a15 When adding/editing a sync user, the choice to limit a user by instance settings shows empty lines for instances without a name
- use the URL in those cases instead
2015-12-21 12:08:08 +01:00
Iglocska 5ed1c27e43 Disable users
- users can now be disabled by an admin
- disabled users cannot login (via the UI or the API) and will be informed
- login attempts by disabled users are logged

- also added the expiration field for later use
2015-12-09 23:47:19 +01:00
Iglocska d20946f5ed Fix to logging causing certain functions to fail on migrated installations 2015-11-27 14:10:25 +01:00
iglocska b5857696e9 Update to the Taxonomies 2015-11-24 12:02:39 +01:00
iglocska ac56b8e806 Empty server list causes the user creation to fail
- fixed
2015-11-20 03:11:41 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska da5fac5873 Added logging of auth key changes, fixes #715
- Changing the auth key now creates a log entry that inclues the user's ID, e-mail address old and new autkeys
- Also removed the logging of the hashed password for newly created users
2015-11-16 00:22:58 +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 1b291904d4 Fixed some more invalid org checks 2015-10-15 14:31:07 +02:00
Iglocska 025087bf5d Fixes to the first time initialisation script 2015-10-15 11:35:44 +02:00
Iglocska eeb1d8d117 Fixes to bugs with org usage from 2.3 2015-10-15 11:11:05 +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 3234aaf887 Fixes to the user index, fixes #556
- index can now be sorted case insensitive
- removed a notice error during sorting (sorting parameters should not be displayed as a filter)
2015-09-18 10:42:50 +02:00
iglocska 0fe9794370 Removed redirect to the news page 2015-09-16 14:35:56 +02:00
iglocska 26e640e19c Further progress on several issues 2015-09-16 12:15:43 +02:00
Iglocska 2cfec487ef Fix to the memberslist 2015-08-31 03:19:45 +02:00
Iglocska 6e5b9a5ac5 Cleanup and fixes to the memberslist 2015-08-31 03:08:49 +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 bd7555b185 Various fixes to the OpenIOC import and the password reset, fixes #600, fixes #599, fixes #565
- OpenIOC import now correctly sets IDS flags based on type
- OpenIOC import specifies the source file in the comments

- Fixed a blackhole issue with the password reset popups
2015-08-19 13:20:14 +02:00
Iglocska ad21d5c35a Further work on the Sharing Groups 2015-08-03 14:12:20 +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 ea0dd2a33f PGP key selection on fetch, fixes #554
- MISP will now fetch a list of all keys matching the e-mail address from the MIT server from the user edit view
- A popup will present all the matching keys (with the creation date, key ID, email addresses associated - and the fingerprint when hovering over them)
- Once the admin clicks on one, it will fetch the desired key

- future enhancement possibility: move the second stage (the actual key fetch) to the server side instead of a direct ajax query from the user's browser
2015-06-23 10:56:19 +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 620b7d1adb New emailer finished 2015-05-27 17:46:01 +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 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 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
Iglocska e0ef372392 Merge branch 'master' into feature/sg
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
2015-04-12 10:40:31 +02:00
iglocska 9ccf69f35a User edit fixed
- choose organisation from a list as expected
- fixed refreshauth
2015-04-08 13:10:52 +02:00
iglocska fcaccb1784 Update to the roles and user filtering
- new role permission added for SG editors
- roles reworked, permissions all looked up centrally from the role model instead of code replication across controllers and views
- user filtering now correctly uses organisation objects instead of org strings
2015-04-07 14:47:14 +02:00
iglocska f7f200deb8 Further progress 2015-03-21 14:27:53 +01:00
Iglocska 524871ab52 Sync users should default to termsaccepted and no password change required, fixes #432 2015-03-14 08:35:24 +01:00
iglocska 4239edffc9 Org admins editing privileged users demotes the privileged user to a lower permission level, fixes #408
- an org admin now correctly can select the previously assigned privileged role for a user that he/she is editing
2015-02-20 09:17:25 +01:00
iglocska 3723119d83 Logging of admin emails and auth refresh
- admin emails now generate log entries
- authentication is refreshed on activity
2014-12-12 10:42:12 +01:00
iglocska 67aa9d9859 Admin contact user menu moved next to new/list user buttons, recipient e-mails are now sorted alphabetically 2014-12-05 15:15:28 +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