Commit Graph

89 Commits (9b85428897b6930422138abcb93ee1ea65bcaeb8)

Author SHA1 Message Date
Iglocska 4a93d868de Fixed an issue where non-sharing group events would only send alert e-mails to site admins 2015-12-18 16:33:41 +01:00
Iglocska 8ddceaddc3 Typo fixed 2015-12-18 16:27:25 +01:00
Iglocska b9dfed927b Removed debug 2015-12-18 09:40:26 +01:00
Iglocska cf119bc315 Fix to a previous merge issue with the e-mailer 2015-12-18 09:38:36 +01:00
Iglocska bc2c14c815 Disable e-mailing globally for an instance 2015-12-15 10:52:31 +01:00
Iglocska fa7fa322cb First stab at the push filters influencing the pull of a remote instance 2015-12-06 19:41:29 +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 5941772b3a Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-11-12 09:49:04 +01:00
iglocska 69031ab35e Fixed an issue where PGP keys that are set to never expire show up as expired 2015-11-12 09:46:33 +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 675ceb2e0e Better verification of PGP keys
- checks whether the key can be used to encrypt and whether it's expired
2015-11-11 17:03:59 +01:00
iglocska 9faf3df8ae Some fixes to the api authentication
- Handle user not found gracefully
- Log the failed authentication correctly
2015-11-09 08:52:06 +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 80f29c1f33 More details on the PGP validation tool 2015-10-27 15:18:04 +01:00
Iglocska f9da3f2d2c Small fix to the pgp key validation tool
- doesn't break on completely invalid keys anymore
2015-10-27 14:00:31 +01: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 da8b2604ba Fixes to some validations issues using cakephp 2.7 2015-10-18 20:51:37 +02:00
Iglocska 025087bf5d Fixes to the first time initialisation script 2015-10-15 11:35:44 +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 ad21d5c35a Further work on the Sharing Groups 2015-08-03 14:12:20 +02:00
Iglocska 1bf2995f4e Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
2015-07-22 17:19:13 +02:00
Richard van den Berg 4b5bc3736a Use setupHttpSocket for fetchPGPKey 2015-07-13 11:05:53 +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 6135804afa Removed some junk 2015-06-23 11:00:53 +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 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 42841b59c1 Finished the e-mailing rework branch, fixes #505, fixes #504, fixes #502, fixes #499
- this commit is mostly here to capture what was changed in hotfix 2.3.69

- e-mailing completely reworked, all e-mails now flow through the same method
- that method will handle all encryption and the decisions whether to send e-mails unencrypted to users without an encryption key, whether to keep the body of the e-mail untruncated, etc
- all e-mails are now also logged here (including the reason of a potential failure)

- new server settings for default template messages for password resets / new user welcome messages

- admin e-mail interface reworked and org admins now also have access to the features

- password resets / new user for site and org admins (where applicable) - quickly reset the password of a user and alert them using the pre-defined reset template

=====

- Tuned the freetext import to really accept free-text. Let me know if you have any tips for tuning the detection further!

- it now breaks the passed string on whitespace and line-break and tries to resolve the rest. Filename resolution tightened to exclude anthing that starts or ends with a .
2015-05-27 18:27:53 +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 de55461eed Several changes
- UI cleanup
- separate view for active / passive sharing groups
- deletion of SGs is blocked if there are still events / attributes / threads around that belong to the SG
2015-04-25 20:49:29 +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 5f70207051 Progress in moving all exports to the new distribution system 2015-04-13 12:42:26 +02:00
iglocska f7f200deb8 Further progress 2015-03-21 14:27:53 +01:00
iglocska 29a6f10048 Merge branch 'master' into feature/sg
Conflicts:
	app/webroot/js/ajaxification.js
2015-02-23 11:38:54 +01:00
iglocska bdc6b5fa8f Initial commit 2015-02-23 11:33:38 +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
iglocska cef94553f7 Merge branch 'hotfix-2.2.39' into develop 2014-09-08 13:34:58 +02:00
iglocska 4c6ea92ba3 Small fix to avoid repeated incorrect invalid messages after the first failed check 2014-09-08 13:34:14 +02:00
iglocska c11b388f32 Merge branch 'hotfix-2.2.39' into develop 2014-09-08 13:24:26 +02:00
iglocska 2bb806d780 Fix to the PGP key validation tool, fixes #284 2014-09-08 13:23:23 +02:00
iglocska b6ee897b82 Fixed an incorrect check for the no PGP key warning condition partially responsible for #271 2014-08-21 15:27:25 +02:00
iglocska 1054ff6e85 Very large PGP keys would prevent users from logging in - fixes #142
- removed the PGP key from the Auth user

- PGP key of currently logged in user is looked up on demand and not stored in the session
2014-04-01 16:20:47 +02:00
iglocska 7545de6a6c Changes to the admin methods
- cleaned up the methods, they all now return results without debug mode enabled
- Added a verification method for all user GPG keys (as an expired key for example would send out empty messages)
2014-01-21 11:28:18 +01:00