diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28db573..29fc64a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
tags:
- "*"
+env:
+ REGISTRY: ghcr.io
+
jobs:
goreleaser:
runs-on: ubuntu-latest
@@ -16,17 +19,14 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.16
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v1
+ go-version: 1.19
+ - name: Log in to the Container registry
+ uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
- registry: ghcr.io
+ registry: ${{ env.REGISTRY }}
username: ${{ github.repository_owner }}
- password: ${{ secrets.GH_GORELEASER_TOKEN }}
- - name: Install Snapcraft and Log In
- uses: samuelmeuli/action-snapcraft@v1
- with:
- snapcraft_token: ${{ secrets.SNAPCRAFT_TOKEN }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
@@ -34,4 +34,4 @@ jobs:
args: release --rm-dist
env:
DOCKER_CLI_EXPERIMENTAL: enabled
- GITHUB_TOKEN: ${{ secrets.GH_GORELEASER_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 9005d09..49159b4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -42,21 +42,14 @@ archives:
- LICENSE
- completions/
-snapcrafts:
- - name_template: "{{ .ProjectName }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
- summary: Command-line DNS client.
- description: |
- doggo is a command-line DNS client written in Go. It supports protocols like DoH, DoT and output formats like JSON.
- grade: stable
- confinement: strict
- publish: true
-
dockers:
- image_templates:
- "ghcr.io/mr-karan/doggo:{{ .Tag }}"
- "ghcr.io/mr-karan/doggo:latest"
- binaries:
- - doggo
+ id: doggo
+ # IDs to filter the binaries/packages.
+ ids:
+ - cli
dockerfile: Dockerfile-cli
build_flag_templates:
- "--build-arg"
@@ -64,34 +57,38 @@ dockers:
- image_templates:
- "ghcr.io/mr-karan/doggo:{{ .Tag }}-arm64v8"
- "ghcr.io/mr-karan/doggo:latest-arm64v8"
- binaries:
- - doggo
+ id: doggo-arm
+ # IDs to filter the binaries/packages.
+ ids:
+ - cli
goarch: arm64
dockerfile: Dockerfile-cli
build_flag_templates:
- "--build-arg"
- "ARCH=arm64v8"
- - image_templates:
- - "ghcr.io/mr-karan/doggo-api:{{ .Tag }}"
- - "ghcr.io/mr-karan/doggo-api:latest"
- binaries:
- - doggo-api.bin
- dockerfile: Dockerfile-api
- build_flag_templates:
- - "--build-arg"
- - "ARCH=amd64"
- extra_files:
- - config-api-sample.toml
- - image_templates:
- - "ghcr.io/mr-karan/doggo-api:{{ .Tag }}-arm64v8"
- - "ghcr.io/mr-karan/doggo-api:latest-arm64v8"
- binaries:
- - doggo-api.bin
- goarch: arm64
- dockerfile: Dockerfile-api
- build_flag_templates:
- - "--build-arg"
- - "ARCH=arm64v8"
- extra_files:
- - config-api-sample.toml
+ # - image_templates:
+ # - "ghcr.io/mr-karan/doggo-api:{{ .Tag }}"
+ # - "ghcr.io/mr-karan/doggo-api:latest"
+ # id: doggo-api
+ # ids:
+ # - api
+ # dockerfile: Dockerfile-api
+ # build_flag_templates:
+ # - "--build-arg"
+ # - "ARCH=amd64"
+ # extra_files:
+ # - config-api-sample.toml
+ # - image_templates:
+ # - "ghcr.io/mr-karan/doggo-api:{{ .Tag }}-arm64v8"
+ # - "ghcr.io/mr-karan/doggo-api:latest-arm64v8"
+ # id: doggo-api-arm
+ # ids:
+ # - api
+ # goarch: arm64
+ # dockerfile: Dockerfile-api
+ # build_flag_templates:
+ # - "--build-arg"
+ # - "ARCH=arm64v8"
+ # extra_files:
+ # - config-api-sample.toml
diff --git a/README.md b/README.md
index e54d3cf..d2ae781 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
---
-**doggo** is a modern command-line DNS client (like _dig_) written in Golang. It outputs information in a neat concise manner and supports protocols like DoH, DoT and DNSCrypt as well.
+**doggo** is a modern command-line DNS client (like _dig_) written in Golang. It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well.
It's totally inspired from [dog](https://github.com/ogham/dog/) which is written in Rust. I wanted to add some features to it but since I don't know Rust, I found it as a nice opportunity
to experiment with writing a DNS Client from scratch in `Go` myself. Hence the name `dog` +`go` => **doggo**.
@@ -24,6 +24,7 @@ to experiment with writing a DNS Client from scratch in `Go` myself. Hence the n
- Has support for multiple transport protocols:
- DNS over **HTTPS** (DoH)
- DNS over **TLS** (DoT)
+ - DNS over **QUIC** (DoQ)
- DNS over **TCP**
- DNS over **UDP**
- DNS over **DNSCrypt**
@@ -38,13 +39,13 @@ to experiment with writing a DNS Client from scratch in `Go` myself. Hence the n
### Binary
-You can grab the latest binaries for Linux, MacOS and Windows from the [Releases](https://github.com/mr-karan/doggo/releases) section.
+You can grab the latest binaries for Linux, MacOS and Windows from the [Releases](https://git.zio.sh/astra/doggo/releases) section.
For eg, to pull the latest `linux-amd64` binary:
```shell
$ cd "$(mktemp -d)"
-$ curl -sL "https://github.com/mr-karan/doggo/releases/download/v0.3.7/doggo_0.3.7_linux_amd64.tar.gz" | tar xz
+$ curl -sL "https://git.zio.sh/astra/doggo/releases/download/v0.3.7/doggo_0.3.7_linux_amd64.tar.gz" | tar xz
$ mv doggo /usr/local/bin
# doggo should be available now in your $PATH
$ doggo
@@ -64,24 +65,36 @@ You can supply all arguments to the CLI directly to `docker run` command. Eg:
`docker run ghcr.io/mr-karan/doggo:latest mrkaran.dev @1.1.1.1 MX`
-### Using snap
+### Package Managers
-[](https://snapcraft.io/doggo)
+#### Homebrew
-```sh
-$ sudo snap install doggo
+Install via [Homebrew](https://brew.sh/)
+
+```bash
+$ brew install doggo
```
-**NOTE**: Since the [confinement](https://snapcraft.io/docs/snap-confinement) mode is strict as of now, it cannot access your host's `/etc/resolv.conf`.
-I'll be making a request in the Snap forums soon so that it can be manually reviewed and allowed to use `--classic`. Until then, please specify a nameserver manually
-if using `snap`.
+#### Arch
+
+```bash
+yay -S doggo-bin
+```
+
+#### Scoop
+
+Install via [Scoop](https://scoop.sh/)
+
+```bash
+scoop install doggo
+```
### From Source
You need to have `go` installed in your system.
```bash
-$ go get github.com/mr-karan/doggo/cmd/doggo
+$ go install git.zio.sh/astra/doggo/cmd/doggo@latest
```
The binary will be available at `$GOPATH/bin/doggo`.
@@ -198,6 +211,8 @@ URL scheme of the server is used to identify which resolver to use for lookups.
@tls:// eg: @1.1.1.1 initiates a DoT resolver for 1.1.1.1:853.
@sdns:// eg: @sdns://AgcAAAAAAAAABzEuMC4wLjEAEmRucy5jbG91ZGZsYXJlLmNvbQovZG5zLXF1ZXJ5
initiates a DNSCrypt or DoH resolver using its DNS stamp.
+ @quic:// eg: @quic://dns.adguard.com
+ initiates a DNS over QUIC resolver for Adguard DNS Resolver.
```
### Query Options
@@ -212,11 +227,14 @@ URL scheme of the server is used to identify which resolver to use for lookups.
### Resolver Options
```
- --ndots=INT Specify ndots parameter. Takes value from /etc/resolv.conf if using the system nameserver or 1 otherwise.
- --search Use the search list defined in resolv.conf. Defaults to true. Set --search=false to disable search list.
- --timeout Specify timeout (in seconds) for the resolver to return a response.
- -4 --ipv4 Use IPv4 only.
- -6 --ipv6 Use IPv6 only.
+ --strategy=STRATEGY Specify strategy to query nameserver listed in etc/resolv.conf. Defaults to `all` (`random`, `first`, `all`).
+ --ndots=INT Specify ndots parameter. Takes value from /etc/resolv.conf if using the system nameserver or 1 otherwise.
+ --search Use the search list defined in resolv.conf. Defaults to true. Set --search=false to disable search list.
+ --timeout Specify timeout (in seconds) for the resolver to return a response.
+ -4 --ipv4 Use IPv4 only.
+ -6 --ipv6 Use IPv6 only.
+ --tls-hostname=HOSTNAME Provide a hostname for doing verification of the certificate if the provided DoT nameserver is an IP.
+ --skip-hostname-verification Skip TLS Hostname Verification in case of DOT Lookups.
```
@@ -227,6 +245,7 @@ URL scheme of the server is used to identify which resolver to use for lookups.
--color Defaults to true. Set --color=false to disable colored output.
--debug Enable debug logging.
--time Shows how long the response took from the server.
+ --short Short output format. Shows only the response section.
```
---
@@ -239,4 +258,4 @@ For now I am focussing more on [planned features](TODO.md) for a **stable** v1.0
## License
-[LICENSE](LICENSE)
+[LICENSE](./LICENSE)
diff --git a/TODO.md b/TODO.md
index 8abd542..30cca2f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -62,5 +62,8 @@
- [ ] Add tests for CLI Output.
- [ ] Homebrew - Goreleaser
- [ ] Add support for `dig +trace` like functionality.
+- [ ] Add `dig +short` short output
+- [x] Add `--strategy` for picking nameservers.
+- [ ] Explore `dig.rc` kinda file
- [x] Separate Authority/Answer in JSON output.
- [x] Error on NXDomain (Related upstream [bug](https://github.com/miekg/dns/issues/1198))
diff --git a/cmd/api/api.go b/cmd/api/api.go
index 43b42d9..c467f9c 100644
--- a/cmd/api/api.go
+++ b/cmd/api/api.go
@@ -6,8 +6,8 @@ import (
"net/http"
"time"
- "github.com/mr-karan/doggo/internal/app"
- "github.com/mr-karan/doggo/pkg/utils"
+ "git.zio.sh/astra/doggo/internal/app"
+ "git.zio.sh/astra/doggo/pkg/utils"
"github.com/sirupsen/logrus"
"github.com/go-chi/chi"
diff --git a/cmd/api/assets/dark.css b/cmd/api/assets/dark.css
new file mode 100644
index 0000000..4e4777d
--- /dev/null
+++ b/cmd/api/assets/dark.css
@@ -0,0 +1,48 @@
+:root {
+ --primary: #58a6ff;
+ --background: #0d1117;
+}
+
+body {
+ background-color: var(--background);
+ color: #c9d1d9;
+}
+
+.box {
+ border: 1px solid #30363d;
+ box-shadow: unset;
+}
+
+.help a {
+ text-decoration: none;
+}
+
+a:hover {
+ color: var(--primary);
+ text-decoration: underline;
+}
+
+input, select, button {
+ background-color: #010409;
+ border: 1px solid #30363d;
+ color: #ffffff;
+}
+
+button {
+ color: #c9d1d9;
+ background-color: #21262d;
+ box-shadow: 0 0 transparent, 0 0 transparent;
+}
+
+button:hover,
+button:focus {
+ background-color: #30363d;
+ border-color: #8b949e;
+ transition-duration: .1s;
+}
+
+table th {
+ background: #161b22;
+ border-bottom: unset;
+ color: #c9d1d9;
+}
\ No newline at end of file
diff --git a/cmd/api/handlers.go b/cmd/api/handlers.go
index 5adff0b..388ff92 100644
--- a/cmd/api/handlers.go
+++ b/cmd/api/handlers.go
@@ -8,9 +8,9 @@ import (
"net/http"
"time"
- "github.com/mr-karan/doggo/internal/app"
- "github.com/mr-karan/doggo/pkg/models"
- "github.com/mr-karan/doggo/pkg/resolvers"
+ "git.zio.sh/astra/doggo/internal/app"
+ "git.zio.sh/astra/doggo/pkg/models"
+ "git.zio.sh/astra/doggo/pkg/resolvers"
)
type httpResp struct {
diff --git a/cmd/api/index.html b/cmd/api/index.html
index 650ca17..c5de849 100644
--- a/cmd/api/index.html
+++ b/cmd/api/index.html
@@ -5,6 +5,7 @@
+