diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-07-24 09:43:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 09:43:39 +0200 |
| commit | fe68795a5060827b696d7109516a4b6729edab53 (patch) | |
| tree | dfc8255fde9dc4e9d1901b28e2404b46f77b488f | |
| parent | eb6d5909904b10decafcf53a31458c6c171b0523 (diff) | |
| parent | 7ad9af3b155d1c16d118c74cd534dfb9acc1c9d3 (diff) | |
Merge pull request #102 from CosmicToast/httpie-go
add cli detection for httpie-go
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | http/http.go | 2 | ||||
| -rw-r--r-- | http/http_test.go | 1 | ||||
| -rw-r--r-- | index.html | 5 |
4 files changed, 7 insertions, 3 deletions
@@ -77,7 +77,7 @@ between IPv4 and IPv6 lookup. * Fast * Supports IPv6 * Supports HTTPS -* Supports common command-line clients (e.g. `curl`, `httpie`, `wget` and `fetch`) +* Supports common command-line clients (e.g. `curl`, `httpie`, `ht`, `wget` and `fetch`) * JSON output * ASN, country and city lookup using the MaxMind GeoIP database * Port testing diff --git a/http/http.go b/http/http.go index b5d275d..2b23cf4 100644 --- a/http/http.go +++ b/http/http.go @@ -317,7 +317,7 @@ func NotFoundHandler(w http.ResponseWriter, r *http.Request) *appError { func cliMatcher(r *http.Request) bool { ua := useragent.Parse(r.UserAgent()) switch ua.Product { - case "curl", "HTTPie", "Wget", "fetch libfetch", "Go", "Go-http-client", "ddclient", "Mikrotik": + case "curl", "HTTPie", "httpie-go", "Wget", "fetch libfetch", "Go", "Go-http-client", "ddclient", "Mikrotik": return true } return false diff --git a/http/http_test.go b/http/http_test.go index 00e58a4..61c1d72 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -214,6 +214,7 @@ func TestCLIMatcher(t *testing.T) { {"Wget", true}, {"fetch libfetch/2.0", true}, {"HTTPie/0.9.3", true}, + {"httpie-go/0.6.0", true}, {"Go 1.1 package http", true}, {"Go-http-client/1.1", true}, {"Go-http-client/2.0", true}, @@ -82,7 +82,7 @@ <h1>What is my IP address?</h1> <p><code class="ip">{{ .IP }}</code></p> <p>Multiple command line HTTP clients are supported, - including <a href="https://curl.haxx.se/">curl</a>, <a href="https://github.com/jkbrzt/httpie">httpie</a>, <a href="https://www.gnu.org/software/wget/">GNU + including <a href="https://curl.haxx.se/">curl</a>, <a href="https://github.com/jkbrzt/httpie">httpie</a>, <a href="https://github.com/nojima/httpie-go">httpie-go</a>, <a href="https://www.gnu.org/software/wget/">GNU Wget</a>, <a href="https://www.freebsd.org/cgi/man.cgi?fetch(1)">fetch</a>, and <a href="https://github.com/astaxie/bat">bat</a>.</p> <p>All endpoints (except <code>/port</code>) can return information about a custom IP address specified via <code>?ip=</code> query parameter.</p> </div> @@ -97,6 +97,9 @@ $ curl {{ .Host }} $ http -b {{ .Host }} {{ .IP }} +$ ht -b {{ .Host }} +{{ .IP }} + $ wget -qO- {{ .Host }} {{ .IP }} |