updates required by the Amass Scripting Engine

owasp-amass · Jun 10, 2020 · 1f28622 · 1f28622
1 parent f0ac478
commit 1f28622
Show file tree

Hide file tree

Showing 8 changed files with 583 additions and 359 deletions.
diff --git a/datasrcs/script.go b/datasrcs/script.go
diff --git a/datasrcs/script_exports.go b/datasrcs/script_exports.go
diff --git a/enum/enum.go b/enum/enum.go
@@ -280,7 +280,7 @@ func (e *Enumeration) Start() error {
 	 * discovered names that will train the machine learning system and to
 	 * release the similar names generated by the algorithm
 	 */
-	if false && !e.Config.Passive && e.Config.Alterations {
+	if !e.Config.Passive && e.Config.Alterations {
 		e.guessMgr = NewGuessManager(e)
 		defer e.guessMgr.Stop()
 		e.managers = append(e.managers, e.guessMgr)

diff --git a/enum/names.go b/enum/names.go
@@ -174,10 +174,10 @@ func (r *SubdomainManager) InputName(req *requests.DNSRequest) {
 
 	r.enum.srcsLock.Lock()
 	defer r.enum.srcsLock.Unlock()
-	// Alert all data sources to the newly discovered subdomain name
+	// Alert all data sources to the newly discovered resolved FQDN
 	for _, srv := range r.enum.Sys.DataSources() {
 		if r.enum.srcs.Has(srv.String()) {
-			srv.SubdomainDiscovered(r.enum.ctx, req, 1)
+			srv.Resolved(r.enum.ctx, req)
 		}
 	}
 }

diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/cayleygraph/quad v1.2.4
 	github.com/chromedp/cdproto v0.0.0-20200424080200-0de008e41fa0 // indirect
 	github.com/chromedp/chromedp v0.5.3 // indirect
+	github.com/cjoudrey/gluaurl v0.0.0-20161028222611-31cbb9bef199
 	github.com/dghubble/go-twitter v0.0.0-20190719072343-39e5462e111f
 	github.com/fatih/color v1.9.0
 	github.com/geziyor/geziyor v0.0.0-20191212210344-cfb16fe1ee0e

diff --git a/go.sum b/go.sum
@@ -83,6 +83,8 @@ github.com/chromedp/chromedp v0.5.3/go.mod h1:YLdPtndaHQ4rCpSpBG+IPpy9JvX0VD+7aa
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cjoudrey/gluaurl v0.0.0-20161028222611-31cbb9bef199 h1:cJ1E8ZwZLfercTX3dywnCAQDilbbi+m2cw3+8tCFpRo=
+github.com/cjoudrey/gluaurl v0.0.0-20161028222611-31cbb9bef199/go.mod h1:jC+zrjHA5CaxJzn+tojIoIOzSp/6BlkRWXnMlxNkB+g=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=

diff --git a/intel/intel.go b/intel/intel.go
@@ -310,6 +310,9 @@ func (c *Collection) ReverseWhois() error {
 	c.Bus.Subscribe(requests.NewWhoisTopic, collect)
 	defer c.Bus.Unsubscribe(requests.NewWhoisTopic, collect)
 
+	c.Bus.Subscribe(requests.SetActiveTopic, c.updateLastActive)
+	defer c.Bus.Unsubscribe(requests.SetActiveTopic, c.updateLastActive)
+
 	// Setup the stringset of included data sources
 	c.srcsLock.Lock()
 	srcs := stringset.New()

diff --git a/requests/service.go b/requests/service.go
@@ -48,6 +48,10 @@ type Service interface {
 	DNSRequest(ctx context.Context, req *DNSRequest)
 	OnDNSRequest(ctx context.Context, req *DNSRequest)
 
+	// Methods to support processing of resolved FQDNs
+	Resolved(ctx context.Context, req *DNSRequest)
+	OnResolved(ctx context.Context, req *DNSRequest)
+
 	// Methods to support processing of discovered proper subdomains
 	SubdomainDiscovered(ctx context.Context, req *DNSRequest, times int)
 	OnSubdomainDiscovered(ctx context.Context, req *DNSRequest, times int)
@@ -172,6 +176,16 @@ func (bas *BaseService) OnDNSRequest(ctx context.Context, req *DNSRequest) {
 	return
 }
 
+// Resolved adds the request provided by the parameter to the service request channel.
+func (bas *BaseService) Resolved(ctx context.Context, req *DNSRequest) {
+	bas.queueRequest(bas.service.OnResolved, ctx, req)
+}
+
+// OnResolved is called for a request that was queued via Resolved.
+func (bas *BaseService) OnResolved(ctx context.Context, req *DNSRequest) {
+	return
+}
+
 // SubdomainDiscovered adds the request provided by the parameter to the service request channel.
 func (bas *BaseService) SubdomainDiscovered(ctx context.Context, req *DNSRequest, times int) {
 	bas.queueRequest(bas.service.OnSubdomainDiscovered, ctx, req, times)