From df0b4f34372e6b615b172df47834e2470b5c8331 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Sep 2015 06:52:18 -0400
Subject: [PATCH] Make sure an email address is valid when replacing it with mailto: link
---
program/lib/Roundcube/rcube_utils.php | 292 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 201 insertions(+), 91 deletions(-)
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 39e27fc..353347b 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2008-2012, The Roundcube Dev Team |
@@ -103,13 +103,14 @@
}
foreach ($domain_array as $part) {
- if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]))$/', $part)) {
+ if (!preg_match('/^((xn--)?([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]))$/', $part)) {
return false;
}
}
// last domain part
- if (preg_match('/[^a-zA-Z]/', array_pop($domain_array))) {
+ $last_part = array_pop($domain_array);
+ if (strpos($last_part, 'xn--') !== 0 && preg_match('/[^a-zA-Z]/', $last_part)) {
return false;
}
@@ -117,17 +118,6 @@
if (!$dns_check || !$rcube->config->get('email_dns_check')) {
return true;
- }
-
- if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && version_compare(PHP_VERSION, '5.3.0', '<')) {
- $lookup = array();
- @exec("nslookup -type=MX " . escapeshellarg($domain_part) . " 2>&1", $lookup);
- foreach ($lookup as $line) {
- if (strpos($line, 'MX preference')) {
- return true;
- }
- }
- return false;
}
// find MX record(s)
@@ -144,7 +134,6 @@
return false;
}
-
/**
* Validates IPv4 or IPv6 address
*
@@ -154,41 +143,8 @@
*/
public static function check_ip($ip)
{
- // IPv6, but there's no build-in IPv6 support
- if (strpos($ip, ':') !== false && !defined('AF_INET6')) {
- $parts = explode(':', $ip);
- $count = count($parts);
-
- if ($count > 8 || $count < 2) {
- return false;
- }
-
- foreach ($parts as $idx => $part) {
- $length = strlen($part);
- if (!$length) {
- // there can be only one ::
- if ($found_empty) {
- return false;
- }
- $found_empty = true;
- }
- // last part can be an IPv4 address
- else if ($idx == $count - 1) {
- if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
- return @inet_pton($part) !== false;
- }
- }
- else if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
- return false;
- }
- }
-
- return true;
- }
-
- return @inet_pton($ip) !== false;
+ return filter_var($ip, FILTER_VALIDATE_IP) !== false;
}
-
/**
* Check whether the HTTP referer matches the current request
@@ -197,18 +153,18 @@
*/
public static function check_referer()
{
- $uri = parse_url($_SERVER['REQUEST_URI']);
+ $uri = parse_url($_SERVER['REQUEST_URI']);
$referer = parse_url(self::request_header('Referer'));
+
return $referer['host'] == self::request_header('Host') && $referer['path'] == $uri['path'];
}
-
/**
* Replacing specials characters to a specific encoding type
*
* @param string Input string
* @param string Encoding type: text|html|xml|js|url
- * @param string Replace mode for tags: show|replace|remove
+ * @param string Replace mode for tags: show|remove|strict
* @param boolean Convert newlines
*
* @return string The quoted string
@@ -216,8 +172,8 @@
public static function rep_specialchars_output($str, $enctype = '', $mode = '', $newlines = true)
{
static $html_encode_arr = false;
- static $js_rep_table = false;
- static $xml_rep_table = false;
+ static $js_rep_table = false;
+ static $xml_rep_table = false;
if (!is_string($str)) {
$str = strval($str);
@@ -232,8 +188,11 @@
$encode_arr = $html_encode_arr;
- // don't replace quotes and html tags
- if ($mode == 'show' || $mode == '') {
+ if ($mode == 'remove') {
+ $str = strip_tags($str);
+ }
+ else if ($mode != 'strict') {
+ // don't replace quotes and html tags
$ltpos = strpos($str, '<');
if ($ltpos !== false && strpos($str, '>', $ltpos) !== false) {
unset($encode_arr['"']);
@@ -241,9 +200,6 @@
unset($encode_arr['>']);
unset($encode_arr['&']);
}
- }
- else if ($mode == 'remove') {
- $str = strip_tags($str);
}
$out = strtr($str, $encode_arr);
@@ -266,8 +222,8 @@
$js_rep_table["'"] = "\\'";
$js_rep_table["\\"] = "\\\\";
// Unicode line and paragraph separators (#1486310)
- $js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A8))] = '
';
- $js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A9))] = '
';
+ $js_rep_table[chr(hexdec('E2')).chr(hexdec('80')).chr(hexdec('A8'))] = '
';
+ $js_rep_table[chr(hexdec('E2')).chr(hexdec('80')).chr(hexdec('A9'))] = '
';
}
// encode for javascript use
@@ -277,7 +233,7 @@
// encode for plaintext
if ($enctype == 'text') {
- return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);
+ return str_replace("\r\n", "\n", $mode == 'remove' ? strip_tags($str) : $str);
}
if ($enctype == 'url') {
@@ -292,7 +248,6 @@
// no encoding given -> return original string
return $str;
}
-
/**
* Read input value and convert it for internal use
@@ -333,7 +288,6 @@
return self::parse_input_value($value, $allow_html, $charset);
}
-
/**
* Parse/validate input value. See self::get_input_value()
@@ -385,7 +339,6 @@
return $value;
}
-
/**
* Convert array of request parameters (prefixed with _)
* to a regular array with non-prefixed keys.
@@ -411,7 +364,6 @@
return $out;
}
-
/**
* Convert the given string into a valid HTML identifier
* Same functionality as done in app.js with rcube_webmail.html_identifier()
@@ -425,7 +377,6 @@
return asciiwords($str, true, '_');
}
}
-
/**
* Replace all css definitions with #container [def]
@@ -503,7 +454,6 @@
return $source;
}
-
/**
* Generate CSS classes from mimetype and filename extension
*
@@ -534,7 +484,6 @@
return join(" ", $classes);
}
-
/**
* Decode escaped entities used by known XSS exploits.
* See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
@@ -553,7 +502,6 @@
return $out;
}
-
/**
* preg_replace_callback callback for xss_entity_decode
*
@@ -565,7 +513,6 @@
{
return chr(hexdec($matches[1]));
}
-
/**
* Check if we can process not exceeding memory_limit
@@ -581,7 +528,6 @@
return $mem_limit > 0 && $memory + $need > $mem_limit ? false : true;
}
-
/**
* Check if working in SSL mode
@@ -610,7 +556,6 @@
return false;
}
-
/**
* Replaces hostname variables.
@@ -649,7 +594,6 @@
return str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
}
-
/**
* Returns remote IP address and forwarded addresses if found
*
@@ -674,7 +618,6 @@
return $address;
}
-
/**
* Returns the real remote IP address
@@ -757,17 +700,18 @@
return $result;
}
-
/**
* Improved equivalent to strtotime()
*
* @param string $date Date string
+ * @param object DateTimeZone to use for DateTime object
*
* @return int Unix timestamp
*/
- public static function strtotime($date)
+ public static function strtotime($date, $timezone = null)
{
$date = self::clean_datestr($date);
+ $tzname = $timezone ? ' ' . $timezone->getName() : '';
// unix timestamp
if (is_numeric($date)) {
@@ -776,7 +720,7 @@
// if date parsing fails, we have a date in non-rfc format.
// remove token from the end and try again
- while ((($ts = @strtotime($date)) === false) || ($ts < 0)) {
+ while ((($ts = @strtotime($date . $tzname)) === false) || ($ts < 0)) {
$d = explode(' ', $date);
array_pop($d);
if (!$d) {
@@ -792,6 +736,7 @@
* Date parsing function that turns the given value into a DateTime object
*
* @param string $date Date string
+ * @param object DateTimeZone to use for DateTime object
*
* @return object DateTime instance or false on failure
*/
@@ -807,7 +752,7 @@
// try to parse string with DateTime first
if (!empty($date)) {
try {
- $dt = new DateTime($date, $timezone);
+ $dt = $timezone ? new DateTime($date, $timezone) : new DateTime($date);
}
catch (Exception $e) {
// ignore
@@ -815,9 +760,12 @@
}
// try our advanced strtotime() method
- if (!$dt && ($timestamp = self::strtotime($date))) {
+ if (!$dt && ($timestamp = self::strtotime($date, $timezone))) {
try {
$dt = new DateTime("@".$timestamp);
+ if ($timezone) {
+ $dt->setTimezone($timezone);
+ }
}
catch (Exception $e) {
// ignore
@@ -882,7 +830,6 @@
return self::idn_convert($str, true);
}
-
/*
* Idn_to_ascii wrapper.
* Intl/Idn modules version of this function doesn't work with e-mail address
@@ -892,8 +839,7 @@
return self::idn_convert($str, false);
}
-
- public static function idn_convert($input, $is_utf=false)
+ public static function idn_convert($input, $is_utf = false)
{
if ($at = strpos($input, '@')) {
$user = substr($input, 0, $at);
@@ -916,14 +862,21 @@
* Split the given string into word tokens
*
* @param string Input to tokenize
+ * @param integer Minimum length of a single token
* @return array List of tokens
*/
- public static function tokenize_string($str)
+ public static function tokenize_string($str, $minlen = 2)
{
- return explode(" ", preg_replace(
- array('/[\s;\/+-]+/i', '/(\d)[-.\s]+(\d)/', '/\s\w{1,3}\s/u'),
- array(' ', '\\1\\2', ' '),
- $str));
+ $expr = array('/[\s;,"\'\/+-]+/ui', '/(\d)[-.\s]+(\d)/u');
+ $repl = array(' ', '\\1\\2');
+
+ if ($minlen > 1) {
+ $minlen--;
+ $expr[] = "/(^|\s+)\w{1,$minlen}(\s+|$)/u";
+ $repl[] = ' ';
+ }
+
+ return array_filter(explode(" ", preg_replace($expr, $repl, $str)));
}
/**
@@ -932,10 +885,11 @@
*
* @param string Input string (UTF-8)
* @param boolean True to return list of words as array
+ * @param integer Minimum length of tokens
*
* @return mixed Normalized string or a list of normalized tokens
*/
- public static function normalize_string($str, $as_array = false)
+ public static function normalize_string($str, $as_array = false, $minlen = 2)
{
// replace 4-byte unicode characters with '?' character,
// these are not supported in default utf-8 charset on mysql,
@@ -947,7 +901,7 @@
. ')/', '?', $str);
// split by words
- $arr = self::tokenize_string($str);
+ $arr = self::tokenize_string($str, $minlen);
// detect character set
if (utf8_encode(utf8_decode($str)) == $str) {
@@ -978,6 +932,28 @@
}
return $as_array ? $arr : join(" ", $arr);
+ }
+
+ /**
+ * Compare two strings for matching words (order not relevant)
+ *
+ * @param string Haystack
+ * @param string Needle
+ * @return boolen True if match, False otherwise
+ */
+ public static function words_match($haystack, $needle)
+ {
+ $a_needle = self::tokenize_string($needle, 1);
+ $haystack = join(" ", self::tokenize_string($haystack, 1));
+
+ $hits = 0;
+ foreach ($a_needle as $w) {
+ if (stripos($haystack, $w) !== false) {
+ $hits++;
+ }
+ }
+
+ return $hits >= count($a_needle);
}
/**
@@ -1079,7 +1055,141 @@
return (bool) preg_match('!^[a-z]:[\\\\/]!i', $path);
}
else {
- return $path[0] == DIRECTORY_SEPARATOR;
+ return $path[0] == '/';
}
}
+
+ /**
+ * Resolve relative URL
+ *
+ * @param string $url Relative URL
+ *
+ * @return string Absolute URL
+ */
+ public static function resolve_url($url)
+ {
+ // prepend protocol://hostname:port
+ if (!preg_match('|^https?://|', $url)) {
+ $schema = 'http';
+ $default_port = 80;
+
+ if (self::https_check()) {
+ $schema = 'https';
+ $default_port = 443;
+ }
+
+ $prefix = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
+ if ($_SERVER['SERVER_PORT'] != $default_port) {
+ $prefix .= ':' . $_SERVER['SERVER_PORT'];
+ }
+
+ $url = $prefix . ($url[0] == '/' ? '' : '/') . $url;
+ }
+
+ return $url;
+ }
+
+ /**
+ * Generate a random string
+ *
+ * @param int $length String length
+ * @param bool $raw Return RAW data instead of ascii
+ *
+ * @return string The generated random string
+ */
+ public static function random_bytes($length, $raw = false)
+ {
+ // Use PHP7 true random generator
+ if (function_exists('random_bytes')) {
+ // random_bytes() can throw an exception in some cases
+ try {
+ $random = @random_bytes($length);
+ }
+ catch (Exception $e) {}
+ }
+
+ if (!$random) {
+ $random = openssl_random_pseudo_bytes($length);
+ }
+
+ if ($raw) {
+ return $random;
+ }
+
+ $random = self::bin2ascii($random);
+
+ // truncate to the specified size...
+ if ($length < strlen($random)) {
+ $random = substr($random, 0, $length);
+ }
+
+ return $random;
+ }
+
+ /**
+ * Convert binary data into readable form (containing a-zA-Z0-9 characters)
+ *
+ * @param string $input Binary input
+ *
+ * @return string Readable output
+ */
+ public static function bin2ascii($input)
+ {
+ // Above method returns "hexits".
+ // Based on bin_to_readable() function in ext/session/session.c.
+ // Note: removed ",-" characters from hextab
+ $hextab = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ $nbits = 6; // can be 4, 5 or 6
+ $length = strlen($input);
+ $result = '';
+ $char = 0;
+ $i = 0;
+ $have = 0;
+ $mask = (1 << $nbits) - 1;
+
+ while (true) {
+ if ($have < $nbits) {
+ if ($i < $length) {
+ $char |= ord($input[$i++]) << $have;
+ $have += 8;
+ }
+ else if (!$have) {
+ break;
+ }
+ else {
+ $have = $nbits;
+ }
+ }
+
+ // consume nbits
+ $result .= $hextab[$char & $mask];
+ $char >>= $nbits;
+ $have -= $nbits;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Format current date according to specified format.
+ * This method supports microseconds (u).
+ *
+ * @param string $format Date format (default: 'd-M-Y H:i:s O')
+ *
+ * @return string Formatted date
+ */
+ public static function date_format($format = null)
+ {
+ if (empty($format)) {
+ $format = 'd-M-Y H:i:s O';
+ }
+
+ if (strpos($format, 'u') !== false
+ && ($date = date_create_from_format('U.u.e', microtime(true) . '.' . date_default_timezone_get()))
+ ) {
+ return $date->format($format);
+ }
+
+ return date($format);
+ }
}
--
Gitblit v1.9.1