wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #102 from CosmicToast/httpie-go 

add cli detection for httpie-go
This commit is contained in:
Martin Polden 2020-07-24 09:43:39 +02:00 committed by GitHub
parent eb6d590990 7ad9af3b15
commit fe68795a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -77,7 +77,7 @@ between IPv4 and IPv6 lookup.
* Fast * Fast
* Supports IPv6 * Supports IPv6
* Supports HTTPS * 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 * JSON output
* ASN, country and city lookup using the MaxMind GeoIP database * ASN, country and city lookup using the MaxMind GeoIP database
* Port testing * Port testing

2
http/http.go
View File

@ -317,7 +317,7 @@ func NotFoundHandler(w http.ResponseWriter, r *http.Request) *appError {
func cliMatcher(r *http.Request) bool { func cliMatcher(r *http.Request) bool {
ua := useragent.Parse(r.UserAgent()) ua := useragent.Parse(r.UserAgent())
switch ua.Product { 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 true
} }
return false return false

1
http/http_test.go
View File

@ -214,6 +214,7 @@ func TestCLIMatcher(t *testing.T) {
{"Wget", true}, {"Wget", true},
{"fetch libfetch/2.0", true}, {"fetch libfetch/2.0", true},
{"HTTPie/0.9.3", true}, {"HTTPie/0.9.3", true},
{"httpie-go/0.6.0", true},
{"Go 1.1 package http", true}, {"Go 1.1 package http", true},
{"Go-http-client/1.1", true}, {"Go-http-client/1.1", true},
{"Go-http-client/2.0", true}, {"Go-http-client/2.0", true},

5
index.html
View File

@ -82,7 +82,7 @@
<h1>What is my IP address?</h1> <h1>What is my IP address?</h1>
<p><code class="ip">{{ .IP }}</code></p> <p><code class="ip">{{ .IP }}</code></p>
<p>Multiple command line HTTP clients are supported, <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> 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> <p>All endpoints (except <code>/port</code>) can return information about a custom IP address specified via <code>?ip=</code> query parameter.</p>
</div> </div>
@ -97,6 +97,9 @@ $ curl {{ .Host }}
$ http -b {{ .Host }} $ http -b {{ .Host }}
{{ .IP }} {{ .IP }}
$ ht -b {{ .Host }}
{{ .IP }}
$ wget -qO- {{ .Host }} $ wget -qO- {{ .Host }}
{{ .IP }} {{ .IP }}