Skip to content

Commit af2284b

Browse files
committed
Merge remote-tracking branch 'origin'
2 parents cda1fc0 + 3ee1bfa commit af2284b

Some content is hidden

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

62 files changed

+820
-642
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN go mod download
88
RUN go build ./cmd/nuclei
99

1010
# Release
11-
FROM alpine:3.18.2
11+
FROM alpine:3.18.6
1212
RUN apk -U upgrade --no-cache \
1313
&& apk add --no-cache bind-tools chromium ca-certificates
1414
COPY --from=build-env /app/nuclei /usr/local/bin/

cmd/integration-test/library.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ import (
2020
"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
2121
"github.com/projectdiscovery/nuclei/v3/pkg/core"
2222
"github.com/projectdiscovery/nuclei/v3/pkg/input/provider"
23+
parsers "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow"
2324
"github.com/projectdiscovery/nuclei/v3/pkg/output"
24-
"github.com/projectdiscovery/nuclei/v3/pkg/parsers"
2525
"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
2626
"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
2727
"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
2828
"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
2929
"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
3030
"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
31+
"github.com/projectdiscovery/nuclei/v3/pkg/templates"
3132
"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
3233
"github.com/projectdiscovery/nuclei/v3/pkg/types"
3334
"github.com/projectdiscovery/ratelimit"
@@ -98,6 +99,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
9899
catalog := disk.NewCatalog(path.Join(home, "nuclei-templates"))
99100
ratelimiter := ratelimit.New(context.Background(), 150, time.Second)
100101
defer ratelimiter.Stop()
102+
101103
executerOpts := protocols.ExecutorOptions{
102104
Output: outputWriter,
103105
Options: defaultOpts,
@@ -109,6 +111,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
109111
HostErrorsCache: cache,
110112
Colorizer: aurora.NewAurora(true),
111113
ResumeCfg: types.NewResumeCfg(),
114+
Parser: templates.NewParser(),
112115
}
113116
engine := core.New(defaultOpts)
114117
engine.SetExecuterOptions(executerOpts)

go.mod

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/remeh/sizedwaitgroup v1.0.0
3131
github.com/rs/xid v1.5.0
3232
github.com/segmentio/ksuid v1.0.4
33-
github.com/shirou/gopsutil/v3 v3.23.7 // indirect
33+
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
3434
github.com/spaolacci/murmur3 v1.1.0 // indirect
3535
github.com/spf13/cast v1.5.1
3636
github.com/syndtr/goleveldb v1.0.0
@@ -63,7 +63,7 @@ require (
6363
github.com/denisenkom/go-mssqldb v0.12.3
6464
github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c
6565
github.com/docker/go-units v0.5.0
66-
github.com/dop251/goja v0.0.0-20230828202809-3dbe69dd2b8e
66+
github.com/dop251/goja v0.0.0-20240220182346-e401ed450204
6767
github.com/fatih/structs v1.1.0
6868
github.com/getkin/kin-openapi v0.123.0
6969
github.com/go-git/go-git/v5 v5.11.0
@@ -94,15 +94,14 @@ require (
9494
github.com/projectdiscovery/tlsx v1.1.6
9595
github.com/projectdiscovery/uncover v1.0.7
9696
github.com/projectdiscovery/useragent v0.0.40
97-
github.com/projectdiscovery/utils v0.0.84-0.20240312214300-d3ba70dbb9ca
97+
github.com/projectdiscovery/utils v0.0.84-0.20240313184656-e3ec80f4dd42
9898
github.com/projectdiscovery/wappalyzergo v0.0.112
9999
github.com/redis/go-redis/v9 v9.1.0
100100
github.com/sashabaranov/go-openai v1.15.3
101101
github.com/seh-msft/burpxml v1.0.1
102102
github.com/stretchr/testify v1.9.0
103103
github.com/zmap/zgrab2 v0.1.8-0.20230806160807-97ba87c0e706
104104
golang.org/x/term v0.17.0
105-
gopkg.in/src-d/go-git.v4 v4.13.1
106105
gopkg.in/yaml.v3 v3.0.1
107106
moul.io/http2curl v1.0.0
108107
)
@@ -138,7 +137,7 @@ require (
138137
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
139138
github.com/davidmz/go-pageant v1.0.2 // indirect
140139
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
141-
github.com/dlclark/regexp2 v1.10.0 // indirect
140+
github.com/dlclark/regexp2 v1.11.0 // indirect
142141
github.com/docker/cli v24.0.5+incompatible // indirect
143142
github.com/docker/docker v24.0.7+incompatible // indirect
144143
github.com/docker/go-connections v0.4.0 // indirect
@@ -152,14 +151,14 @@ require (
152151
github.com/go-fed/httpsig v1.1.0 // indirect
153152
github.com/go-openapi/jsonpointer v0.20.2 // indirect
154153
github.com/go-openapi/swag v0.22.9 // indirect
155-
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
154+
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
156155
github.com/goccy/go-json v0.10.2 // indirect
157156
github.com/gogo/protobuf v1.3.2 // indirect
158157
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
159158
github.com/golang-sql/sqlexp v0.1.0 // indirect
160159
github.com/google/certificate-transparency-go v1.1.4 // indirect
161160
github.com/google/go-github/v30 v30.1.0 // indirect
162-
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect
161+
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
163162
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
164163
github.com/hashicorp/go-uuid v1.0.3 // indirect
165164
github.com/hashicorp/go-version v1.6.0 // indirect
@@ -204,6 +203,7 @@ require (
204203
github.com/projectdiscovery/stringsutil v0.0.2 // indirect
205204
github.com/quic-go/quic-go v0.40.1 // indirect
206205
github.com/refraction-networking/utls v1.6.1 // indirect
206+
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
207207
github.com/shoenig/go-m1cpu v0.1.6 // indirect
208208
github.com/sirupsen/logrus v1.9.3 // indirect
209209
github.com/skeema/knownhosts v1.2.1 // indirect
@@ -227,6 +227,7 @@ require (
227227
github.com/yuin/goldmark-emoji v1.0.1 // indirect
228228
github.com/zeebo/blake3 v0.2.3 // indirect
229229
golang.org/x/arch v0.3.0 // indirect
230+
golang.org/x/sync v0.6.0 // indirect
230231
gopkg.in/djherbis/times.v1 v1.3.0 // indirect
231232
mellium.im/sasl v0.3.1 // indirect
232233
)
@@ -281,16 +282,16 @@ require (
281282
github.com/projectdiscovery/networkpolicy v0.0.8
282283
github.com/rivo/uniseg v0.4.6 // indirect
283284
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
284-
github.com/tklauser/go-sysconf v0.3.11 // indirect
285-
github.com/tklauser/numcpus v0.6.0 // indirect
285+
github.com/tklauser/go-sysconf v0.3.12 // indirect
286+
github.com/tklauser/numcpus v0.6.1 // indirect
286287
github.com/trivago/tgo v1.0.7
287288
github.com/ulikunitz/xz v0.5.11 // indirect
288289
github.com/valyala/bytebufferpool v1.0.0 // indirect
289290
github.com/yl2chen/cidranger v1.0.2 // indirect
290291
github.com/ysmood/goob v0.4.0 // indirect
291292
github.com/ysmood/gson v0.7.3 // indirect
292293
github.com/ysmood/leakless v0.8.0 // indirect
293-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
294+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
294295
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
295296
github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect
296297
go.etcd.io/bbolt v1.3.8 // indirect
@@ -335,8 +336,10 @@ require (
335336
github.com/nwaples/rardecode v1.1.3 // indirect
336337
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
337338
github.com/sergi/go-diff v1.2.0 // indirect
338-
github.com/src-d/gcfg v1.4.0 // indirect
339339
github.com/xanzy/ssh-agent v0.3.3 // indirect
340340
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
341341
gopkg.in/warnings.v0 v0.1.2 // indirect
342342
)
343+
344+
// https://go.dev/ref/mod#go-mod-file-retract
345+
retract v3.2.0 // retract due to broken js protocol issue

0 commit comments

Comments
 (0)