From 8d0a34f28a77136888448100901306cf7b1ea000 Mon Sep 17 00:00:00 2001 From: Its Hex ! Date: Sun, 10 Jul 2022 23:39:43 +0200 Subject: [PATCH] Update go.mod (#689) * Exposing regex matches to json output (#668) * Update runner.go Fix regex json output. * small refactor Co-authored-by: mzack * Update go.mod * fixing jarm-go reference * removing redundant declaration Co-authored-by: Sandeep Singh Co-authored-by: Dothelm <49758889+st3rv04ka@users.noreply.github.com> Co-authored-by: mzack --- common/hashes/jarmhash.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- runner/runner.go | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/hashes/jarmhash.go b/common/hashes/jarmhash.go index 56c3936..d9fed77 100644 --- a/common/hashes/jarmhash.go +++ b/common/hashes/jarmhash.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/RumbleDiscovery/jarm-go" + "github.com/hdm/jarm-go" "golang.org/x/net/proxy" ) diff --git a/go.mod b/go.mod index 3ff27be..f300109 100644 --- a/go.mod +++ b/go.mod @@ -47,8 +47,8 @@ require github.com/spaolacci/murmur3 v1.1.0 require ( github.com/PuerkitoBio/goquery v1.8.0 - github.com/RumbleDiscovery/jarm-go v0.0.6 github.com/ammario/ipisp/v2 v2.0.0 + github.com/hdm/jarm-go v0.0.7 github.com/mfonda/simhash v0.0.0-20151007195837-79f94a1100d6 ) diff --git a/go.sum b/go.sum index 82ef0ab..2d8f7c8 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb888350 github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809/go.mod h1:upgc3Zs45jBDnBT4tVRgRcgm26ABpaP7MoTSdgysca4= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= -github.com/RumbleDiscovery/jarm-go v0.0.6 h1:n3JEmOhPyfhmu1aeDEK/10Y2F+GMUYrtGFZmp4Yj0s4= -github.com/RumbleDiscovery/jarm-go v0.0.6/go.mod h1:dXV7z5vBXQI0cNaHXwzGtq2PJ2LgM3XgcFiX32FU3bg= github.com/RumbleDiscovery/rumble-tools v0.0.0-20201105153123-f2adbb3244d2/go.mod h1:jD2+mU+E2SZUuAOHZvZj4xP4frlOo+N/YrXDvASFhkE= github.com/akrylysov/pogreb v0.10.0/go.mod h1:pNs6QmpQ1UlTJKDezuRWmaqkgUE2TuU0YTWyqJZ7+lI= github.com/akrylysov/pogreb v0.10.1 h1:FqlR8VR7uCbJdfUob916tPM+idpKgeESDXOA1K0DK4w= @@ -59,6 +57,8 @@ github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf h1:umfGUaWdFP2s6457fz1+xXYIWDxdGc7HdkLS9aJ1skk= github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf/go.mod h1:V99KdStnMHZsvVOwIvhfcUzYgYkRZeQWUtumtL+SKxA= +github.com/hdm/jarm-go v0.0.7 h1:Eq0geenHrBSYuKrdVhrBdMMzOmA+CAMLzN2WrF3eL6A= +github.com/hdm/jarm-go v0.0.7/go.mod h1:kinGoS0+Sdn1Rr54OtanET5E5n7AlD6T6CrJAKDjJSQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= diff --git a/runner/runner.go b/runner/runner.go index c28ca0c..37718c1 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -1291,6 +1291,7 @@ retry: } } + var extractRegex []string // extract regex var extractResult = map[string][]string{} if scanopts.extractRegexps != nil { @@ -1508,6 +1509,7 @@ retry: Lines: resp.Lines, Words: resp.Words, ASN: asnResponse, + ExtractRegex: extractRegex, } } @@ -1538,6 +1540,7 @@ type Result struct { CSPData *httpx.CSPData `json:"csp,omitempty" csv:"csp"` TLSData *cryptoutil.TLSData `json:"tls-grab,omitempty" csv:"tls-grab"` Hashes map[string]string `json:"hashes,omitempty" csv:"hashes"` + ExtractRegex []string `json:"extract-regex,omitempty" csv:"regex"` CDNName string `json:"cdn-name,omitempty" csv:"cdn-name"` Port string `json:"port,omitempty" csv:"port"` raw string