From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
program/include/rcmail_string_replacer.php | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/program/include/rcmail_string_replacer.php b/program/include/rcmail_string_replacer.php
index d3fdc3e..2037db6 100644
--- a/program/include/rcmail_string_replacer.php
+++ b/program/include/rcmail_string_replacer.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| program/include/rcmail_string_replacer.php |
| |
@@ -41,6 +41,16 @@
{
$href = $matches[1];
$suffix = $this->parse_url_brackets($href);
+ $email = $href;
+
+ if (strpos($email, '?')) {
+ list($email,) = explode('?', $email);
+ }
+
+ // skip invalid emails
+ if (!rcube_utils::check_email($email, false)) {
+ return $matches[1];
+ }
$i = $this->add(html::a(array(
'href' => 'mailto:' . $href,
--
Gitblit v1.9.1