Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintenance #1068

Merged
merged 139 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
7b30834
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Oct 7, 2024
68a539a
Merge pull request #988 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 7, 2024
2052e47
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Oct 7, 2024
6a8bd2f
Merge pull request #989 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 7, 2024
b1ac382
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Oct 7, 2024
fe86c94
Merge pull request #990 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 7, 2024
a8d1944
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Oct 14, 2024
75faead
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.61 to 0.0.62
dependabot[bot] Oct 14, 2024
85b92bc
Merge pull request #992 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 14, 2024
9f4ae79
Merge pull request #996 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 14, 2024
5c1a23e
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Oct 14, 2024
16a6c7c
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Oct 14, 2024
9da0c72
Merge pull request #993 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 14, 2024
c616a7b
Merge pull request #994 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 14, 2024
35fc484
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Oct 14, 2024
346ba42
Merge pull request #995 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 14, 2024
9c9ef20
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Oct 21, 2024
f73be89
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.62 to 0.0.63
dependabot[bot] Oct 21, 2024
90eeee3
Merge pull request #997 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 21, 2024
e62a53a
Merge pull request #998 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 21, 2024
b435150
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Oct 21, 2024
e15ea7f
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Oct 21, 2024
d8ea849
Merge pull request #999 from projectdiscovery/dependabot/go_modules/d…
dependabot[bot] Oct 21, 2024
8eb61d9
Merge pull request #1001 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 21, 2024
7cc52d1
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Oct 21, 2024
d947249
Merge pull request #1000 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 21, 2024
4a92b5f
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Oct 28, 2024
1f26a85
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.63 to 0.0.64
dependabot[bot] Oct 28, 2024
7597034
Merge pull request #1002 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 28, 2024
06f6e57
Merge pull request #1006 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 28, 2024
fe2fda7
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Oct 28, 2024
928c577
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Oct 28, 2024
cfa33c2
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Oct 28, 2024
1257966
Merge pull request #1005 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 28, 2024
dea243d
Merge pull request #1004 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 28, 2024
eb00473
Merge pull request #1003 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Oct 28, 2024
912a66b
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Nov 4, 2024
d0ef914
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Nov 4, 2024
24478c8
Merge pull request #1010 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 4, 2024
9aa27ba
Merge pull request #1012 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 4, 2024
0a4a501
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Nov 4, 2024
df3479e
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.64 to 0.0.65
dependabot[bot] Nov 4, 2024
4b4c731
Merge pull request #1011 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 4, 2024
6663e3e
Merge pull request #1014 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 4, 2024
6f0af4c
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Nov 4, 2024
818594a
Merge pull request #1013 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 4, 2024
1085d71
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Nov 11, 2024
7c4379e
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.65 to 0.0.66
dependabot[bot] Nov 11, 2024
e248e7c
Merge pull request #1019 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 11, 2024
543eac8
Merge pull request #1018 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 11, 2024
67854e0
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Nov 11, 2024
c2a71bc
Merge pull request #1017 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 11, 2024
34037b5
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Nov 11, 2024
18acaad
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Nov 11, 2024
8d7de6f
Merge pull request #1016 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 11, 2024
205a8c9
Merge pull request #1015 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 11, 2024
6e80f47
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Nov 18, 2024
54ef5fb
chore(deps): bump github.com/projectdiscovery/goflags
dependabot[bot] Nov 18, 2024
6b0c659
Merge pull request #1021 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 18, 2024
c06287c
Merge pull request #1022 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 18, 2024
de0845f
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.66 to 0.0.67
dependabot[bot] Nov 18, 2024
7cb9716
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Nov 18, 2024
4019d73
Merge pull request #1023 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 18, 2024
ea01dc7
Merge pull request #1025 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 18, 2024
058ada8
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Nov 25, 2024
1e80a87
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.67 to 0.0.68
dependabot[bot] Nov 25, 2024
cdbb014
Merge pull request #1029 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 25, 2024
d69692b
Merge pull request #1030 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 25, 2024
e491cd3
chore(deps): bump github.com/projectdiscovery/fastdialer
dependabot[bot] Nov 25, 2024
cbacb9b
chore(deps): bump github.com/projectdiscovery/utils
dependabot[bot] Nov 25, 2024
234115b
Merge pull request #1026 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 25, 2024
8661955
Merge pull request #1027 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 25, 2024
6aee547
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Nov 25, 2024
20af593
Merge pull request #1028 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Nov 25, 2024
129bf90
feat: added caido extension docs to readme
Ice3man543 Nov 30, 2024
aacf89a
Merge pull request #1032 from projectdiscovery/readme-patch-caido
Ice3man543 Nov 30, 2024
80306a7
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Dec 2, 2024
4886b91
chore(deps): bump github.com/projectdiscovery/fastdialer
dependabot[bot] Dec 2, 2024
b7219fe
Merge pull request #1033 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 2, 2024
e731ecb
Merge pull request #1035 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 2, 2024
0bc145d
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.68 to 0.0.69
dependabot[bot] Dec 2, 2024
11ab79c
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Dec 2, 2024
3fec822
Merge pull request #1036 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 2, 2024
9615499
Merge pull request #1034 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 2, 2024
048bd7a
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Dec 8, 2024
816a22c
Merge pull request #1039 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 8, 2024
58a73dd
chore(deps): bump github.com/projectdiscovery/utils from 0.3.0 to 0.4.1
dependabot[bot] Dec 9, 2024
b98016e
chore(deps): bump github.com/projectdiscovery/fastdialer
dependabot[bot] Dec 9, 2024
af8fe4f
Merge pull request #1040 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 9, 2024
6a72cc1
Merge pull request #1043 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 9, 2024
b35921c
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Dec 9, 2024
1bc7d31
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.69 to 0.0.70
dependabot[bot] Dec 9, 2024
1369791
Merge pull request #1041 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 9, 2024
e2dfee0
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Dec 9, 2024
50dec9b
Merge pull request #1042 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 9, 2024
1584c08
Merge pull request #1044 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 9, 2024
c2ecde0
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Dec 16, 2024
26f44c8
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Dec 16, 2024
fa222df
chore(deps): bump github.com/projectdiscovery/utils from 0.4.1 to 0.4.2
dependabot[bot] Dec 16, 2024
b462cc2
Merge pull request #1045 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 16, 2024
42414f5
Merge pull request #1046 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 16, 2024
d125db2
Merge pull request #1048 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 16, 2024
33050df
chore(deps): bump github.com/projectdiscovery/fastdialer
dependabot[bot] Dec 16, 2024
7f246cc
Merge pull request #1049 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 16, 2024
1daa128
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.70 to 0.0.71
dependabot[bot] Dec 16, 2024
d454c81
Merge pull request #1047 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 16, 2024
9d98dac
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Dec 23, 2024
c6b7ac5
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.71 to 0.0.72
dependabot[bot] Dec 23, 2024
0c69fab
Merge pull request #1050 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 23, 2024
f067a10
Merge pull request #1051 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 23, 2024
1440324
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Dec 23, 2024
aea0b40
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Dec 23, 2024
22dd45e
Merge pull request #1053 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 23, 2024
0b32e67
Merge pull request #1054 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 23, 2024
d14ebe6
chore(deps): bump github.com/projectdiscovery/utils from 0.4.2 to 0.4.3
dependabot[bot] Dec 23, 2024
f2a25c7
Merge pull request #1052 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 23, 2024
c05151b
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.72 to 0.0.73
dependabot[bot] Dec 30, 2024
ef4b9b8
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Dec 30, 2024
7d8300e
Merge pull request #1055 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 30, 2024
62a2024
Merge pull request #1057 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 30, 2024
067bb9e
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Dec 30, 2024
06b1432
chore(deps): bump github.com/projectdiscovery/utils from 0.4.3 to 0.4.4
dependabot[bot] Dec 30, 2024
0b9d980
Merge pull request #1056 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 30, 2024
74cd6c5
Merge pull request #1059 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 30, 2024
77b587f
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Dec 30, 2024
04df9cc
Merge pull request #1058 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Dec 30, 2024
f4d02d4
chore(deps): bump github.com/projectdiscovery/retryablehttp-go
dependabot[bot] Jan 6, 2025
9a83b97
chore(deps): bump github.com/projectdiscovery/hmap from 0.0.73 to 0.0.74
dependabot[bot] Jan 6, 2025
2aaa562
Merge pull request #1062 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Jan 6, 2025
6a98aba
Merge pull request #1064 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Jan 6, 2025
94ec4f8
chore(deps): bump github.com/projectdiscovery/gologger
dependabot[bot] Jan 6, 2025
8f01926
chore(deps): bump github.com/projectdiscovery/retryabledns
dependabot[bot] Jan 6, 2025
0f20839
Merge pull request #1063 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Jan 6, 2025
5516464
Merge pull request #1066 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Jan 6, 2025
b9014c1
chore(deps): bump github.com/projectdiscovery/utils from 0.4.4 to 0.4.5
dependabot[bot] Jan 6, 2025
47286e1
Merge pull request #1065 from projectdiscovery/dependabot/go_modules/…
dependabot[bot] Jan 6, 2025
dc548b4
add resolvers option (#1067)
dogancanbakir Jan 11, 2025
90c17b7
Enable loading of the default config file (#1008)
Hazegard Jan 11, 2025
70142fd
version update
ehsandeep Jan 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,16 @@ Interactsh can be used with OWASP ZAP via the [OAST add-on for ZAP](https://www.
![Options > OAST > General](https://github.com/hahwul/interactsh/assets/13212227/005bb527-3f60-4822-8b76-f9a3fd06df83)
*`Options` > `OAST` > `General`*

## Caido Extension

[quickssrf](https://github.com/caido-community/quickssrf) is Caido extension developed and maintained which allows using Interactsh from within Caido Proxy.

- Download latest zip file from [releases](https://github.com/caido-community/quickssrf/releases/) page.
- Open Caido → Plugins → Install Package → Select zip file → Next
- New sidebar named **QuickSSRF** will appear upon successful installation.
- See the [quickssrf](https://github.com/caido-community/quickssrf) project for more info.

![caido-image](https://github.com/user-attachments/assets/aeb91a15-c2cf-4d1f-98dd-cb77c24a5d42)

-------

Expand Down Expand Up @@ -347,6 +357,7 @@ INPUT:
-oih, -origin-ip-header string HTTP header containing origin ip (interactsh behind a reverse proxy)

CONFIG:
-r, -resolvers string[] list of resolvers to use (file or comma separated)
-config string flag configuration file (default "$HOME/.config/interactsh-server/config.yaml")
-dr, -dynamic-resp enable setting up arbitrary response data
-cr, -custom-records string custom dns records YAML file for DNS server
Expand Down
2 changes: 1 addition & 1 deletion cmd/interactsh-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func main() {
}
}

if cliOptions.Config != defaultConfigLocation {
if fileutil.FileExists(cliOptions.Config) {
if err := flagSet.MergeConfigFile(cliOptions.Config); err != nil {
gologger.Fatal().Msgf("Could not read config: %s\n", err)
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/interactsh-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func main() {
)

flagSet.CreateGroup("config", "config",
flagSet.StringSliceVarP(&cliOptions.Resolvers, "resolvers", "r", nil, "list of resolvers to use (file or comma separated)", goflags.FileCommaSeparatedStringSliceOptions),
flagSet.StringVar(&cliOptions.Config, "config", defaultConfigLocation, "flag configuration file"),
flagSet.BoolVarP(&cliOptions.DynamicResp, "dynamic-resp", "dr", false, "enable setting up arbitrary response data"),
flagSet.StringVarP(&cliOptions.CustomRecords, "custom-records", "cr", "", "custom dns records YAML file for DNS server"),
Expand Down Expand Up @@ -281,7 +282,7 @@ func main() {
trimmedDomain := strings.TrimSuffix(domain, ".")
hostmaster := serverOptions.Hostmasters[idx]
var acmeErr error
domainCerts, certFiles, acmeErr = acme.HandleWildcardCertificates(fmt.Sprintf("*.%s", trimmedDomain), hostmaster, acmeStore, cliOptions.Debug)
domainCerts, certFiles, acmeErr = acme.HandleWildcardCertificates(fmt.Sprintf("*.%s", trimmedDomain), hostmaster, acmeStore, cliOptions.Debug, cliOptions.Resolvers)
if acmeErr != nil {
gologger.Error().Msgf("An error occurred while applying for a certificate, error: %v", acmeErr)
gologger.Error().Msgf("Could not generate certs for auto TLS, https will be disabled")
Expand Down
24 changes: 12 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ require (
github.com/miekg/dns v1.1.56
github.com/pkg/errors v0.9.1
github.com/projectdiscovery/asnmap v1.1.1
github.com/projectdiscovery/goflags v0.1.64
github.com/projectdiscovery/gologger v1.1.25
github.com/projectdiscovery/goflags v0.1.65
github.com/projectdiscovery/gologger v1.1.39
github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb
github.com/projectdiscovery/retryabledns v1.0.76
github.com/projectdiscovery/retryablehttp-go v1.0.79
github.com/projectdiscovery/utils v0.2.11
github.com/projectdiscovery/retryabledns v1.0.92
github.com/projectdiscovery/retryablehttp-go v1.0.94
github.com/projectdiscovery/utils v0.4.5
github.com/remeh/sizedwaitgroup v1.0.0
github.com/rs/xid v1.5.0
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -89,8 +89,8 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/projectdiscovery/blackrock v0.0.1 // indirect
github.com/projectdiscovery/fastdialer v0.2.9 // indirect
github.com/projectdiscovery/hmap v0.0.60 // indirect
github.com/projectdiscovery/fastdialer v0.2.14 // indirect
github.com/projectdiscovery/hmap v0.0.74 // indirect
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 // indirect
github.com/projectdiscovery/mapcidr v1.1.34 // indirect
github.com/projectdiscovery/networkpolicy v0.0.9 // indirect
Expand Down Expand Up @@ -120,15 +120,15 @@ require (
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
github.com/zmap/zcrypto v0.0.0-20230422215203-9a665e1e9968 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Expand Down
48 changes: 24 additions & 24 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,14 @@ github.com/projectdiscovery/asnmap v1.1.1 h1:ImJiKIaACOT7HPx4Pabb5dksolzaFYsD1kI
github.com/projectdiscovery/asnmap v1.1.1/go.mod h1:QT7jt9nQanj+Ucjr9BqGr1Q2veCCKSAVyUzLXfEcQ60=
github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ=
github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss=
github.com/projectdiscovery/fastdialer v0.2.9 h1:vDCqxVMCyUu3oVEizEK1K8K+CCcLkVDW3X2HfiWaVFA=
github.com/projectdiscovery/fastdialer v0.2.9/go.mod h1:mYv5QaNBDDSHlZO9DI0niRMw+G5hUzwIhs8QixSElUI=
github.com/projectdiscovery/goflags v0.1.64 h1:FDfwdt9N97Hi8OuhbkDlKtVttpc/CRMIWQVa08VsHsI=
github.com/projectdiscovery/goflags v0.1.64/go.mod h1:3FyHIVQtnycNOc1LE3O1jj/XR5XuMdF9QfHd0ujhnX4=
github.com/projectdiscovery/gologger v1.1.25 h1:bHarLQ/sCfBErU6QCarE1fuGpINEkyHu8zhYUWE2oMA=
github.com/projectdiscovery/gologger v1.1.25/go.mod h1:AmWrlwr9Xs/dRALoN3wjuNzdSpvNu0nFDXI/4+mII7Q=
github.com/projectdiscovery/hmap v0.0.60 h1:corqk65wxQroU628TQxWUTeBsIFA05DTJiEZO4gP/rU=
github.com/projectdiscovery/hmap v0.0.60/go.mod h1:elXA/ZbmnP6y2lEv1xRcRSy1hUIUsYzg/RJV3aoGwyI=
github.com/projectdiscovery/fastdialer v0.2.14 h1:/cndy+5celjoYzbk4LksHYOCTpFGIJY8RF/EK31Opjs=
github.com/projectdiscovery/fastdialer v0.2.14/go.mod h1:z5yKQ/YWaVrBMfdL6f5J7VytUx9wxc5vs/Lf51QelCw=
github.com/projectdiscovery/goflags v0.1.65 h1:rjoj+5lP/FDzgeM0WILUTX9AOOnw0J0LXtl8P1SVeGE=
github.com/projectdiscovery/goflags v0.1.65/go.mod h1:cg6+yrLlaekP1hnefBc/UXbH1YGWa0fuzEW9iS1aG4g=
github.com/projectdiscovery/gologger v1.1.39 h1:cbfiGZa3p7A2Y6vFQtghnTWaAcTeGVjT88PFmJNbuJc=
github.com/projectdiscovery/gologger v1.1.39/go.mod h1:2jMe+L21KAtciArmPFqvWsS0dySDUhCSV8KK/D3W+GU=
github.com/projectdiscovery/hmap v0.0.74 h1:j0TpS9fJxisfdGcIRjaZ3qgyjP3pBkRJf12ZWv64rOI=
github.com/projectdiscovery/hmap v0.0.74/go.mod h1:qEPAdq/gWQU/IEI+QMzSyL+HYdqayR64V9vGTI/W38c=
github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb h1:MGtI4oE12ruWv11ZlPXXd7hl/uAaQZrFvrIDYDeVMd8=
github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb/go.mod h1:vmgC0DTFCfoCLp0RAfsfYTZZan0QMVs+cmTbH6blfjk=
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 h1:ZScLodGSezQVwsQDtBSMFp72WDq0nNN+KE/5DHKY5QE=
Expand All @@ -224,12 +224,12 @@ github.com/projectdiscovery/mapcidr v1.1.34 h1:udr83vQ7oz3kEOwlsU6NC6o08leJzSDQt
github.com/projectdiscovery/mapcidr v1.1.34/go.mod h1:1+1R6OkKSAKtWDXE9RvxXtXPoajXTYX0eiEdkqlhQqQ=
github.com/projectdiscovery/networkpolicy v0.0.9 h1:IrlDoYZagNNO8y+7iZeHT8k5izE+nek7TdtvEBwCxqk=
github.com/projectdiscovery/networkpolicy v0.0.9/go.mod h1:XFJ2Lnv8BE/ziQCFjBHMsH1w6VmkPiQtk+NlBpdMU7M=
github.com/projectdiscovery/retryabledns v1.0.76 h1:6PyRCSW5SMUfE7uozZWckWuIDnBgLU/b1ofeWqeKONs=
github.com/projectdiscovery/retryabledns v1.0.76/go.mod h1:vc4L2dng+nPLpQu7s0eqFc0OvyrZibuMNWFMA9bnN3w=
github.com/projectdiscovery/retryablehttp-go v1.0.79 h1:XZBoyx7eMjr7/Iy0qQoYVEil1G5IRsm8KuFed/Ju5fk=
github.com/projectdiscovery/retryablehttp-go v1.0.79/go.mod h1:F9XFivtDToesAZhbPDnnj8CVp/TmOgv9qYDG1QY1qxA=
github.com/projectdiscovery/utils v0.2.11 h1:TO7fBG5QI256sn1YuTD87yn4+4OjGJ2wT1772uEnp4Q=
github.com/projectdiscovery/utils v0.2.11/go.mod h1:W0E74DWkKxlcyKS5XwcAwiob7+smoszPPi1NgX3vZyk=
github.com/projectdiscovery/retryabledns v1.0.92 h1:XH8WdG2FkYogJgsLzROgF2zLEnfL45UJa5sRuUTd5bI=
github.com/projectdiscovery/retryabledns v1.0.92/go.mod h1:+6Ik6CUs5FOz7NgO3asC9XYRVxAXUwhnoG0Iy85eW20=
github.com/projectdiscovery/retryablehttp-go v1.0.94 h1:zg6pid5vTwAG+AoNHgOXgIOz+na0T7VvshwOzdZs4nY=
github.com/projectdiscovery/retryablehttp-go v1.0.94/go.mod h1:sDQK5cNoM2IBJq8YhgAnW/SO0KjM2HpcTP2oqPl+xec=
github.com/projectdiscovery/utils v0.4.5 h1:ZlY4b5b3Jl8F/KFb+S/I9eMoYRFioI+NBzdIP4AK2io=
github.com/projectdiscovery/utils v0.4.5/go.mod h1:IFTIlRwqzZLmCaNYNVo/nNdhsuRfgij4kuZcNbrd7hM=
github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
Expand Down Expand Up @@ -364,8 +364,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo=
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand Down Expand Up @@ -396,8 +396,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand All @@ -423,15 +423,15 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand All @@ -440,8 +440,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
Expand Down
1 change: 1 addition & 0 deletions pkg/options/server_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
)

type CLIServerOptions struct {
Resolvers goflags.StringSlice
Config string
Version bool
Debug bool
Expand Down
2 changes: 1 addition & 1 deletion pkg/options/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
updateutils "github.com/projectdiscovery/utils/update"
)

const Version = "1.2.2"
const Version = "1.2.3"

var banner = (`
_ __ __ __
Expand Down
22 changes: 15 additions & 7 deletions pkg/server/acme/acme_certbot.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ import (
"go.uber.org/zap"
)

// DefaultResolvers trusted
var DefaultResolvers = []string{
"1.1.1.1:53",
"1.0.0.1:53",
"8.8.8.8:53",
"8.8.4.4:53",
}

// CleanupStorage perform cleanup routines tasks
func CleanupStorage() {
cleanupOptions := certmagic.CleanStorageOptions{OCSPStaples: true}
Expand All @@ -28,7 +36,7 @@ type CertificateFiles struct {

// HandleWildcardCertificates handles ACME wildcard cert generation with DNS
// challenge using certmagic library from caddyserver.
func HandleWildcardCertificates(domain, email string, store *Provider, debug bool) ([]tls.Certificate, []CertificateFiles, error) {
func HandleWildcardCertificates(domain, email string, store *Provider, debug bool, customResolvers []string) ([]tls.Certificate, []CertificateFiles, error) {
logger, err := zap.NewProduction()
if err != nil {
return nil, nil, err
Expand All @@ -37,12 +45,12 @@ func HandleWildcardCertificates(domain, email string, store *Provider, debug boo
certmagic.DefaultACME.Email = email
certmagic.DefaultACME.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: store,
Resolvers: []string{
"8.8.8.8:53",
"8.8.4.4:53",
"1.1.1.1:53",
"1.0.0.1:53",
},
Resolvers: func() []string {
if len(customResolvers) == 0 {
return DefaultResolvers
}
return customResolvers
}(),
}
originalDomain := strings.TrimPrefix(domain, "*.")

Expand Down
Loading