From c92b86502e0ea852ea3669e7c5e06e265becb4a8 Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Sun, 25 Aug 2024 20:33:40 -0300
Subject: [PATCH] Fix address bar queries when doing math expressions (#952)

---
 .../Common/Extensions/StringExtension.swift   |  8 ++++-
 .../Extensions/StringExtensionTests.swift     | 34 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/Sources/Common/Extensions/StringExtension.swift b/Sources/Common/Extensions/StringExtension.swift
index 23fd37ad0..09050cfe2 100644
--- a/Sources/Common/Extensions/StringExtension.swift
+++ b/Sources/Common/Extensions/StringExtension.swift
@@ -31,6 +31,8 @@ extension RegEx {
     static let hostName = regex("^(((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)*[A-Za-z0-9-]{2,63})$", .caseInsensitive)
 
     static let email = regex(#"[^\s]+@[^\s]+\.[^\s]+"#)
+
+    static let mathExpression = regex(#"^[\s$]*([\d]+(\.[\d]+)?|\\.[\d]+)([\s]*[+\-*/][\s]*([\d]+(\.[\d]+)?|\\.[\d]+))*[\s$]*$"#)
 }
 
 // Use this instead of NSLocalizedString for strings that are not supposed to be translated
@@ -362,7 +364,11 @@ public extension String {
     // MARK: Host name validation
 
     var isValidHost: Bool {
-        return isValidHostname || isValidIpHost
+        return (isValidHostname || isValidIpHost) && !isMathFormula
+    }
+
+    private var isMathFormula: Bool {
+        return matches(.mathExpression)
     }
 
     var isValidHostname: Bool {
diff --git a/Tests/CommonTests/Extensions/StringExtensionTests.swift b/Tests/CommonTests/Extensions/StringExtensionTests.swift
index 2d58a275c..bcf415895 100644
--- a/Tests/CommonTests/Extensions/StringExtensionTests.swift
+++ b/Tests/CommonTests/Extensions/StringExtensionTests.swift
@@ -336,4 +336,38 @@ final class StringExtensionTests: XCTestCase {
 
     }
 
+    func testWhenStringIsValidHost_thenValidHostIsTrue() {
+        let validHostnames = [
+            "example.com",
+            "subdomain.example.com",
+            "my-host123",
+            "localhost",
+            "192.168.1.1", // Valid IP address
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334" // Valid IPv6 address
+        ]
+
+        for hostname in validHostnames {
+            XCTAssertTrue(hostname.isValidHost, "\(hostname) should be a valid host")
+        }
+    }
+
+    func testWhenStringIsInvalidHost_thenValidHostIsFalse() {
+        let invalidHostnames = [
+            "invalid_hostname", // Invalid character
+            "-example.com", // Starts with a hyphen
+            "example-.com", // Ends with a hyphen
+            "example..com", // Consecutive dots
+            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890.com", // Too long
+            "example.com.", // Ends with a dot
+            "3 + 5 * (2 - 1)", // Mathematical expression
+            "16385-12228.72", // Other mathetmatical expression
+            "example@domain.com", // Invalid character
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334:1234" // Invalid IPv6 address
+        ]
+
+        for hostname in invalidHostnames {
+            XCTAssertFalse(hostname.isValidHost, "\(hostname) should NOT be a valid host")
+        }
+    }
+
 }