starting to remove refs to old asset types

Author: caffix

engine/plugins/service_discovery/http_probes/http_interrogation.go

@@ -21,6 +21,7 @@ import (
 	oamcert "github.com/owasp-amass/open-asset-model/certificate"
 	"github.com/owasp-amass/open-asset-model/domain"
 	"github.com/owasp-amass/open-asset-model/network"
+	"github.com/owasp-amass/open-asset-model/relation"
 	"github.com/owasp-amass/open-asset-model/service"
 )
 
@@ -46,11 +47,6 @@ func (r *interrogation) check(e *et.Event) error {
 		return nil
 	}
 
-	src := support.GetSource(e.Session, r.plugin.source)
-	if src == nil {
-		return errors.New("failed to obtain the plugin source information")
-	}
-
 	matches, err := e.Session.Config().CheckTransformations(string(atype), append(r.transforms, r.plugin.name)...)
 	if err != nil || matches.Len() == 0 {
 		return nil
@@ -67,12 +63,13 @@ func (r *interrogation) check(e *et.Event) error {
 		return err
 	}
 
+	src := r.plugin.source
 	var findings []*support.Finding
-	if support.AssetMonitoredWithinTTL(e.Session, e.Asset, src, since) {
-		findings = append(findings, r.lookup(e, e.Asset, src, since)...)
+	if support.AssetMonitoredWithinTTL(e.Session, e.Entity, src, since) {
+		findings = append(findings, r.lookup(e, e.Entity, src, since)...)
 	} else {
-		findings = append(findings, r.query(e, e.Asset, src)...)
-		support.MarkAssetMonitored(e.Session, e.Asset, src)
+		findings = append(findings, r.query(e, e.Entity, src)...)
+		support.MarkAssetMonitored(e.Session, e.Entity, src)
 	}
 
 	if len(findings) > 0 {
@@ -81,7 +78,7 @@ func (r *interrogation) check(e *et.Event) error {
 	return nil
 }
 
-func (r *interrogation) lookup(e *et.Event, asset, src *dbt.Asset, since time.Time) []*support.Finding {
+func (r *interrogation) lookup(e *et.Event, asset *dbt.Entity, src *et.Source, since time.Time) []*support.Finding {
 	fqdn := asset.Asset.Key()
 	var findings []*support.Finding
 	atype := string(oam.NetworkEndpoint)
@@ -103,11 +100,11 @@ func (r *interrogation) lookup(e *et.Event, asset, src *dbt.Asset, since time.Ti
 	return findings
 }
 
-func (r *interrogation) query(e *et.Event, asset, src *dbt.Asset) []*support.Finding {
+func (r *interrogation) query(e *et.Event, entity *dbt.Entity, src *et.Source) []*support.Finding {
 	var findings []*support.Finding
 
 	var addr, host string
-	if sa, ok := asset.Asset.(*network.SocketAddress); ok {
+	if sa, ok := entity.Asset.(*network.SocketAddress); ok {
 		addr = sa.Protocol + "://"
 		host = sa.IPAddress.String()
 
@@ -116,7 +113,7 @@ func (r *interrogation) query(e *et.Event, asset, src *dbt.Asset) []*support.Fin
 		} else {
 			addr += sa.Address.String()
 		}
-	} else if ne, ok := asset.Asset.(*domain.NetworkEndpoint); ok {
+	} else if ne, ok := entity.Asset.(*domain.NetworkEndpoint); ok {
 		host = ne.Name
 		addr = ne.Protocol + "://"
 
@@ -138,55 +135,42 @@ func (r *interrogation) query(e *et.Event, asset, src *dbt.Asset) []*support.Fin
 	return findings
 }
 
-func (r *interrogation) store(e *et.Event, resp *http.Response, asset, src *dbt.Asset) []*support.Finding {
-	addr := asset.Asset.Key()
+func (r *interrogation) store(e *et.Event, resp *http.Response, entity *dbt.Entity, src *et.Source) []*support.Finding {
+	addr := entity.Asset.Key()
 	var findings []*support.Finding
 
-	var firstAsset *dbt.Asset
+	var firstAsset *dbt.Entity
 	var firstCert *x509.Certificate
 	if resp.TLS != nil && resp.TLS.HandshakeComplete && len(resp.TLS.PeerCertificates) > 0 {
-		done := make(chan struct{}, 1)
-
-		support.AppendToDBQueue(func() {
-			defer func() { done <- struct{}{} }()
+		var prev *dbt.Entity
+		// traverse the certificate chain
+		for _, cert := range resp.TLS.PeerCertificates {
+			c := support.X509ToOAMTLSCertificate(cert)
+			if c == nil {
+				break
+			}
 
-			if e.Session.Done() {
-				return
+			a, err := e.Session.Cache().CreateAsset(c)
+			if err != nil {
+				break
 			}
 
-			var prev *dbt.Asset
-			// traverse the certificate chain
-			for _, cert := range resp.TLS.PeerCertificates {
-				c := support.X509ToOAMTLSCertificate(cert)
-				if c == nil {
-					break
-				}
-
-				a, err := e.Session.DB().Create(prev, "issuing_certificate", c)
-				if err != nil {
-					break
-				}
-				_, _ = e.Session.DB().Link(a, "source", src)
-
-				if prev == nil {
-					firstAsset = a
-					firstCert = cert
-				} else {
-					tls := prev.Asset.(*oamcert.TLSCertificate)
-					findings = append(findings, &support.Finding{
-						From:     prev,
-						FromName: tls.SerialNumber,
-						To:       a,
-						ToName:   c.SerialNumber,
-						ToMeta:   cert,
-						Rel:      "issuing_certificate",
-					})
-				}
-				prev = a
+			if prev == nil {
+				firstAsset = a
+				firstCert = cert
+			} else {
+				tls := prev.Asset.(*oamcert.TLSCertificate)
+				findings = append(findings, &support.Finding{
+					From:     prev,
+					FromName: tls.SerialNumber,
+					To:       a,
+					ToName:   c.SerialNumber,
+					ToMeta:   cert,
+					Rel:      &relation.SimpleRelation{Name: "issuing_certificate"},
+				})
 			}
-		})
-		<-done
-		close(done)
+			prev = a
+		}
 	}
 
 	serv := support.ServiceWithIdentifier(&r.plugin.hash, e.Session.ID().String(), addr)
@@ -202,18 +186,18 @@ func (r *interrogation) store(e *et.Event, resp *http.Response, asset, src *dbt.
 		c = firstAsset.Asset.(*oamcert.TLSCertificate)
 	}
 
-	s, err := support.CreateServiceAsset(e.Session, asset, "service", serv, c)
+	s, err := support.CreateServiceAsset(e.Session, entity, "service", serv, c)
 	if err != nil {
 		return findings
 	}
 
 	serv = s.Asset.(*service.Service)
 	findings = append(findings, &support.Finding{
-		From:     asset,
+		From:     entity,
 		FromName: addr,
 		To:       s,
 		ToName:   "Service: " + serv.Identifier,
-		Rel:      "service",
+		Rel:      &relation.SimpleRelation{Name: "port"},
 	})
 
 	if firstAsset != nil && firstCert != nil {
@@ -223,24 +207,14 @@ func (r *interrogation) store(e *et.Event, resp *http.Response, asset, src *dbt.
 			To:       firstAsset,
 			ToName:   c.SerialNumber,
 			ToMeta:   firstCert,
-			Rel:      "certificate",
+			Rel:      &relation.SimpleRelation{Name: "certificate"},
 		})
 	}
 
-	done := make(chan struct{}, 1)
-	support.AppendToDBQueue(func() {
-		defer func() { done <- struct{}{} }()
-		_, _ = e.Session.DB().Link(s, "source", src)
-		if firstAsset != nil {
-			_, _ = e.Session.DB().Link(s, "certificate", firstAsset)
-		}
-	})
-	<-done
-	close(done)
 	return findings
 }
 
-func (r *interrogation) process(e *et.Event, findings []*support.Finding, src *dbt.Asset) {
+func (r *interrogation) process(e *et.Event, findings []*support.Finding, src *et.Source) {
 	support.ProcessAssetsWithSource(e, findings, src, r.plugin.name, r.name)
 }
 

engine/plugins/service_discovery/http_probes/ipaddr_endpoint.go

@@ -16,6 +16,7 @@ import (
 	dbt "github.com/owasp-amass/asset-db/types"
 	oam "github.com/owasp-amass/open-asset-model"
 	"github.com/owasp-amass/open-asset-model/network"
+	"github.com/owasp-amass/open-asset-model/property"
 )
 
 type ipaddrEndpoint struct {
@@ -28,7 +29,7 @@ func (r *ipaddrEndpoint) Name() string {
 }
 
 func (r *ipaddrEndpoint) check(e *et.Event) error {
-	ip, ok := e.Asset.Asset.(*network.IPAddress)
+	ip, ok := e.Entity.Asset.(*network.IPAddress)
 	if !ok {
 		return errors.New("failed to extract the IPAddress asset")
 	}
@@ -45,22 +46,18 @@ func (r *ipaddrEndpoint) check(e *et.Event) error {
 		return nil
 	}
 
-	src := support.GetSource(e.Session, r.plugin.source)
-	if src == nil {
-		return errors.New("failed to obtain the plugin source information")
-	}
-
 	since, err := support.TTLStartTime(e.Session.Config(), string(oam.IPAddress), string(oam.SocketAddress), r.name)
 	if err != nil {
 		return err
 	}
 
+	src := r.plugin.source
 	var findings []*support.Finding
-	if support.AssetMonitoredWithinTTL(e.Session, e.Asset, src, since) {
-		findings = append(findings, r.lookup(e, e.Asset, src, since)...)
+	if support.AssetMonitoredWithinTTL(e.Session, e.Entity, src, since) {
+		findings = append(findings, r.lookup(e, e.Entity, src, since)...)
 	} else {
-		findings = append(findings, r.store(e, e.Asset, src)...)
-		support.MarkAssetMonitored(e.Session, e.Asset, src)
+		findings = append(findings, r.store(e, e.Entity, src)...)
+		support.MarkAssetMonitored(e.Session, e.Entity, src)
 	}
 
 	if len(findings) > 0 {
@@ -71,7 +68,7 @@ func (r *ipaddrEndpoint) check(e *et.Event) error {
 	return nil
 }
 
-func (r *ipaddrEndpoint) lookup(e *et.Event, asset, src *dbt.Asset, since time.Time) []*support.Finding {
+func (r *ipaddrEndpoint) lookup(e *et.Event, asset *dbt.Entity, src *et.Source, since time.Time) []*support.Finding {
 	addr := asset.Asset.Key()
 	var findings []*support.Finding
 	atype := string(oam.SocketAddress)
@@ -93,7 +90,7 @@ func (r *ipaddrEndpoint) lookup(e *et.Event, asset, src *dbt.Asset, since time.T
 	return findings
 }
 
-func (r *ipaddrEndpoint) store(e *et.Event, asset, src *dbt.Asset) []*support.Finding {
+func (r *ipaddrEndpoint) store(e *et.Event, asset *dbt.Entity, src *et.Source) []*support.Finding {
 	var findings []*support.Finding
 	ip := asset.Asset.(*network.IPAddress)
 
@@ -139,31 +136,20 @@ func (r *ipaddrEndpoint) store(e *et.Event, asset, src *dbt.Asset) []*support.Fi
 	return findings
 }
 
-func (r *ipaddrEndpoint) process(e *et.Event, findings []*support.Finding, src *dbt.Asset) {
+func (r *ipaddrEndpoint) process(e *et.Event, findings []*support.Finding, src *et.Source) {
 	support.ProcessAssetsWithSource(e, findings, src, r.plugin.name, r.name)
 }
 
-func sweepCallback(e *et.Event, ip *network.IPAddress, src *dbt.Asset) {
-	done := make(chan *dbt.Asset, 1)
-	support.AppendToDBQueue(func() {
-		if e.Session.Done() {
-			done <- nil
-			return
-		}
-
-		addr, err := e.Session.DB().Create(nil, "", ip)
-		if err == nil && addr != nil {
-			_, _ = e.Session.DB().Link(addr, "source", src)
-		}
-		done <- addr
-	})
-
-	if addr := <-done; addr != nil {
+func sweepCallback(e *et.Event, ip *network.IPAddress, src *et.Source) {
+	if entity, err := e.Session.Cache().CreateAsset(ip); err == nil && entity != nil {
+		_, _ = e.Session.Cache().CreateEntityProperty(entity, &property.SourceProperty{
+			Source:     src.Name,
+			Confidence: src.Confidence,
+		})
 		_ = e.Dispatcher.DispatchEvent(&et.Event{
 			Name:    ip.Address.String(),
-			Asset:   addr,
+			Entity:  entity,
 			Session: e.Session,
 		})
 	}
-	close(done)
 }

engine/plugins/service_discovery/http_probes/plugin.go

@@ -11,7 +11,6 @@ import (
 	"github.com/owasp-amass/amass/v4/engine/plugins/support"
 	et "github.com/owasp-amass/amass/v4/engine/types"
 	oam "github.com/owasp-amass/open-asset-model"
-	"github.com/owasp-amass/open-asset-model/source"
 )
 
 type httpProbing struct {
@@ -20,14 +19,14 @@ type httpProbing struct {
 	fqdnend *fqdnEndpoint
 	ipaddr  *ipaddrEndpoint
 	interr  *interrogation
-	source  *source.Source
+	source  *et.Source
 	hash    maphash.Hash
 }
 
 func NewHTTPProbing() et.Plugin {
 	return &httpProbing{
 		name: "HTTP-Probes",
-		source: &source.Source{
+		source: &et.Source{
 			Name:       "HTTP-Probes",
 			Confidence: 100,
 		},