From 749f2b5eb82721a03c60ca4c5e7542e7b8126f49 Mon Sep 17 00:00:00 2001
From: Evan Hosinski <ehosinski@krakensec.tech>
Date: Thu, 15 May 2025 15:54:59 -0400
Subject: [PATCH] Added requirement where if a variable sent to dehashed
 includes a space it must be enclosed with double quotes. Enforced this with
 enquoteSpaced in clientv2.go

---
 internal/query/clientv2.go | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/internal/query/clientv2.go b/internal/query/clientv2.go
index 3412cba..b54a06b 100644
--- a/internal/query/clientv2.go
+++ b/internal/query/clientv2.go
@@ -59,27 +59,28 @@ func (dsr *DehashedSearchRequest) buildQuery(query string, param DehashedParamet
 }
 
 func (dsr *DehashedSearchRequest) AddUsernameQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Username.GetArgumentString(query), Username)
 }
 
 func (dsr *DehashedSearchRequest) AddEmailQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Email.GetArgumentString(query), Email)
 }
 
 func (dsr *DehashedSearchRequest) AddIpAddressQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(IpAddress.GetArgumentString(query), IpAddress)
 }
 
 func (dsr *DehashedSearchRequest) AddDomainQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Domain.GetArgumentString(query), Domain)
 }
 
 func (dsr *DehashedSearchRequest) AddPasswordQuery(query string) {
 	if dsr.ForcePlaintext {
+		query = enquoteSpaced(query)
 		dsr.buildQuery(Password.GetArgumentString(query), Password)
 		return
 	}
@@ -89,41 +90,42 @@ func (dsr *DehashedSearchRequest) AddPasswordQuery(query string) {
 }
 
 func (dsr *DehashedSearchRequest) AddVinQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Vin.GetArgumentString(query), Vin)
 }
 
 func (dsr *DehashedSearchRequest) AddLicensePlateQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(LicensePlate.GetArgumentString(query), LicensePlate)
 }
 
 func (dsr *DehashedSearchRequest) AddAddressQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Address.GetArgumentString(query), Address)
 }
 
 func (dsr *DehashedSearchRequest) AddPhoneQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Phone.GetArgumentString(query), Phone)
 }
 
 func (dsr *DehashedSearchRequest) AddSocialQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Social.GetArgumentString(query), Social)
 }
 
 func (dsr *DehashedSearchRequest) AddCryptoAddressQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(CryptoAddress.GetArgumentString(query), CryptoAddress)
 }
 
 func (dsr *DehashedSearchRequest) AddHashedPasswordQuery(query string) {
+	query = strings.TrimSpace(query)
 	dsr.buildQuery(HashedPassword.GetArgumentString(query), HashedPassword)
 }
 
 func (dsr *DehashedSearchRequest) AddNameQuery(query string) {
-	query = strings.TrimSpace(query)
+	query = enquoteSpaced(query)
 	dsr.buildQuery(Name.GetArgumentString(query), Name)
 }
 
@@ -191,3 +193,11 @@ func (dcv2 *DehashedClientV2) GetResults() sqlite.DehashedResults {
 func (dcv2 *DehashedClientV2) GetTotalResults() int {
 	return len(dcv2.results)
 }
+
+func enquoteSpaced(s string) string {
+	s = strings.TrimSpace(s)
+	if strings.Contains(s, " ") {
+		return fmt.Sprintf("\"%s\"", s)
+	}
+	return s
+}