From a1e703424e1108fbd64f17a274b241dd1fafaa43 Mon Sep 17 00:00:00 2001
From: "Cristian G. Segarra" <cristian@segarra.com.ar>
Date: Tue, 31 May 2016 12:23:07 -0300
Subject: [PATCH] FIX #3939: Import TXT resource records with semicolons and
respecting it's case
---
interface/web/dns/dns_import.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 2e4d58e192..bd8cc84f36 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -216,7 +216,7 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$line = trim($line);
if ($line != '' && substr($line, 0, 1) != ';'){
if(strpos($line, ";") !== FALSE) {
- if (!preg_match("/v=DKIM|v=DMARC/",$line)) {
+ if(!preg_match("/\"[^\"]+;[^\"]*\"/", $line)) {
$line = substr($line, 0, strpos($line, ";"));
}
}
@@ -267,12 +267,13 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$parts = explode(' ', $line);
// make elements lowercase
- $dkim=@($parts[3]=='"v=DKIM1;')?true:false;
- $dmarc=@($parts[3]=='"v=DMARC1;')?true:false;
-
$new_parts = array();
foreach($parts as $part){
- if(!$dkim && !$dmarc) {
+ if(
+ (strpos($part, ';') === false) &&
+ (!preg_match("/^\"/", $part)) &&
+ (!preg_match("/\"$/", $part))
+ ) {
$new_parts[] = strtolower($part);
} else {
$new_parts[] = $part;
--
GitLab