From 015b424f0da8e44a59f9565402490201cc762bcc Mon Sep 17 00:00:00 2001 From: Synox Date: Tue, 9 Jan 2018 20:33:09 +0100 Subject: [PATCH] autolink and html support --- composer.json | 3 +- composer.lock | 51 +++++++++++++- .../composer/autoload_namespaces.php | 1 + src/backend-libs/composer/autoload_real.php | 18 +++++ src/backend-libs/composer/autoload_static.php | 11 +++ src/backend-libs/composer/installed.json | 49 +++++++++++++ src/backend.php | 69 +++++++++++++++++++ src/index.php | 66 +++++++++++++----- 8 files changed, 249 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 939ee28..96f3636 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,8 @@ { "require": { "php-imap/php-imap": "~2.0", - "gnugat/PronounceableWord": "*" + "gnugat/PronounceableWord": "*", + "ezyang/htmlpurifier": "^4.9" }, "config": { "vendor-dir": "src/backend-libs" diff --git a/composer.lock b/composer.lock index c7e9542..6cd2c8c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,56 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "781cc38d2f745ec4bfba29e440111b80", - "content-hash": "70878ea12bce14861844baa8032688de", + "hash": "c071b40be7f9bdf56a06a9e52d220684", + "content-hash": "31df20b392f8545dda12635a78572bf7", "packages": [ + { + "name": "ezyang/htmlpurifier", + "version": "v4.9.3", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, + "type": "library", + "autoload": { + "psr-0": { + "HTMLPurifier": "library/" + }, + "files": [ + "library/HTMLPurifier.composer.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" + } + ], + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", + "keywords": [ + "html" + ], + "time": "2017-06-03 02:28:16" + }, { "name": "gnugat/PronounceableWord", "version": "2.0.0", diff --git a/src/backend-libs/composer/autoload_namespaces.php b/src/backend-libs/composer/autoload_namespaces.php index b72d58d..218820d 100644 --- a/src/backend-libs/composer/autoload_namespaces.php +++ b/src/backend-libs/composer/autoload_namespaces.php @@ -8,4 +8,5 @@ $baseDir = dirname(dirname($vendorDir)); return array( 'PronounceableWord_' => array($vendorDir . '/gnugat/PronounceableWord/src'), 'PhpImap' => array($vendorDir . '/php-imap/php-imap/src'), + 'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'), ); diff --git a/src/backend-libs/composer/autoload_real.php b/src/backend-libs/composer/autoload_real.php index d7598fc..8837d77 100644 --- a/src/backend-libs/composer/autoload_real.php +++ b/src/backend-libs/composer/autoload_real.php @@ -47,6 +47,24 @@ class ComposerAutoloaderInit125dddd280a32cf75b181166154246ec $loader->register(true); + if ($useStaticLoader) { + $includeFiles = Composer\Autoload\ComposerStaticInit125dddd280a32cf75b181166154246ec::$files; + } else { + $includeFiles = require __DIR__ . '/autoload_files.php'; + } + foreach ($includeFiles as $fileIdentifier => $file) { + composerRequire125dddd280a32cf75b181166154246ec($fileIdentifier, $file); + } + return $loader; } } + +function composerRequire125dddd280a32cf75b181166154246ec($fileIdentifier, $file) +{ + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + require $file; + + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + } +} diff --git a/src/backend-libs/composer/autoload_static.php b/src/backend-libs/composer/autoload_static.php index cc9b8e0..cd798df 100644 --- a/src/backend-libs/composer/autoload_static.php +++ b/src/backend-libs/composer/autoload_static.php @@ -6,6 +6,10 @@ namespace Composer\Autoload; class ComposerStaticInit125dddd280a32cf75b181166154246ec { + public static $files = array ( + '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', + ); + public static $prefixesPsr0 = array ( 'P' => array ( @@ -18,6 +22,13 @@ class ComposerStaticInit125dddd280a32cf75b181166154246ec 0 => __DIR__ . '/..' . '/php-imap/php-imap/src', ), ), + 'H' => + array ( + 'HTMLPurifier' => + array ( + 0 => __DIR__ . '/..' . '/ezyang/htmlpurifier/library', + ), + ), ); public static function getInitializer(ClassLoader $loader) diff --git a/src/backend-libs/composer/installed.json b/src/backend-libs/composer/installed.json index e3ce17a..b5f614a 100644 --- a/src/backend-libs/composer/installed.json +++ b/src/backend-libs/composer/installed.json @@ -87,5 +87,54 @@ "word" ], "abandoned": true + }, + { + "name": "ezyang/htmlpurifier", + "version": "v4.9.3", + "version_normalized": "4.9.3.0", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, + "time": "2017-06-03 02:28:16", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "HTMLPurifier": "library/" + }, + "files": [ + "library/HTMLPurifier.composer.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" + } + ], + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", + "keywords": [ + "html" + ] } ] diff --git a/src/backend.php b/src/backend.php index 3431f41..2a37669 100644 --- a/src/backend.php +++ b/src/backend.php @@ -155,5 +155,74 @@ function delete_old_messages() { } +class AutoLinkExtension { + static public function auto_link_text($string) { + + $string = preg_replace_callback("/ + ((?' . $url . ''; + } + , $string); + + + $string = AutoLinkExtension::unescape($string); + + return $string; + } # filter() + + /** + * unescape() + * + * @param string $text + * @return string $text + **/ + static function unescape($text) { + global $escape_autolink_uri; + + if (!$escape_autolink_uri) + return $text; + + $unescape = array_reverse($escape_autolink_uri); + + return str_replace(array_keys($unescape), array_values($unescape), $text); + } # unescape() + +} + + // run on every request delete_old_messages(); diff --git a/src/index.php b/src/index.php index d7ee274..19e96c1 100644 --- a/src/index.php +++ b/src/index.php @@ -1,6 +1,11 @@ set('HTML.Nofollow', true); +$purifier_config->set('HTML.ForbiddenElements', array("img")); +$purifier = new HTMLPurifier($purifier_config); + // simple router: if (isset($_GET['username']) && isset($_GET['domain'])) { $username = filter_input(INPUT_GET, 'username', FILTER_SANITIZE_EMAIL); @@ -30,7 +35,6 @@ if (isset($_GET['username']) && isset($_GET['domain'])) { exit(); } $emails = get_emails($address); - ?> @@ -38,7 +42,7 @@ if (isset($_GET['username']) && isset($_GET['domain'])) { <?php echo $address ?> - + @@ -77,7 +81,24 @@ if (isset($_GET['username']) && isset($_GET['domain'])) { setInterval(function () { reloadWithTurbolinks(); - }, 15000) + }, 15000); + + + function showHtml(id) { + document.getElementById('email-' + id + '-html').style.display = 'block'; + document.getElementById('email-' + id + '-plain').style.display = 'none'; + document.getElementById('show-html-button-' + id).style.display = 'none'; + document.getElementById('show-plain-button-' + id).style.display = 'block'; + return false; + } + + function showPlain(id) { + document.getElementById('email-' + id + '-html').style.display = 'none'; + document.getElementById('email-' + id + '-plain').style.display = 'block'; + document.getElementById('show-html-button-' + id).style.display = 'block'; + document.getElementById('show-plain-button-' + id).style.display = 'none'; + return false; + } @@ -95,11 +116,11 @@ if (isset($_GET['username']) && isset($_GET['domain'])) {
-
-
- - - + + - -
- + +
textPlain, FILTER_SANITIZE_SPECIAL_CHARS); - echo str_replace(' ', '
', $text); + // Keep newlines + $text = str_replace(' ', '
', $text); + echo \AutoLinkExtension::auto_link_text($text) ?> -
-
- +