X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=securemail%2Fsecuremail.php;h=470db0e4e039164f35b97c978cbaaca126a91de5;hb=1a5b19ff692e4fbf08e7064c41042961eae68091;hp=c4dc6c93c7af429b60103e1008e1fbdf60e9f1f0;hpb=50f91a338c1c4f2a3e407e1a2eaf59e54f5938cd;p=friendica-addons.git diff --git a/securemail/securemail.php b/securemail/securemail.php index c4dc6c93..470db0e4 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -6,170 +6,147 @@ * Author: Fabio Comuni */ -require_once "include/Emailer.php"; +use Friendica\Addon\securemail\SecureTestEmail; +use Friendica\App; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Object\EMail\IEmail; -/* because the fraking openpgp-php is in composer, require libs in composer - * and then don't use autoloader to load classes... */ -$path = __DIR__."/vendor/phpseclib/phpseclib/phpseclib/"; -set_include_path(get_include_path() . PATH_SEPARATOR . $path); -/* so, we don't use the autoloader and include what we need */ -$path = __DIR__."/vendor/singpolyma/openpgp-php/lib"; -set_include_path(get_include_path() . PATH_SEPARATOR . $path); +require_once __DIR__ . '/vendor/autoload.php'; -require_once "openpgp.php"; -require_once "openpgp_crypt_symmetric.php"; +function securemail_install() +{ + Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); + Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post', 10); + Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10); -function securemail_install() { - register_hook('plugin_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - register_hook('plugin_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - - register_hook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); - - logger("installed securemail"); + Logger::notice('installed securemail'); } -function securemail_uninstall() { - unregister_hook('plugin_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - unregister_hook('plugin_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - - unregister_hook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); - - logger("removed securemail"); -} - - -function securemail_settings(&$a,&$s){ - if(! local_user()) { - return; - } - - $enable = intval(get_pconfig(local_user(),'securemail','enable')); - $publickey = get_pconfig(local_user(),'securemail','pkey'); - - $t = get_markup_template( "admin.tpl", "addon/securemail/" ); - - $s = replace_macros($t, array( - '$title' => t('"Secure Mail" Settings'), - '$submit' => t('Save Settings'), - '$test' => t('Save and send test'), //NOTE: update also in 'post' - '$enable' => array('securemail-enable', t('Enable Secure Mail'), $enable, ""), - '$publickey' => array('securemail-pkey', t('Public key'), $publickey, t("Your public PGP key, ascii armored format"), "rows='10'") - )); - - - - return; -} -function securemail_settings_post(&$a, &$b){ - - if(! local_user()) { - return; - } - - if($_POST['securemail-submit']) { - set_pconfig(local_user(),'securemail','pkey',trim($_POST['securemail-pkey'])); - $enable = ((x($_POST,'securemail-enable')) ? 1 : 0); - set_pconfig(local_user(),'securemail','enable', $enable); - info( t('Secure Mail Settings saved.') . EOL); - - if ($_POST['securemail-submit'] == t('Save and send test')) { - $sitename = $a->config['sitename']; - - $hostname = $a->get_hostname(); - if (strpos($hostname, ':')){ - $hostname = substr($hostname, 0, strpos($hostname, ':')); - } - - $sender_email = $a->config['sender_email']; - if (empty($sender_email)){ - $sender_email = 'noreply@'.$hostname; - } - - $subject = "Friendica - Secure Mail - Test"; - $message = "This is a test message from your Friendica Secure Mail addon.\n\nBye!"; - - $params = array( - 'uid' => local_user(), - 'fromName' => $sitename, - 'fromEmail' => $sender_email, - 'toEmail' => $a->user['email'], - 'messageSubject' => $subject, - 'htmlVersion' => "

{$message}

", - 'textVersion' => $message, - ); - - // enable addon for test - set_pconfig(local_user(),'securemail','enable', 1); - - $res = Emailer::send($params); - - // revert to saved value - set_pconfig(local_user(),'securemail','enable', $enable); - - if ($res) { - info( t("Test email sent") . EOL); - } else { - notice( t("There was an error sending the test email") .EOL); - } - } - } +/** + * @brief Build user settings form + * + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook + * + * @param App $a App instance + * @param string $s output html + * + * @see App + */ +function securemail_settings(App &$a, array &$data) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } + + $enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'enable')); + $publickey = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'pkey'); + + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/securemail/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['securemail-enable', DI::l10n()->t('Enable Secure Mail'), $enabled], + '$publickey' => ['securemail-pkey', DI::l10n()->t('Public key'), $publickey, DI::l10n()->t('Your public PGP key, ascii armored format')] + ]); + + $data = [ + 'addon' => 'securemail', + 'title' => DI::l10n()->t('"Secure Mail" Settings'), + 'html' => $html, + 'submit' => [ + 'securemail-submit' => DI::l10n()->t('Save Settings'), + 'securemail-test' => DI::l10n()->t('Save and send test'), + ], + ]; } -function securemail_emailer_send_prepare(&$a, &$b) { - if (!x($b,'uid')) { - return; - } - - $uid = $b['uid']; - - $enable_checked = get_pconfig($uid,'securemail','enable'); - if (!$enable_checked) { - return; - } - - $public_key_ascii = get_pconfig($uid,'securemail','pkey'); - - preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches); - $marker = (empty($matches[1])) ? 'MESSAGE' : $matches[1]; - $public_key = OpenPGP::unarmor($public_key_ascii, $marker); - - $key = OpenPGP_Message::parse($public_key); - - $data = new OpenPGP_LiteralDataPacket($b['textVersion'], array( - 'format' => 'u', - 'filename' => 'encrypted.gpg' - )); - $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message(array($data))); - $armored_encrypted = wordwrap(OpenPGP::enarmor($encrypted->to_bytes(), "PGP MESSAGE"), 64, "\n", true); - - $b['textVersion'] = $armored_encrypted; - $b['htmlVersion'] = null; +/** + * @brief Handle data from user settings form + * + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook + * + * @param App $a App instance + * @param array $b hook data + * + * @see App + */ +function securemail_settings_post(App &$a, array &$b) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } + + if (!empty($_POST['securemail-submit']) || !empty($_POST['securemail-test'])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); + $enable = (!empty($_POST['securemail-enable']) ? 1 : 0); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable); + + if (!empty($_POST['securemail-test'])) { + $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl())); + + // revert to saved value + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable); + + if ($res) { + DI::sysmsg()->addInfo(DI::l10n()->t('Test email sent')); + } else { + DI::sysmsg()->addNotice(DI::l10n()->t('There was an error sending the test email')); + } + } + } } - /** - * add addon composer autoloader maps to system autoloader - -function securemail_autoloader() { - - $loader = require dirname(dirname(__DIR__))."/vendor/autoload.php"; - - $map = require __DIR__ . '/vendor/composer/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/vendor/composer/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/vendor/composer/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } + * @brief Encrypt notification emails text + * + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook + * + * @param App $a App instance + * @param IEmail $email Email + * + * @see App + */ +function securemail_emailer_send_prepare(App &$a, IEmail &$email) +{ + if (empty($email->getRecipientUid())) { + return; + } + + $uid = $email->getRecipientUid(); + + $enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable'); + if (!$enable_checked) { + DI::logger()->debug('No securemail enabled.'); + return; + } + + $public_key_ascii = DI::pConfig()->get($uid, 'securemail', 'pkey'); + + preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches); + $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1]; + $public_key = OpenPGP::unarmor($public_key_ascii, $marker); + + $key = OpenPGP_Message::parse($public_key); + + $data = new OpenPGP_LiteralDataPacket($email->getMessage(true), [ + 'format' => 'u', + 'filename' => 'encrypted.gpg' + ]); + + try { + $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data])); + $armored_encrypted = wordwrap( + OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE'), + 64, + "\n", + true + ); + + $email = $email->withMessage($armored_encrypted, null); + + } catch (Exception $e) { + DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]); + } } -securemail_autoloader(); - -*/