projectdiscovery/httpx
1
1
Fork 0
mirror of https://github.com/projectdiscovery/httpx.git synced 2024-08-17 05:20:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update go.mod (#689)

Browse Source 
* Exposing regex matches to json output (#668)

* Update runner.go

Fix regex json output.

* small refactor

Co-authored-by: mzack <marco.rivoli.nvh@gmail.com>

* Update go.mod

* fixing jarm-go reference

* removing redundant declaration

Co-authored-by: Sandeep Singh <sandeep@projectdiscovery.io>
Co-authored-by: Dothelm <49758889+st3rv04ka@users.noreply.github.com>
Co-authored-by: mzack <marco.rivoli.nvh@gmail.com>
This commit is contained in:
Its Hex ! 2022-07-10 23:39:43 +02:00 committed by GitHub
parent 59151fb6fb
commit 8d0a34f28a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/hashes/jarmhash.go
View File

@ -8,7 +8,7 @@ import (
"strings"
"time"
"github.com/RumbleDiscovery/jarm-go"
"github.com/hdm/jarm-go"
"golang.org/x/net/proxy"
)

2
go.mod
View File

@ -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
)

4
go.sum
View File

@ -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=

3
runner/runner.go
View File

@ -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