Skip to content

Commit 10f5605

Browse files
ehsandeepehsandeep
committed
Merge branch 'dev'
2 parents 18dc537 + 691bfea commit 10f5605

File tree

17 files changed

+306
-127
lines changed

17 files changed

+306
-127
lines changed

‎.github/dependabot.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ updates:
2020
allow:
2121
- dependency-name: "github.com/projectdiscovery/*"
2222

23-
# # Maintain dependencies for docker
24-
# - package-ecosystem: "docker"
25-
# directory: "/"
26-
# schedule:
27-
# interval: "weekly"
28-
# target-branch: "dev"
29-
# commit-message:
30-
# prefix: "chore"
31-
# include: "scope"
32-
# labels:
33-
# - "Type: Maintenance"
34-
#
35-
# # Maintain dependencies for GitHub Actions
36-
# - package-ecosystem: "github-actions"
37-
# directory: "/"
38-
# schedule:
39-
# interval: "weekly"
40-
# target-branch: "dev"
41-
# commit-message:
42-
# prefix: "chore"
43-
# include: "scope"
44-
# labels:
45-
# - "Type: Maintenance"
23+
# Maintain dependencies for docker
24+
- package-ecosystem: "docker"
25+
directory: "/"
26+
schedule:
27+
interval: "weekly"
28+
target-branch: "dev"
29+
commit-message:
30+
prefix: "chore"
31+
include: "scope"
32+
labels:
33+
- "Type: Maintenance"
34+
35+
# Maintain dependencies for GitHub Actions
36+
- package-ecosystem: "github-actions"
37+
directory: "/"
38+
schedule:
39+
interval: "weekly"
40+
target-branch: "dev"
41+
commit-message:
42+
prefix: "chore"
43+
include: "scope"
44+
labels:
45+
- "Type: Maintenance"

‎v2/go.mod‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ require (
1515
github.com/projectdiscovery/dnsx v1.2.1
1616
github.com/projectdiscovery/fdmax v0.0.4
1717
github.com/projectdiscovery/freeport v0.0.5
18-
github.com/projectdiscovery/goflags v0.1.41
18+
github.com/projectdiscovery/goflags v0.1.51
1919
github.com/projectdiscovery/gologger v1.1.12
20-
github.com/projectdiscovery/ipranger v0.0.37
21-
github.com/projectdiscovery/mapcidr v1.1.16
22-
github.com/projectdiscovery/networkpolicy v0.0.7
23-
github.com/projectdiscovery/ratelimit v0.0.30
24-
github.com/projectdiscovery/retryablehttp-go v1.0.51
20+
github.com/projectdiscovery/ipranger v0.0.44
21+
github.com/projectdiscovery/mapcidr v1.1.34
22+
github.com/projectdiscovery/networkpolicy v0.0.8
23+
github.com/projectdiscovery/ratelimit v0.0.40
24+
github.com/projectdiscovery/retryablehttp-go v1.0.58
2525
github.com/projectdiscovery/uncover v1.0.7
26-
github.com/projectdiscovery/utils v0.0.83
26+
github.com/projectdiscovery/utils v0.0.92
2727
github.com/remeh/sizedwaitgroup v1.0.0
2828
github.com/stretchr/testify v1.9.0
2929
go.uber.org/multierr v1.11.0
@@ -58,6 +58,7 @@ require (
5858
github.com/golang/snappy v0.0.4 // indirect
5959
github.com/google/go-github/v30 v30.1.0 // indirect
6060
github.com/google/go-querystring v1.1.0 // indirect
61+
github.com/google/uuid v1.3.1 // indirect
6162
github.com/gorilla/css v1.0.0 // indirect
6263
github.com/json-iterator/go v1.1.12 // indirect
6364
github.com/klauspost/compress v1.16.7 // indirect
@@ -80,10 +81,10 @@ require (
8081
github.com/pmezard/go-difflib v1.0.0 // indirect
8182
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
8283
github.com/projectdiscovery/asnmap v1.1.0 // indirect
83-
github.com/projectdiscovery/fastdialer v0.0.61 // indirect
84+
github.com/projectdiscovery/fastdialer v0.0.70 // indirect
8485
github.com/projectdiscovery/hmap v0.0.41 // indirect
8586
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 // indirect
86-
github.com/projectdiscovery/retryabledns v1.0.58 // indirect
87+
github.com/projectdiscovery/retryabledns v1.0.59 // indirect
8788
github.com/quic-go/quic-go v0.42.0 // indirect
8889
github.com/refraction-networking/utls v1.5.4 // indirect
8990
github.com/rivo/uniseg v0.4.4 // indirect
@@ -99,16 +100,16 @@ require (
99100
github.com/tidwall/pretty v1.2.1 // indirect
100101
github.com/tidwall/rtred v0.1.2 // indirect
101102
github.com/tidwall/tinyqueue v0.1.1 // indirect
102-
github.com/tklauser/go-sysconf v0.3.11 // indirect
103-
github.com/tklauser/numcpus v0.6.0 // indirect
103+
github.com/tklauser/go-sysconf v0.3.12 // indirect
104+
github.com/tklauser/numcpus v0.6.1 // indirect
104105
github.com/ulikunitz/xz v0.5.11 // indirect
105-
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 // indirect
106106
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 // indirect
107107
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
108108
github.com/yl2chen/cidranger v1.0.2 // indirect
109109
github.com/yuin/goldmark v1.5.4 // indirect
110110
github.com/yuin/goldmark-emoji v1.0.1 // indirect
111-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
111+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
112+
github.com/zcalusic/sysinfo v1.0.2 // indirect
112113
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
113114
github.com/zmap/zcrypto v0.0.0-20230814193918-dbe676986518 // indirect
114115
go.etcd.io/bbolt v1.3.7 // indirect

‎v2/go.sum‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF
9292
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
9393
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
9494
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
95+
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
96+
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
9597
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
9698
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
9799
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -188,36 +190,36 @@ github.com/projectdiscovery/clistats v0.0.20 h1:5jO5SLiRJ7f0nDV0ndBNmBeesbROouPo
188190
github.com/projectdiscovery/clistats v0.0.20/go.mod h1:GJ2av0KnOvK0AISQnP8hyDclYIji1LVkx2l0pwnzAu4=
189191
github.com/projectdiscovery/dnsx v1.2.1 h1:TxslYvp1Z/YZ4CP/J0gx5RYpvXREnVmyoacmTcGu5yg=
190192
github.com/projectdiscovery/dnsx v1.2.1/go.mod h1:6dAsMCEDu7FArZy2qjyTeUQrqpZ4ITLU11fcmUvFqt0=
191-
github.com/projectdiscovery/fastdialer v0.0.61 h1:z5OzP9lRbn6fSIezgReKC3hkzRh+YX41ST9OgkVEm/s=
192-
github.com/projectdiscovery/fastdialer v0.0.61/go.mod h1:FyxJ0m1MwB69nLmdXYqK32f3a0Pf+5YpC8wBY73baiE=
193+
github.com/projectdiscovery/fastdialer v0.0.70 h1:1rnUKc8NRj6dzG8aTmqW+RF8m0dFbfTs9CiOo6Aig8U=
194+
github.com/projectdiscovery/fastdialer v0.0.70/go.mod h1:HQ0ZpvOPOTZFSQxGyYJgNdek93hi4eIC1avZgiQ7+a4=
193195
github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc=
194196
github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I=
195197
github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q=
196198
github.com/projectdiscovery/freeport v0.0.5/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE=
197-
github.com/projectdiscovery/goflags v0.1.41 h1:rw6NM7ShB7GGQZr5XaM/gkuyoLY3zpf0gb56f9fLNQo=
198-
github.com/projectdiscovery/goflags v0.1.41/go.mod h1:AlZUOcABJTBDzkgquUS00qWTTH80lxzpfHQrYlIzVkU=
199+
github.com/projectdiscovery/goflags v0.1.51 h1:PhMekTX727L1YqBfP0of0clSygrq20RnWWp0+khAxqo=
200+
github.com/projectdiscovery/goflags v0.1.51/go.mod h1:muJxbcOFi4kzg0G30S526X6dY/OyuDInchYIkoZOudU=
199201
github.com/projectdiscovery/gologger v1.1.12 h1:uX/QkQdip4PubJjjG0+uk5DtyAi1ANPJUvpmimXqv4A=
200202
github.com/projectdiscovery/gologger v1.1.12/go.mod h1:DI8nywPLERS5mo8QEA9E7gd5HZ3Je14SjJBH3F5/kLw=
201203
github.com/projectdiscovery/hmap v0.0.41 h1:8IgTyDce3/2JzcfPVA4H+XpBRFfETULx8td3BMdSYVE=
202204
github.com/projectdiscovery/hmap v0.0.41/go.mod h1:bCrai6x5Eijqm2U+jtcH0wZX5ZcaZhcvzoMGTZgLAf0=
203-
github.com/projectdiscovery/ipranger v0.0.37 h1:CTsU37lQ0L622lB523asZhb5e/rOeimNIzFlutgif20=
204-
github.com/projectdiscovery/ipranger v0.0.37/go.mod h1:fJR9cHE3hcmI9k5pXMaYU1+W4gnHOxXsytB7gnxp3gU=
205+
github.com/projectdiscovery/ipranger v0.0.44 h1:nTJxDcV7pB85QW2BJGhweS5QD+U1XHJdpOEKhTr7EWY=
206+
github.com/projectdiscovery/ipranger v0.0.44/go.mod h1:n5jMCwy3WT0ksQW4NFwYDt90KeKFUK0iX58jzTbqFkY=
205207
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 h1:ZScLodGSezQVwsQDtBSMFp72WDq0nNN+KE/5DHKY5QE=
206208
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983/go.mod h1:3G3BRKui7nMuDFAZKR/M2hiOLtaOmyukT20g88qRQjI=
207-
github.com/projectdiscovery/mapcidr v1.1.16 h1:rjj1w5D6hbTsUQXYClLcGdfBEy9bryclgi70t0vBggo=
208-
github.com/projectdiscovery/mapcidr v1.1.16/go.mod h1:rGqpBhStdwOQ2uS62QM9qPsybwMwIhT7CTd2bxoHs8Q=
209-
github.com/projectdiscovery/networkpolicy v0.0.7 h1:AwHqBRXBqDQgnWzBMuoJtHBNEYBw+NFp/4qIK688x7o=
210-
github.com/projectdiscovery/networkpolicy v0.0.7/go.mod h1:CK0CnFoLF1Nou6mY7P4WODSAxhPN8g8g7XpapgEP8tI=
211-
github.com/projectdiscovery/ratelimit v0.0.30 h1:3x17KMoRi79eUp2RGYLrbXy0IKpS6dvSPKCD/jaWtwk=
212-
github.com/projectdiscovery/ratelimit v0.0.30/go.mod h1:FQoe4d9AIScw5/8ctS4ehzwE01tWEFC/b9u5j3umLx0=
213-
github.com/projectdiscovery/retryabledns v1.0.58 h1:ut1FSB9+GZ6zQIlKJFLqIz2RZs81EmkbsHTuIrWfYLE=
214-
github.com/projectdiscovery/retryabledns v1.0.58/go.mod h1:RobmKoNBgngAVE4H9REQtaLP1pa4TCyypHy1MWHT1mY=
215-
github.com/projectdiscovery/retryablehttp-go v1.0.51 h1:8XMrNC8JrwvySESe2d+XWF9bq4unWqD4PUPEC4Cai8s=
216-
github.com/projectdiscovery/retryablehttp-go v1.0.51/go.mod h1:6cdh/acYHpeYWg7+Iblh4xBRb87bC118L4G4mpvCMuA=
209+
github.com/projectdiscovery/mapcidr v1.1.34 h1:udr83vQ7oz3kEOwlsU6NC6o08leJzSDQtls1wmXN/kM=
210+
github.com/projectdiscovery/mapcidr v1.1.34/go.mod h1:1+1R6OkKSAKtWDXE9RvxXtXPoajXTYX0eiEdkqlhQqQ=
211+
github.com/projectdiscovery/networkpolicy v0.0.8 h1:XvfBaBwSDNTesSfNQP9VLk3HX9I7x7gHm028TJ5XwI8=
212+
github.com/projectdiscovery/networkpolicy v0.0.8/go.mod h1:xnjNqhemxUPxU+UD5Jgsc3+K8IVmcqT1SJeo6UzMtkI=
213+
github.com/projectdiscovery/ratelimit v0.0.40 h1:SURkc7+ezUeGNt9PEQZOtd7nh2o2jKzmqcehrrf6DMU=
214+
github.com/projectdiscovery/ratelimit v0.0.40/go.mod h1:3Z1rK0bs4BSjdYNvIlbmZR1H8Z5MsXRz+QRCXGIB0HE=
215+
github.com/projectdiscovery/retryabledns v1.0.59 h1:8pMN+VibEBp29RIUior9LXUbx0RsBTjPC0008t2hfGU=
216+
github.com/projectdiscovery/retryabledns v1.0.59/go.mod h1:CwyQLDt9oqNIO/2ArALhAnUHJjZYdvJRSfGERRNPtoQ=
217+
github.com/projectdiscovery/retryablehttp-go v1.0.58 h1:i5BlSJGgNnoTULyqLSe3d39o/XShxK4oEvx0e/gb9N4=
218+
github.com/projectdiscovery/retryablehttp-go v1.0.58/go.mod h1:bbok7sSEplSwZOY91UlLdVilhavYos1RaCJLJx761V0=
217219
github.com/projectdiscovery/uncover v1.0.7 h1:ut+2lTuvmftmveqF5RTjMWAgyLj8ltPQC7siFy9sj0A=
218220
github.com/projectdiscovery/uncover v1.0.7/go.mod h1:HFXgm1sRPuoN0D4oATljPIdmbo/EEh1wVuxQqo/dwFE=
219-
github.com/projectdiscovery/utils v0.0.83 h1:r7OBAuEwe4lyEwTITbCEZytoxvjk/s0Xra2NT+K4fm4=
220-
github.com/projectdiscovery/utils v0.0.83/go.mod h1:2XFoaGD5NPUp6liTRHC2tGmMQnIhQSXscpP3zfAG7iE=
221+
github.com/projectdiscovery/utils v0.0.92 h1:lGCmjUJhzoNX4FQZWpp80058pRlD0/dYxLJOSs07EqY=
222+
github.com/projectdiscovery/utils v0.0.92/go.mod h1:d5uvD5qcRiK3qxZbBy9eatCqrCSuj9SObL04w/WgXSg=
221223
github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
222224
github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
223225
github.com/refraction-networking/utls v1.5.4 h1:9k6EO2b8TaOGsQ7Pl7p9w6PUhx18/ZCeT0WNTZ7Uw4o=
@@ -278,16 +280,16 @@ github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8=
278280
github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ=
279281
github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
280282
github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=
281-
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
282283
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
283-
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
284+
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
285+
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
284286
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
287+
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
288+
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
285289
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
286290
github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
287291
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
288292
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
289-
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 h1:TtyC78WMafNW8QFfv3TeP3yWNDG+uxNkk9vOrnDu6JA=
290-
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6/go.mod h1:h8272+G2omSmi30fBXiZDMkmHuOgonplfKIKjQWzlfs=
291293
github.com/weppos/publicsuffix-go v0.13.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
292294
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 h1:h2JizvZl9aIj6za9S5AyrkU+OzIS4CetQthH/ejO+lg=
293295
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222/go.mod h1:s41lQh6dIsDWIC1OWh7ChWJXLH0zkJ9KHZVqA7vHyuQ=
@@ -302,8 +304,11 @@ github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
302304
github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
303305
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
304306
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
305-
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
306307
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
308+
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
309+
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
310+
github.com/zcalusic/sysinfo v1.0.2 h1:nwTTo2a+WQ0NXwo0BGRojOJvJ/5XKvQih+2RrtWqfxc=
311+
github.com/zcalusic/sysinfo v1.0.2/go.mod h1:kluzTYflRWo6/tXVMJPdEjShsbPpsFRyy+p1mBQPC30=
307312
github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=
308313
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 h1:Nzukz5fNOBIHOsnP+6I79kPx3QhLv8nBy2mfFhBRq30=
309314
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=
@@ -390,6 +395,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
390395
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
391396
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
392397
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
398+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
393399
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
394400
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
395401
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

‎v2/pkg/routing/gateway_ip.go‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package routing
2+
3+
import (
4+
"context"
5+
"errors"
6+
"net"
7+
"os/exec"
8+
"strings"
9+
"time"
10+
)
11+
12+
var (
13+
GatewayMac = make(map[string]net.HardwareAddr)
14+
)
15+
16+
func GetGatewayMac(gateway string) (net.HardwareAddr, error) {
17+
if IP, ok := GatewayMac[gateway]; ok {
18+
return IP, nil
19+
}
20+
21+
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
22+
defer cancel()
23+
24+
cmd := exec.CommandContext(ctx, "arp", "-n", gateway)
25+
output, err := cmd.CombinedOutput()
26+
if err != nil {
27+
return nil, err
28+
}
29+
for _, part := range strings.Fields(string(output)) {
30+
mc, err := net.ParseMAC(part)
31+
if err != nil {
32+
continue
33+
}
34+
35+
GatewayMac[gateway] = mc
36+
return mc, nil
37+
}
38+
39+
return nil, errors.New("gateway mac not found")
40+
}

‎v2/pkg/routing/router_darwin.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,13 @@ func (r *RouterDarwin) Route(dst net.IP) (iface *net.Interface, gateway, preferr
140140
return nil, nil, nil, errors.Wrap(err, "could not find source ip")
141141
}
142142

143-
return route.NetworkInterface, net.IP(route.Gateway), ip, nil
143+
return route.NetworkInterface, net.ParseIP(route.Gateway), ip, nil
144144
}
145145

146146
func (r *RouterDarwin) RouteWithSrc(input net.HardwareAddr, src, dst net.IP) (iface *net.Interface, gateway, preferredSrc net.IP, err error) {
147147
route, err := FindRouteWithHwAndIp(input, src, r.Routes)
148148
if err != nil {
149149
return nil, nil, nil, err
150150
}
151-
152-
return route.NetworkInterface, net.IP(route.Gateway), src, nil
151+
return route.NetworkInterface, net.ParseIP(route.Gateway), src, nil
153152
}

‎v2/pkg/runner/banners.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const banner = `
1919
`
2020

2121
// Version is the current version of naabu
22-
const version = `2.3.0`
22+
const version = `2.3.1`
2323

2424
// showBanner is used to show the banner to the user
2525
func showBanner() {

‎v2/pkg/runner/options.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func ParseOptions() *Options {
144144
flagSet.BoolVarP(&options.ScanAllIPS, "sa", "scan-all-ips", false, "scan all the IP's associated with DNS record"),
145145
flagSet.StringSliceVarP(&options.IPVersion, "iv", "ip-version", []string{scan.IPv4}, "ip version to scan of hostname (4,6) - (default 4)", goflags.NormalizedStringSliceOptions),
146146
flagSet.StringVarP(&options.ScanType, "s", "scan-type", SynScan, "type of port scan (SYN/CONNECT)"),
147-
flagSet.StringVar(&options.SourceIP, "source-ip", "", "source ip and port (x.x.x.x:yyy)"),
147+
flagSet.StringVar(&options.SourceIP, "source-ip", "", "source ip and port (x.x.x.x:yyy - might not work on OSX) "),
148148
flagSet.BoolVarP(&options.InterfacesList, "il", "interface-list", false, "list available interfaces and public ip"),
149149
flagSet.StringVarP(&options.Interface, "i", "interface", "", "network Interface to use for port scan"),
150150
flagSet.BoolVar(&options.Nmap, "nmap", false, "invoke nmap scan on targets (nmap must be installed) - Deprecated"),
@@ -228,6 +228,7 @@ func ParseOptions() *Options {
228228
gologger.Fatal().Msgf("%s\n", err)
229229
}
230230
}
231+
options.configureOutput()
231232
// Show the user the banner
232233
showBanner()
233234

@@ -270,7 +271,7 @@ func (options *Options) ShouldLoadResume() bool {
270271
}
271272

272273
func (options *Options) shouldDiscoverHosts() bool {
273-
return (options.OnlyHostDiscovery || !options.SkipHostDiscovery) && !options.Passive
274+
return (options.OnlyHostDiscovery || !options.SkipHostDiscovery) && !options.Passive && scan.PkgRouter != nil
274275
}
275276

276277
func (options *Options) hasProbes() bool {
@@ -280,5 +281,5 @@ func (options *Options) hasProbes() bool {
280281
}
281282

282283
func (options *Options) shouldUseRawPackets() bool {
283-
return isOSSupported() && privileges.IsPrivileged && options.ScanType == SynScan
284+
return isOSSupported() && privileges.IsPrivileged && options.ScanType == SynScan && scan.PkgRouter != nil
284285
}

‎v2/pkg/runner/ports.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func parsePortsSlice(ranges []string) ([]*port.Port, error) {
168168
return nil, fmt.Errorf("invalid port number: '%s'", parts[1])
169169
}
170170

171-
if p1 > p2 {
171+
if p1 > p2 || p2 > 65535 {
172172
return nil, fmt.Errorf("invalid port range: %d-%d", p1, p2)
173173
}
174174

@@ -178,7 +178,7 @@ func parsePortsSlice(ranges []string) ([]*port.Port, error) {
178178
}
179179
} else {
180180
portNumber, err := strconv.Atoi(r)
181-
if err != nil {
181+
if err != nil || portNumber > 65535 {
182182
return nil, fmt.Errorf("invalid port number: '%s'", r)
183183
}
184184
port := &port.Port{Port: portNumber, Protocol: portProtocol}

0 commit comments

Comments
 (0)