fixes

Author: caffix

engine/plugins/api/gleif/fuzzy.go

@@ -77,6 +77,7 @@ func (fc *fuzzyCompletions) lookup(e *et.Event, o *dbt.Entity, since time.Time)
 }
 
 func (fc *fuzzyCompletions) query(e *et.Event, orgent *dbt.Entity) *dbt.Entity {
+	exclusive := true
 	var lei *general.Identifier
 
 	if leient := fc.plugin.orgEntityToLEI(e, orgent); leient != nil {
@@ -115,6 +116,7 @@ func (fc *fuzzyCompletions) query(e *et.Event, orgent *dbt.Entity) *dbt.Entity {
 		if err := json.Unmarshal([]byte(resp.Body), &result); err != nil || len(result.Data) == 0 {
 			return nil
 		}
+		exclusive = len(result.Data) == 1
 
 		for _, d := range result.Data {
 			if fc.nameMatch(o, d.Attributes.Value) {
@@ -132,7 +134,7 @@ func (fc *fuzzyCompletions) query(e *et.Event, orgent *dbt.Entity) *dbt.Entity {
 	}
 
 	rec, err := fc.plugin.getLEIRecord(lei)
-	if err != nil || !fc.locMatch(e, orgent, rec) {
+	if err != nil || (!exclusive && !fc.locMatch(e, orgent, rec)) {
 		return nil
 	}
 
@@ -156,13 +158,19 @@ func (fc *fuzzyCompletions) nameMatch(o *org.Organization, name string) bool {
 }
 
 func (fc *fuzzyCompletions) locMatch(e *et.Event, orgent *dbt.Entity, rec *leiRecord) bool {
-	if edges, err := e.Session.Cache().OutgoingEdges(orgent, time.Time{}, "legal_address", "hq_address", "location"); err == nil {
+	legal_addr := rec.Attributes.Entity.LegalAddress
+	hq_addr := rec.Attributes.Entity.HeadquartersAddress
+
+	if edges, err := e.Session.Cache().OutgoingEdges(orgent,
+		time.Time{}, "legal_address", "hq_address", "location"); err == nil {
 		for _, edge := range edges {
 			if a, err := e.Session.Cache().FindEntityById(edge.ToEntity.ID); err == nil && a != nil {
-				if loc, ok := a.Asset.(*contact.Location); ok &&
-					(loc.PostalCode == rec.Attributes.Entity.LegalAddress.PostalCode ||
-						(loc.PostalCode == rec.Attributes.Entity.HeadquartersAddress.PostalCode)) {
-					return true
+				if loc, ok := a.Asset.(*contact.Location); ok {
+					for _, p := range append([]leiAddress{legal_addr, hq_addr}, rec.Attributes.Entity.OtherAddresses...) {
+						if loc.PostalCode == p.PostalCode {
+							return true
+						}
+					}
 				}
 			}
 		}
@@ -183,10 +191,12 @@ func (fc *fuzzyCompletions) locMatch(e *et.Event, orgent *dbt.Entity, rec *leiRe
 		if edges, err := e.Session.Cache().OutgoingEdges(cr, time.Time{}, "location"); err == nil {
 			for _, edge := range edges {
 				if a, err := e.Session.Cache().FindEntityById(edge.ToEntity.ID); err == nil && a != nil {
-					if loc, ok := a.Asset.(*contact.Location); ok &&
-						(loc.PostalCode == rec.Attributes.Entity.LegalAddress.PostalCode ||
-							(loc.PostalCode == rec.Attributes.Entity.HeadquartersAddress.PostalCode)) {
-						return true
+					if loc, ok := a.Asset.(*contact.Location); ok {
+						for _, p := range append([]leiAddress{legal_addr, hq_addr}, rec.Attributes.Entity.OtherAddresses...) {
+							if loc.PostalCode == p.PostalCode {
+								return true
+							}
+						}
 					}
 				}
 			}

engine/plugins/api/gleif/lei_record.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 
 	et "github.com/owasp-amass/amass/v4/engine/types"
 	"github.com/owasp-amass/amass/v4/utils/net/http"
@@ -61,3 +62,14 @@ func (g *gleif) createLEIFromRecord(e *et.Event, orgent *dbt.Entity, lei *leiRec
 		ExpirationDate: lei.Attributes.Registration.NextRenewalDate,
 	})
 }
+
+func (g *gleif) buildAddrFromLEIAddress(addr *leiAddress) string {
+	street := strings.Join(addr.AddressLines, " ")
+
+	province := addr.Region
+	if parts := strings.Split(province, "-"); len(parts) > 1 {
+		province = parts[1]
+	}
+
+	return fmt.Sprintf("%s %s %s %s %s", street, addr.City, province, addr.PostalCode, addr.Country)
+}

engine/plugins/api/gleif/org_lei.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"strings"
 	"time"
 
 	"github.com/owasp-amass/amass/v4/engine/plugins/support"
@@ -86,17 +85,6 @@ func (g *gleif) updateOrgFromLEIRecord(e *et.Event, orgent *dbt.Entity, lei *lei
 	_, _ = e.Session.Cache().CreateEntity(orgent)
 }
 
-func (g *gleif) buildAddrFromLEIAddress(addr *leiAddress) string {
-	street := strings.Join(addr.AddressLines, " ")
-
-	province := addr.Region
-	if parts := strings.Split(province, "-"); len(parts) > 1 {
-		province = parts[1]
-	}
-
-	return fmt.Sprintf("%s %s %s %s %s", street, addr.City, province, addr.PostalCode, addr.Country)
-}
-
 func (g *gleif) addAddress(e *et.Event, orgent *dbt.Entity, rel oam.Relation, addr string) error {
 	loc := support.StreetAddressToLocation(addr)
 	if loc == nil {