Skip to content

Commit 669eee2

Browse files
ehsandeepehsandeep
committed
Merge remote-tracking branch 'origin'
2 parents 1f38d6b + b23e176 commit 669eee2

File tree

44 files changed

+994
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+994
-645
lines changed

‎cmd/integration-test/flow.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var flowTestcases = []TestCaseInfo{
1414
{Path: "flow/conditional-flow.yaml", TestCase: &conditionalFlow{}},
1515
{Path: "flow/conditional-flow-negative.yaml", TestCase: &conditionalFlowNegative{}},
1616
{Path: "flow/iterate-values-flow.yaml", TestCase: &iterateValuesFlow{}},
17+
{Path: "flow/iterate-one-value-flow.yaml", TestCase: &iterateOneValueFlow{}},
1718
{Path: "flow/dns-ns-probe.yaml", TestCase: &dnsNsProbe{}},
1819
{Path: "flow/flow-hide-matcher.yaml", TestCase: &flowHideMatcher{}},
1920
}
@@ -70,6 +71,16 @@ func (t *iterateValuesFlow) Execute(filePath string) error {
7071
return expectResultsCount(results, 2)
7172
}
7273

74+
type iterateOneValueFlow struct{}
75+
76+
func (t *iterateOneValueFlow) Execute(filePath string) error {
77+
results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "https://scanme.sh", debug)
78+
if err != nil {
79+
return err
80+
}
81+
return expectResultsCount(results, 1)
82+
}
83+
7384
type dnsNsProbe struct{}
7485

7586
func (t *dnsNsProbe) Execute(filePath string) error {

‎cmd/integration-test/interactsh.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package main
22

3-
import osutils "github.com/projectdiscovery/utils/os"
4-
53
// All Interactsh related testcases
64
var interactshTestCases = []TestCaseInfo{
7-
{Path: "protocols/http/interactsh.yaml", TestCase: &httpInteractshRequest{}, DisableOn: func() bool { return osutils.IsWindows() || osutils.IsOSX() }},
8-
{Path: "protocols/http/interactsh-stop-at-first-match.yaml", TestCase: &httpInteractshStopAtFirstMatchRequest{}, DisableOn: func() bool { return osutils.IsWindows() || osutils.IsOSX() }},
9-
{Path: "protocols/http/default-matcher-condition.yaml", TestCase: &httpDefaultMatcherCondition{}, DisableOn: func() bool { return true }}, // disable this test for now
5+
{Path: "protocols/http/interactsh.yaml", TestCase: &httpInteractshRequest{}, DisableOn: func() bool { return false }},
6+
{Path: "protocols/http/interactsh-stop-at-first-match.yaml", TestCase: &httpInteractshStopAtFirstMatchRequest{}, DisableOn: func() bool { return false }}, // disable this test for now
7+
{Path: "protocols/http/default-matcher-condition.yaml", TestCase: &httpDefaultMatcherCondition{}, DisableOn: func() bool { return false }},
108
{Path: "protocols/http/interactsh-requests-mc-and.yaml", TestCase: &httpInteractshRequestsWithMCAnd{}},
119
}

‎cmd/nuclei/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ on extensive configurability, massive extensibility and ease of use.`)
319319
flagSet.IntVarP(&options.TemplateThreads, "concurrency", "c", 25, "maximum number of templates to be executed in parallel"),
320320
flagSet.IntVarP(&options.HeadlessBulkSize, "headless-bulk-size", "hbs", 10, "maximum number of headless hosts to be analyzed in parallel per template"),
321321
flagSet.IntVarP(&options.HeadlessTemplateThreads, "headless-concurrency", "headc", 10, "maximum number of headless templates to be executed in parallel"),
322+
flagSet.IntVarP(&options.JsConcurrency, "js-concurrency", "jsc", 120, "maximum number of javascript runtimes to be executed in parallel"),
322323
)
323324
flagSet.CreateGroup("optimization", "Optimizations",
324325
flagSet.IntVar(&options.Timeout, "timeout", 10, "time to wait in seconds before timeout"),

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ require (
2121
github.com/olekukonko/tablewriter v0.0.5
2222
github.com/pkg/errors v0.9.1
2323
github.com/projectdiscovery/clistats v0.0.20
24-
github.com/projectdiscovery/fastdialer v0.0.55
25-
github.com/projectdiscovery/hmap v0.0.34
24+
github.com/projectdiscovery/fastdialer v0.0.57
25+
github.com/projectdiscovery/hmap v0.0.36
2626
github.com/projectdiscovery/interactsh v1.1.8
2727
github.com/projectdiscovery/rawhttp v0.1.35
28-
github.com/projectdiscovery/retryabledns v1.0.51
28+
github.com/projectdiscovery/retryabledns v1.0.53
2929
github.com/projectdiscovery/retryablehttp-go v1.0.44
3030
github.com/projectdiscovery/yamldoc-go v1.0.4
3131
github.com/remeh/sizedwaitgroup v1.0.0
@@ -68,29 +68,29 @@ require (
6868
github.com/go-git/go-git/v5 v5.11.0
6969
github.com/go-ldap/ldap/v3 v3.4.5
7070
github.com/go-pg/pg v8.0.7+incompatible
71-
github.com/go-sql-driver/mysql v1.6.0
71+
github.com/go-sql-driver/mysql v1.7.1
7272
github.com/h2non/filetype v1.1.3
73-
github.com/hirochachacha/go-smb2 v1.1.0
7473
github.com/labstack/echo/v4 v4.10.2
7574
github.com/lib/pq v1.10.1
7675
github.com/mholt/archiver v3.1.1+incompatible
7776
github.com/ory/dockertest/v3 v3.10.0
7877
github.com/praetorian-inc/fingerprintx v1.1.9
79-
github.com/projectdiscovery/dsl v0.0.40
78+
github.com/projectdiscovery/dsl v0.0.41
8079
github.com/projectdiscovery/fasttemplate v0.0.2
81-
github.com/projectdiscovery/goflags v0.1.35
80+
github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb
81+
github.com/projectdiscovery/goflags v0.1.36
8282
github.com/projectdiscovery/gologger v1.1.12
8383
github.com/projectdiscovery/gostruct v0.0.2
8484
github.com/projectdiscovery/gozero v0.0.1
8585
github.com/projectdiscovery/httpx v1.3.8
8686
github.com/projectdiscovery/mapcidr v1.1.16
8787
github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5
88-
github.com/projectdiscovery/ratelimit v0.0.24
88+
github.com/projectdiscovery/ratelimit v0.0.26
8989
github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917
9090
github.com/projectdiscovery/sarif v0.0.1
91-
github.com/projectdiscovery/tlsx v1.1.6-0.20231116215000-e842dc367a74
91+
github.com/projectdiscovery/tlsx v1.1.6
9292
github.com/projectdiscovery/uncover v1.0.7
93-
github.com/projectdiscovery/utils v0.0.75
93+
github.com/projectdiscovery/utils v0.0.76
9494
github.com/projectdiscovery/wappalyzergo v0.0.109
9595
github.com/redis/go-redis/v9 v9.1.0
9696
github.com/ropnop/gokrb5/v8 v8.0.0-20201111231119-729746023c02

‎go.sum‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ github.com/go-rod/rod v0.114.0/go.mod h1:aiedSEFg5DwG/fnNbUOTPMTTWX3MRj6vIs/a684
379379
github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
380380
github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
381381
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
382-
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
383-
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
382+
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
383+
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
384384
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
385385
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
386386
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
@@ -546,8 +546,6 @@ github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf h1:umfGUaWdFP2s6
546546
github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf/go.mod h1:V99KdStnMHZsvVOwIvhfcUzYgYkRZeQWUtumtL+SKxA=
547547
github.com/hdm/jarm-go v0.0.7 h1:Eq0geenHrBSYuKrdVhrBdMMzOmA+CAMLzN2WrF3eL6A=
548548
github.com/hdm/jarm-go v0.0.7/go.mod h1:kinGoS0+Sdn1Rr54OtanET5E5n7AlD6T6CrJAKDjJSQ=
549-
github.com/hirochachacha/go-smb2 v1.1.0 h1:b6hs9qKIql9eVXAiN0M2wSFY5xnhbHAQoCwRKbaRTZI=
550-
github.com/hirochachacha/go-smb2 v1.1.0/go.mod h1:8F1A4d5EZzrGu5R7PU163UcMRDJQl4FtcxjBfsY8TZE=
551549
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
552550
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
553551
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 h1:i462o439ZjprVSFSZLZxcsoAe592sZB1rci2Z8j4wdk=
@@ -803,24 +801,26 @@ github.com/projectdiscovery/cdncheck v1.0.9 h1:BS15gzj9gb5AVSKqTDzPamfSgStu7nJQO
803801
github.com/projectdiscovery/cdncheck v1.0.9/go.mod h1:18SSl1w7rMj53CGeRIZTbDoa286a6xZIxGbaiEo4Fxs=
804802
github.com/projectdiscovery/clistats v0.0.20 h1:5jO5SLiRJ7f0nDV0ndBNmBeesbROouPooH+DGMgoWq4=
805803
github.com/projectdiscovery/clistats v0.0.20/go.mod h1:GJ2av0KnOvK0AISQnP8hyDclYIji1LVkx2l0pwnzAu4=
806-
github.com/projectdiscovery/dsl v0.0.40 h1:bY6aOPEIJ+YYYXX2qRZj1y4VsZlV9VU0oaD+GrR/j6I=
807-
github.com/projectdiscovery/dsl v0.0.40/go.mod h1:wo6lB5vwKWbTo5qDdJ1q7S1bYthm2mwGZ+MVefJmdZo=
808-
github.com/projectdiscovery/fastdialer v0.0.55 h1:dcD3La9MsImgQMrBnG0/w5Mu8PRJu2TU1STycKSSodc=
809-
github.com/projectdiscovery/fastdialer v0.0.55/go.mod h1:DNP62sWCLp0YHXwhlo73iyZODpSZE7dVstt2GNAC7+A=
804+
github.com/projectdiscovery/dsl v0.0.41 h1:lAn+W/Lu6q0xvWJ3QhxUiKWg+p3LL/kALeoZJm23Wk8=
805+
github.com/projectdiscovery/dsl v0.0.41/go.mod h1:p1FYAyqoiC9eWYoJDQuqARETv6OCYVmZOqOD+e3RPJE=
806+
github.com/projectdiscovery/fastdialer v0.0.57 h1:4k/JuioxwbPOp3TKejm1lZlgTvXKu1IKlqQP3WAk65A=
807+
github.com/projectdiscovery/fastdialer v0.0.57/go.mod h1:Ah8GVwZr8X+0EQwMI66yMLTpS5QrDStc68tGtvPEaEw=
810808
github.com/projectdiscovery/fasttemplate v0.0.2 h1:h2cISk5xDhlJEinlBQS6RRx0vOlOirB2y3Yu4PJzpiA=
811809
github.com/projectdiscovery/fasttemplate v0.0.2/go.mod h1:XYWWVMxnItd+r0GbjA1GCsUopMw1/XusuQxdyAIHMCw=
812810
github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q=
813811
github.com/projectdiscovery/freeport v0.0.5/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE=
814-
github.com/projectdiscovery/goflags v0.1.35 h1:tSxKmJci+aoy0Eu8wgGqD5Kg8lee7Et0LI5uq51473M=
815-
github.com/projectdiscovery/goflags v0.1.35/go.mod h1:MfK1JFmW5c4nMtcWxG6HeJCIWJVKCrVTkecuwyZyoA0=
812+
github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb h1:rutG906Drtbpz4DwU5mhGIeOhRcktDH4cGQitGUMAsg=
813+
github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb/go.mod h1:FLjF1DmZ+POoGEiIQdWuYVwS++C/GwpX8YaCsTSm1RY=
814+
github.com/projectdiscovery/goflags v0.1.36 h1:gElwVU9BJsUbxjyHqDTmlGsB8Br2DDxbfMQMXLYvYhg=
815+
github.com/projectdiscovery/goflags v0.1.36/go.mod h1:A+MLWJgGKZ2WUED0ZlW5EQ4mmJ/s71VnvY6KF5ThLaM=
816816
github.com/projectdiscovery/gologger v1.1.12 h1:uX/QkQdip4PubJjjG0+uk5DtyAi1ANPJUvpmimXqv4A=
817817
github.com/projectdiscovery/gologger v1.1.12/go.mod h1:DI8nywPLERS5mo8QEA9E7gd5HZ3Je14SjJBH3F5/kLw=
818818
github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBDDSv7VEdG1M=
819819
github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE=
820820
github.com/projectdiscovery/gozero v0.0.1 h1:f08ZnYlbDZV/TNGDvIXV9s/oB/sAI+HWaSbW4em4aKM=
821821
github.com/projectdiscovery/gozero v0.0.1/go.mod h1:/dHwbly+1lhOX9UreVure4lEe7K4hIHeu/c/wZGNTDo=
822-
github.com/projectdiscovery/hmap v0.0.34 h1:Xz/CjuHVw/QCrupScMFkGN0YEIkz+jkAwqbHJ9A0C9I=
823-
github.com/projectdiscovery/hmap v0.0.34/go.mod h1:FQy913/mK7Tc2BoTpV2kZJMMuZp5FHcclGGMWtK8pBM=
822+
github.com/projectdiscovery/hmap v0.0.36 h1:hnaiw+NZKQzoP0TXGjf5QmAtMgmrR0LHtR4xINJXWr0=
823+
github.com/projectdiscovery/hmap v0.0.36/go.mod h1:q6UNS9PoJqZHq5s3BjFTKdYRTZvmFr1JvhMKjNGdGgo=
824824
github.com/projectdiscovery/httpx v1.3.8 h1:D07kanG/AnZl4hErm4HPw3Clml+R3LZdBvfXxf6c5q8=
825825
github.com/projectdiscovery/httpx v1.3.8/go.mod h1:ly2a5roeXONX2nIu5xaXCus6jc/4HLVwf3JP9kSaXbQ=
826826
github.com/projectdiscovery/interactsh v1.1.8 h1:mDD+f/oo2tV4Z1WyUync0tgYeJyuiS89Un64Gm6Pvgk=
@@ -831,26 +831,26 @@ github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5 h1:L/e8z8yw
831831
github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5/go.mod h1:pGW2ncnTxTxHtP9wzcIJAB+3/NMp6IiuQWd2NK7K+oc=
832832
github.com/projectdiscovery/networkpolicy v0.0.7 h1:AwHqBRXBqDQgnWzBMuoJtHBNEYBw+NFp/4qIK688x7o=
833833
github.com/projectdiscovery/networkpolicy v0.0.7/go.mod h1:CK0CnFoLF1Nou6mY7P4WODSAxhPN8g8g7XpapgEP8tI=
834-
github.com/projectdiscovery/ratelimit v0.0.24 h1:ydCzcICK8eSYkCeN5NLikGjGayx66ELQmjpqepGC5Cg=
835-
github.com/projectdiscovery/ratelimit v0.0.24/go.mod h1:cHow8VY1Dt38/6Cj3b6LmJATnzXrs6838U2GiFYBoXE=
834+
github.com/projectdiscovery/ratelimit v0.0.26 h1:sxZCh72lMpQ1YNnJOWrJ+uZE9GFWdVE58LOArOc6c+4=
835+
github.com/projectdiscovery/ratelimit v0.0.26/go.mod h1:2NHqfqqb9xAnqW+Ztd8AzzNi+JP38Kcdhb8cnbfX9sI=
836836
github.com/projectdiscovery/rawhttp v0.1.35 h1:9Hkbu1WLN5coj6+HBaqi26PjMNFnw1XrMvJUS/G40OM=
837837
github.com/projectdiscovery/rawhttp v0.1.35/go.mod h1:9mS0N3BfOBYwQWgyI+bXBaFVMFBtJVTcZF0FENea7mA=
838838
github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917 h1:m03X4gBVSorSzvmm0bFa7gDV4QNSOWPL/fgZ4kTXBxk=
839839
github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917/go.mod h1:JxXtZC9e195awe7EynrcnBJmFoad/BNDzW9mzFkK8Sg=
840-
github.com/projectdiscovery/retryabledns v1.0.51 h1:bX/apiRGZwhASBAT7o3qmZ0FznuBlHQlIQdCw1TAzcg=
841-
github.com/projectdiscovery/retryabledns v1.0.51/go.mod h1:rFu1zc7HLHPEipuF91ZNMT1yGG0FKBVUnxnqLJ4OhF4=
840+
github.com/projectdiscovery/retryabledns v1.0.53 h1:eX4f7Afi2INmEaDj8F5x5T/VfEj62Q5qS+z3kcRuMBk=
841+
github.com/projectdiscovery/retryabledns v1.0.53/go.mod h1:FbjRnVnTkyGujjnQGDVzMomIYA4apN+AR6VrlJ8toHk=
842842
github.com/projectdiscovery/retryablehttp-go v1.0.44 h1:hicCe2h6daHt4muPovmffZE3YKBqGioreO6EpIGZ87g=
843843
github.com/projectdiscovery/retryablehttp-go v1.0.44/go.mod h1:7ECXK2cH2/G4sstf8hacyrMdPPJ/3wCAO5tFPZ4iO4s=
844844
github.com/projectdiscovery/sarif v0.0.1 h1:C2Tyj0SGOKbCLgHrx83vaE6YkzXEVrMXYRGLkKCr/us=
845845
github.com/projectdiscovery/sarif v0.0.1/go.mod h1:cEYlDu8amcPf6b9dSakcz2nNnJsoz4aR6peERwV+wuQ=
846846
github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA=
847847
github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0=
848-
github.com/projectdiscovery/tlsx v1.1.6-0.20231116215000-e842dc367a74 h1:G0gw+3zNiQZYUCnspG2Ae0LPHFoRjBDmMAwHOtTWD/U=
849-
github.com/projectdiscovery/tlsx v1.1.6-0.20231116215000-e842dc367a74/go.mod h1:YH8el7/6pyZbNed1IibjzbGpeigiCVyvE28g5+LsPAw=
848+
github.com/projectdiscovery/tlsx v1.1.6 h1:iw2zwKbd2+kRQ8J1G4dLmS0CLyemd/tKz1UzcNsC77A=
849+
github.com/projectdiscovery/tlsx v1.1.6/go.mod h1:s7SRRFdrwIZBK/RXXZi4CR/CubqFSvp8h5Bk1srEZIo=
850850
github.com/projectdiscovery/uncover v1.0.7 h1:ut+2lTuvmftmveqF5RTjMWAgyLj8ltPQC7siFy9sj0A=
851851
github.com/projectdiscovery/uncover v1.0.7/go.mod h1:HFXgm1sRPuoN0D4oATljPIdmbo/EEh1wVuxQqo/dwFE=
852-
github.com/projectdiscovery/utils v0.0.75 h1:VroGyPBTyFARP7HYa2lbmZvt40/bCaXu1q+NIhkKEmk=
853-
github.com/projectdiscovery/utils v0.0.75/go.mod h1:4MBUFfZ9Mm96PiWUj2zJ99sx2AVOpZkGukC6O16+p+o=
852+
github.com/projectdiscovery/utils v0.0.76 h1:6azn0Zju0taw5Y9qAjpGPxyqwJf2AI4VJjtIzPBcRzQ=
853+
github.com/projectdiscovery/utils v0.0.76/go.mod h1:ERIYcW+h5jKIYyYkfdOpNPIUtH8Ogz4q5Wq3gx/71Zw=
854854
github.com/projectdiscovery/wappalyzergo v0.0.109 h1:BERfwTRn1dvB1tbhyc5m67R8VkC9zbVuPsEq4VEm07k=
855855
github.com/projectdiscovery/wappalyzergo v0.0.109/go.mod h1:4Z3DKhi75zIPMuA+qSDDWxZvnhL4qTLmDx4dxNMu7MA=
856856
github.com/projectdiscovery/yamldoc-go v1.0.4 h1:eZoESapnMw6WAHiVgRwNqvbJEfNHEH148uthhFbG5jE=
@@ -1138,7 +1138,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
11381138
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11391139
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11401140
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1141-
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11421141
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11431142
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
11441143
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=

‎integration_tests/flow/iterate-one-value-flow.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
id: flow-iterate-one-value-flow
2+
3+
info:
4+
name: Test Flow Iterate One Value Flow
5+
author: pdteam
6+
severity: info
7+
8+
flow: |
9+
http(1)
10+
for(let value of template.extracted){
11+
set("value", value)
12+
http(2)
13+
}
14+
15+
http:
16+
- method: GET
17+
path:
18+
- "{{BaseURL}}"
19+
20+
extractors:
21+
- type: regex
22+
name: extracted
23+
internal: true
24+
regex:
25+
- "[ok]+"
26+
27+
- method: GET
28+
path:
29+
- "{{BaseURL}}/{{value}}"
30+
31+
matchers:
32+
- type: word
33+
words:
34+
- "ok"

‎integration_tests/protocols/http/default-matcher-condition.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ requests:
1515
- type: word
1616
part: interactsh_protocol
1717
words:
18-
- "http"
18+
- "dns"
1919

2020
- type: status
2121
status:

‎integration_tests/protocols/http/interactsh-stop-at-first-match.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ requests:
2424

2525
matchers:
2626
- type: word
27-
part: interactsh_protocol # Confirms the HTTP Interaction
27+
part: interactsh_protocol # Confirms DNS Interaction
2828
words:
29-
- "http"
29+
- "dns"

‎integration_tests/protocols/http/interactsh.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ requests:
1616
- type: word
1717
part: interactsh_protocol # Confirms the HTTP Interaction
1818
words:
19-
- "http"
19+
- "dns"

‎internal/runner/options.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -262,27 +262,28 @@ func createReportingOptions(options *types.Options) (*reporting.Options, error)
262262
}
263263
if options.MarkdownExportDirectory != "" {
264264
reportingOptions.MarkdownExporter = &markdown.Options{
265-
Directory: options.MarkdownExportDirectory,
266-
IncludeRawPayload: !options.OmitRawRequests,
267-
SortMode: options.MarkdownExportSortMode,
265+
Directory: options.MarkdownExportDirectory,
266+
OmitRaw: options.OmitRawRequests,
267+
SortMode: options.MarkdownExportSortMode,
268268
}
269269
}
270270
if options.SarifExport != "" {
271271
reportingOptions.SarifExporter = &sarif.Options{File: options.SarifExport}
272272
}
273273
if options.JSONExport != "" {
274274
reportingOptions.JSONExporter = &jsonexporter.Options{
275-
File: options.JSONExport,
276-
IncludeRawPayload: !options.OmitRawRequests,
275+
File: options.JSONExport,
276+
OmitRaw: options.OmitRawRequests,
277277
}
278278
}
279279
if options.JSONLExport != "" {
280280
reportingOptions.JSONLExporter = &jsonl.Options{
281-
File: options.JSONLExport,
282-
IncludeRawPayload: !options.OmitRawRequests,
281+
File: options.JSONLExport,
282+
OmitRaw: options.OmitRawRequests,
283283
}
284284
}
285285

286+
reportingOptions.OmitRaw = options.OmitRawRequests
286287
return reportingOptions, nil
287288
}
288289

0 commit comments

Comments
 (0)