-`subdy` is simple CLI for [subdomain.center](https://www.subdomain.center) API.
+`subdy` is a simple CLI for [subdomain.center](https://www.subdomain.center) API.
### Screenshots
-
+
### Installation
@@ -78,28 +77,7 @@ subdy --generate-man | sudo gzip > /usr/share/man/man1/subdy.1.gz
### Usage
-```
-Usage: subdy {options} domain
-
-Options
-
- --ip, -I Resolve subdomains IP
- --dns, -D name-or-url DoH provider (cloudflare|google|url)
- --no-color, -nc Disable colors in output
- --help, -h Show this help message
- --version, -v Show version
-
-Examples
-
- subdy go.dev
- Find all subdomains of go.dev
-
- subdy -I go.dev
- Find all subdomains of go.dev and resolve their IPs
-
- subdy -I -D google go.dev
- Find all subdomains of go.dev and resolve their IPs using Google DNS
-```
+
### CI Status
diff --git a/cli/cli.go b/cli/cli.go
index c535bf9..07ab356 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -18,6 +18,7 @@ import (
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/support"
"github.com/essentialkaos/ek/v12/support/deps"
+ "github.com/essentialkaos/ek/v12/terminal"
"github.com/essentialkaos/ek/v12/terminal/tty"
"github.com/essentialkaos/ek/v12/usage"
"github.com/essentialkaos/ek/v12/usage/completion/bash"
@@ -35,7 +36,7 @@ import (
// Basic utility info
const (
APP = "subdy"
- VER = "0.1.0"
+ VER = "0.2.0"
DESC = "CLI for subdomain.center API"
)
@@ -82,6 +83,7 @@ var dohProviders = map[string]string{
"cf": dns.CLOUDFLARE,
"cloudflare": dns.CLOUDFLARE,
"google": dns.GOOGLE,
+ "quad9": dns.QUAD9,
}
// useRawOutput is raw output flag (for cli command)
@@ -95,8 +97,9 @@ func Run(gitRev string, gomod []byte) {
args, errs := options.Parse(optMap)
- if len(errs) != 0 {
- printError(errs[0].Error())
+ if !errs.IsEmpty() {
+ terminal.Error("Options parsing errors:")
+ terminal.Error(errs.String())
os.Exit(1)
}
@@ -123,10 +126,17 @@ func Run(gitRev string, gomod []byte) {
os.Exit(0)
}
- err := process(args)
+ err := validateOptionsAndArgs(args)
if err != nil {
- printError(err.Error())
+ terminal.Error(err)
+ os.Exit(1)
+ }
+
+ err = process(args)
+
+ if err != nil {
+ terminal.Error(err)
os.Exit(1)
}
}
@@ -149,17 +159,30 @@ func configureUI() {
req.SetUserAgent(APP, VER)
}
-// process starts arguments processing
-func process(args options.Arguments) error {
+// validateOptionsAndArgs validates options and arguments
+func validateOptionsAndArgs(args options.Arguments) error {
domain := args.Get(0).String()
if !strings.Contains(domain, ".") {
return fmt.Errorf("%q is not valid domain", domain)
}
+ if options.Has(OPT_DNS) {
+ dns := options.GetS(OPT_DNS)
+
+ if !strings.Contains(dns, ".") && dohProviders[dns] == "" {
+ return fmt.Errorf("Unknown DNS-over-HTTPS provider %q", dns)
+ }
+ }
+
+ return nil
+}
+
+// process starts arguments processing
+func process(args options.Arguments) error {
fmtc.If(!useRawOutput).TPrintf("{s-}Searching subdomains…{!}")
- subdomains, err := subdomains.Find(domain)
+ subdomains, err := subdomains.Find(args.Get(0).String())
if err != nil {
fmtc.TPrintf("")
@@ -168,7 +191,7 @@ func process(args options.Arguments) error {
if len(subdomains) == 0 {
fmtc.TPrintf("")
- printWarn("There are no subdomains for this domain")
+ terminal.Warn("There are no subdomains for this domain")
return nil
}
@@ -243,24 +266,6 @@ func getDoHResolver() *dns.Resolver {
return &dns.Resolver{resolverURL}
}
-// printError prints error message to console
-func printError(f string, a ...interface{}) {
- if len(a) == 0 {
- fmtc.Fprintln(os.Stderr, "{r}"+f+"{!}")
- } else {
- fmtc.Fprintf(os.Stderr, "{r}"+f+"{!}\n", a...)
- }
-}
-
-// printError prints warning message to console
-func printWarn(f string, a ...interface{}) {
- if len(a) == 0 {
- fmtc.Fprintln(os.Stderr, "{y}"+f+"{!}")
- } else {
- fmtc.Fprintf(os.Stderr, "{y}"+f+"{!}\n", a...)
- }
-}
-
// ////////////////////////////////////////////////////////////////////////////////// //
// checkAPIAvailability checks API availability
@@ -294,11 +299,11 @@ func printCompletion() int {
switch options.GetS(OPT_COMPLETION) {
case "bash":
- fmt.Print(bash.Generate(info, "subdy"))
+ fmt.Print(bash.Generate(info, APP))
case "fish":
- fmt.Print(fish.Generate(info, "subdy"))
+ fmt.Print(fish.Generate(info, APP))
case "zsh":
- fmt.Print(zsh.Generate(info, optMap, "subdy"))
+ fmt.Print(zsh.Generate(info, optMap, APP))
default:
return 1
}
@@ -308,12 +313,7 @@ func printCompletion() int {
// printMan prints man page
func printMan() {
- fmt.Println(
- man.Generate(
- genUsage(),
- genAbout(""),
- ),
- )
+ fmt.Println(man.Generate(genUsage(), genAbout("")))
}
// genUsage generates usage info
@@ -321,7 +321,7 @@ func genUsage() *usage.Info {
info := usage.NewInfo("", "domain")
info.AddOption(OPT_IP, "Resolve subdomains IP")
- info.AddOption(OPT_DNS, "DoH provider {s-}({_}cloudflare{!_}|google|url){!}", "name-or-url")
+ info.AddOption(OPT_DNS, "DoH JSON provider {s-}({_}cloudflare{!_}|google|quad9|custom-url){!}", "name-or-url")
info.AddOption(OPT_NO_COLOR, "Disable colors in output")
info.AddOption(OPT_HELP, "Show this help message")
info.AddOption(OPT_VER, "Show version")
@@ -352,6 +352,8 @@ func genAbout(gitRev string) *usage.About {
License: "Apache License, Version 2.0 ",
}
+ about.DescSeparator = "{s}—{!}"
+
if gitRev != "" {
about.Build = "git:" + gitRev
about.UpdateChecker = usage.UpdateChecker{"essentialkaos/subdy", update.GitHubChecker}
diff --git a/dns/providers.go b/dns/providers.go
index 21d8403..6315608 100644
--- a/dns/providers.go
+++ b/dns/providers.go
@@ -10,4 +10,5 @@ package dns
const (
CLOUDFLARE = "1.1.1.1/dns-query"
GOOGLE = "dns.google/resolve"
+ QUAD9 = "9.9.9.9:5053/dns-query"
)
diff --git a/go.mod b/go.mod
index 3edf931..cf317ee 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,9 @@ module github.com/essentialkaos/subdy
go 1.18
-require github.com/essentialkaos/ek/v12 v12.113.0
+require github.com/essentialkaos/ek/v12 v12.127.0
require (
- github.com/essentialkaos/depsy v1.1.0 // indirect
- golang.org/x/sys v0.18.0 // indirect
+ github.com/essentialkaos/depsy v1.3.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
)
diff --git a/go.sum b/go.sum
index 898b4c3..07ba145 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,10 @@
github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
-github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI=
-github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
-github.com/essentialkaos/ek/v12 v12.113.0 h1:/kfEaqbexLSvscwQfVDusA7IMRIPUNn+Hr/0xhKFNXc=
-github.com/essentialkaos/ek/v12 v12.113.0/go.mod h1:SslW97Se34YQKc08Ume2V/8h/HPTgLS1+Iok64cNF/U=
+github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU=
+github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
+github.com/essentialkaos/ek/v12 v12.127.0 h1:fU5A+QbIZ7NTq1K5jGVwAWwuLtBUhsIKuRWYT78hE+Q=
+github.com/essentialkaos/ek/v12 v12.127.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- 
+ 
+ 
### CI Status
diff --git a/cli/cli.go b/cli/cli.go
index c535bf9..07ab356 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -18,6 +18,7 @@ import (
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/support"
"github.com/essentialkaos/ek/v12/support/deps"
+ "github.com/essentialkaos/ek/v12/terminal"
"github.com/essentialkaos/ek/v12/terminal/tty"
"github.com/essentialkaos/ek/v12/usage"
"github.com/essentialkaos/ek/v12/usage/completion/bash"
@@ -35,7 +36,7 @@ import (
// Basic utility info
const (
APP = "subdy"
- VER = "0.1.0"
+ VER = "0.2.0"
DESC = "CLI for subdomain.center API"
)
@@ -82,6 +83,7 @@ var dohProviders = map[string]string{
"cf": dns.CLOUDFLARE,
"cloudflare": dns.CLOUDFLARE,
"google": dns.GOOGLE,
+ "quad9": dns.QUAD9,
}
// useRawOutput is raw output flag (for cli command)
@@ -95,8 +97,9 @@ func Run(gitRev string, gomod []byte) {
args, errs := options.Parse(optMap)
- if len(errs) != 0 {
- printError(errs[0].Error())
+ if !errs.IsEmpty() {
+ terminal.Error("Options parsing errors:")
+ terminal.Error(errs.String())
os.Exit(1)
}
@@ -123,10 +126,17 @@ func Run(gitRev string, gomod []byte) {
os.Exit(0)
}
- err := process(args)
+ err := validateOptionsAndArgs(args)
if err != nil {
- printError(err.Error())
+ terminal.Error(err)
+ os.Exit(1)
+ }
+
+ err = process(args)
+
+ if err != nil {
+ terminal.Error(err)
os.Exit(1)
}
}
@@ -149,17 +159,30 @@ func configureUI() {
req.SetUserAgent(APP, VER)
}
-// process starts arguments processing
-func process(args options.Arguments) error {
+// validateOptionsAndArgs validates options and arguments
+func validateOptionsAndArgs(args options.Arguments) error {
domain := args.Get(0).String()
if !strings.Contains(domain, ".") {
return fmt.Errorf("%q is not valid domain", domain)
}
+ if options.Has(OPT_DNS) {
+ dns := options.GetS(OPT_DNS)
+
+ if !strings.Contains(dns, ".") && dohProviders[dns] == "" {
+ return fmt.Errorf("Unknown DNS-over-HTTPS provider %q", dns)
+ }
+ }
+
+ return nil
+}
+
+// process starts arguments processing
+func process(args options.Arguments) error {
fmtc.If(!useRawOutput).TPrintf("{s-}Searching subdomains…{!}")
- subdomains, err := subdomains.Find(domain)
+ subdomains, err := subdomains.Find(args.Get(0).String())
if err != nil {
fmtc.TPrintf("")
@@ -168,7 +191,7 @@ func process(args options.Arguments) error {
if len(subdomains) == 0 {
fmtc.TPrintf("")
- printWarn("There are no subdomains for this domain")
+ terminal.Warn("There are no subdomains for this domain")
return nil
}
@@ -243,24 +266,6 @@ func getDoHResolver() *dns.Resolver {
return &dns.Resolver{resolverURL}
}
-// printError prints error message to console
-func printError(f string, a ...interface{}) {
- if len(a) == 0 {
- fmtc.Fprintln(os.Stderr, "{r}"+f+"{!}")
- } else {
- fmtc.Fprintf(os.Stderr, "{r}"+f+"{!}\n", a...)
- }
-}
-
-// printError prints warning message to console
-func printWarn(f string, a ...interface{}) {
- if len(a) == 0 {
- fmtc.Fprintln(os.Stderr, "{y}"+f+"{!}")
- } else {
- fmtc.Fprintf(os.Stderr, "{y}"+f+"{!}\n", a...)
- }
-}
-
// ////////////////////////////////////////////////////////////////////////////////// //
// checkAPIAvailability checks API availability
@@ -294,11 +299,11 @@ func printCompletion() int {
switch options.GetS(OPT_COMPLETION) {
case "bash":
- fmt.Print(bash.Generate(info, "subdy"))
+ fmt.Print(bash.Generate(info, APP))
case "fish":
- fmt.Print(fish.Generate(info, "subdy"))
+ fmt.Print(fish.Generate(info, APP))
case "zsh":
- fmt.Print(zsh.Generate(info, optMap, "subdy"))
+ fmt.Print(zsh.Generate(info, optMap, APP))
default:
return 1
}
@@ -308,12 +313,7 @@ func printCompletion() int {
// printMan prints man page
func printMan() {
- fmt.Println(
- man.Generate(
- genUsage(),
- genAbout(""),
- ),
- )
+ fmt.Println(man.Generate(genUsage(), genAbout("")))
}
// genUsage generates usage info
@@ -321,7 +321,7 @@ func genUsage() *usage.Info {
info := usage.NewInfo("", "domain")
info.AddOption(OPT_IP, "Resolve subdomains IP")
- info.AddOption(OPT_DNS, "DoH provider {s-}({_}cloudflare{!_}|google|url){!}", "name-or-url")
+ info.AddOption(OPT_DNS, "DoH JSON provider {s-}({_}cloudflare{!_}|google|quad9|custom-url){!}", "name-or-url")
info.AddOption(OPT_NO_COLOR, "Disable colors in output")
info.AddOption(OPT_HELP, "Show this help message")
info.AddOption(OPT_VER, "Show version")
@@ -352,6 +352,8 @@ func genAbout(gitRev string) *usage.About {
License: "Apache License, Version 2.0