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

This commit is contained in:
Evan Hosinski
2025-05-15 15:54:59 -04:00
parent f840209865
commit 749f2b5eb8
+21 -11
View File
@@ -59,27 +59,28 @@ func (dsr *DehashedSearchRequest) buildQuery(query string, param DehashedParamet
} }
func (dsr *DehashedSearchRequest) AddUsernameQuery(query string) { func (dsr *DehashedSearchRequest) AddUsernameQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Username.GetArgumentString(query), Username) dsr.buildQuery(Username.GetArgumentString(query), Username)
} }
func (dsr *DehashedSearchRequest) AddEmailQuery(query string) { func (dsr *DehashedSearchRequest) AddEmailQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Email.GetArgumentString(query), Email) dsr.buildQuery(Email.GetArgumentString(query), Email)
} }
func (dsr *DehashedSearchRequest) AddIpAddressQuery(query string) { func (dsr *DehashedSearchRequest) AddIpAddressQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(IpAddress.GetArgumentString(query), IpAddress) dsr.buildQuery(IpAddress.GetArgumentString(query), IpAddress)
} }
func (dsr *DehashedSearchRequest) AddDomainQuery(query string) { func (dsr *DehashedSearchRequest) AddDomainQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Domain.GetArgumentString(query), Domain) dsr.buildQuery(Domain.GetArgumentString(query), Domain)
} }
func (dsr *DehashedSearchRequest) AddPasswordQuery(query string) { func (dsr *DehashedSearchRequest) AddPasswordQuery(query string) {
if dsr.ForcePlaintext { if dsr.ForcePlaintext {
query = enquoteSpaced(query)
dsr.buildQuery(Password.GetArgumentString(query), Password) dsr.buildQuery(Password.GetArgumentString(query), Password)
return return
} }
@@ -89,41 +90,42 @@ func (dsr *DehashedSearchRequest) AddPasswordQuery(query string) {
} }
func (dsr *DehashedSearchRequest) AddVinQuery(query string) { func (dsr *DehashedSearchRequest) AddVinQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Vin.GetArgumentString(query), Vin) dsr.buildQuery(Vin.GetArgumentString(query), Vin)
} }
func (dsr *DehashedSearchRequest) AddLicensePlateQuery(query string) { func (dsr *DehashedSearchRequest) AddLicensePlateQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(LicensePlate.GetArgumentString(query), LicensePlate) dsr.buildQuery(LicensePlate.GetArgumentString(query), LicensePlate)
} }
func (dsr *DehashedSearchRequest) AddAddressQuery(query string) { func (dsr *DehashedSearchRequest) AddAddressQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Address.GetArgumentString(query), Address) dsr.buildQuery(Address.GetArgumentString(query), Address)
} }
func (dsr *DehashedSearchRequest) AddPhoneQuery(query string) { func (dsr *DehashedSearchRequest) AddPhoneQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Phone.GetArgumentString(query), Phone) dsr.buildQuery(Phone.GetArgumentString(query), Phone)
} }
func (dsr *DehashedSearchRequest) AddSocialQuery(query string) { func (dsr *DehashedSearchRequest) AddSocialQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Social.GetArgumentString(query), Social) dsr.buildQuery(Social.GetArgumentString(query), Social)
} }
func (dsr *DehashedSearchRequest) AddCryptoAddressQuery(query string) { func (dsr *DehashedSearchRequest) AddCryptoAddressQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(CryptoAddress.GetArgumentString(query), CryptoAddress) dsr.buildQuery(CryptoAddress.GetArgumentString(query), CryptoAddress)
} }
func (dsr *DehashedSearchRequest) AddHashedPasswordQuery(query string) { func (dsr *DehashedSearchRequest) AddHashedPasswordQuery(query string) {
query = strings.TrimSpace(query)
dsr.buildQuery(HashedPassword.GetArgumentString(query), HashedPassword) dsr.buildQuery(HashedPassword.GetArgumentString(query), HashedPassword)
} }
func (dsr *DehashedSearchRequest) AddNameQuery(query string) { func (dsr *DehashedSearchRequest) AddNameQuery(query string) {
query = strings.TrimSpace(query) query = enquoteSpaced(query)
dsr.buildQuery(Name.GetArgumentString(query), Name) dsr.buildQuery(Name.GetArgumentString(query), Name)
} }
@@ -191,3 +193,11 @@ func (dcv2 *DehashedClientV2) GetResults() sqlite.DehashedResults {
func (dcv2 *DehashedClientV2) GetTotalResults() int { func (dcv2 *DehashedClientV2) GetTotalResults() int {
return len(dcv2.results) return len(dcv2.results)
} }
func enquoteSpaced(s string) string {
s = strings.TrimSpace(s)
if strings.Contains(s, " ") {
return fmt.Sprintf("\"%s\"", s)
}
return s
}