Skip to content

Commit 40fe57b

Browse files
StebalienStebalien
authored
Merge pull request ipfs/kubo#6820 from ipfs/fix/gateway-cleanup
gateway cleanups This commit was moved from ipfs/kubo@ff26934
2 parents 688c4b9 + ef0dc27 commit 40fe57b

File tree

6 files changed

+26
-27
lines changed

6 files changed

+26
-27
lines changed

‎gateway/core/corehttp/commands.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func addCORSDefaults(c *cmdsHttp.ServerConfig) {
8989

9090
// by default, use GET, PUT, POST
9191
if len(c.AllowedMethods()) == 0 {
92-
c.SetAllowedMethods("GET", "POST", "PUT")
92+
c.SetAllowedMethods(http.MethodGet, http.MethodPost, http.MethodPut)
9393
}
9494
}
9595

@@ -121,7 +121,7 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption {
121121
return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
122122

123123
cfg := cmdsHttp.NewServerConfig()
124-
cfg.SetAllowedMethods("GET", "POST", "PUT")
124+
cfg.SetAllowedMethods(http.MethodGet, http.MethodPost, http.MethodPut)
125125
cfg.APIPath = APIPath
126126
rcfg, err := n.Repo.Config()
127127
if err != nil {

‎gateway/core/corehttp/gateway.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
6969
}
7070
if _, ok := headers[ACAMethodsName]; !ok {
7171
// Default to GET
72-
headers[ACAMethodsName] = []string{"GET"}
72+
headers[ACAMethodsName] = []string{http.MethodGet}
7373
}
7474

7575
headers[ACAHeadersName] = cleanHeaderSet(

‎gateway/core/corehttp/gateway_handler.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,23 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
8383

8484
if i.config.Writable {
8585
switch r.Method {
86-
case "POST":
86+
case http.MethodPost:
8787
i.postHandler(w, r)
8888
return
89-
case "PUT":
89+
case http.MethodPut:
9090
i.putHandler(w, r)
9191
return
92-
case "DELETE":
92+
case http.MethodDelete:
9393
i.deleteHandler(w, r)
9494
return
9595
}
9696
}
9797

98-
if r.Method == "GET" || r.Method == "HEAD" {
98+
switch r.Method {
99+
case http.MethodGet, http.MethodHead:
99100
i.getOrHeadHandler(w, r)
100101
return
101-
}
102-
103-
if r.Method == "OPTIONS" {
102+
case http.MethodOptions:
104103
i.optionsHandler(w, r)
105104
return
106105
}
@@ -298,7 +297,7 @@ func (i *gatewayHandler) getOrHeadHandler(w http.ResponseWriter, r *http.Request
298297
return
299298
}
300299

301-
if r.Method == "HEAD" {
300+
if r.Method == http.MethodHead {
302301
return
303302
}
304303

‎gateway/core/corehttp/gateway_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func TestGatewayGet(t *testing.T) {
202202
{"example.man", "/", http.StatusOK, "fnord"},
203203
} {
204204
var c http.Client
205-
r, err := http.NewRequest("GET", ts.URL+test.path, nil)
205+
r, err := http.NewRequest(http.MethodGet, ts.URL+test.path, nil)
206206
if err != nil {
207207
t.Fatal(err)
208208
}
@@ -259,7 +259,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
259259
ns["/ipns/example.net"] = path.FromString(k.String())
260260

261261
// make request to directory containing index.html
262-
req, err := http.NewRequest("GET", ts.URL+"/foo", nil)
262+
req, err := http.NewRequest(http.MethodGet, ts.URL+"/foo", nil)
263263
if err != nil {
264264
t.Fatal(err)
265265
}
@@ -282,7 +282,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
282282
}
283283

284284
// make request with prefix to directory containing index.html
285-
req, err = http.NewRequest("GET", ts.URL+"/foo", nil)
285+
req, err = http.NewRequest(http.MethodGet, ts.URL+"/foo", nil)
286286
if err != nil {
287287
t.Fatal(err)
288288
}
@@ -306,7 +306,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
306306
}
307307

308308
// make sure /version isn't exposed
309-
req, err = http.NewRequest("GET", ts.URL+"/version", nil)
309+
req, err = http.NewRequest(http.MethodGet, ts.URL+"/version", nil)
310310
if err != nil {
311311
t.Fatal(err)
312312
}
@@ -359,7 +359,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
359359
ns["/ipns/example.net"] = path.FromString(k.String())
360360

361361
// make request to directory listing
362-
req, err := http.NewRequest("GET", ts.URL+"/foo%3F%20%23%3C%27/", nil)
362+
req, err := http.NewRequest(http.MethodGet, ts.URL+"/foo%3F%20%23%3C%27/", nil)
363363
if err != nil {
364364
t.Fatal(err)
365365
}
@@ -392,7 +392,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
392392
}
393393

394394
// make request to directory listing at root
395-
req, err = http.NewRequest("GET", ts.URL, nil)
395+
req, err = http.NewRequest(http.MethodGet, ts.URL, nil)
396396
if err != nil {
397397
t.Fatal(err)
398398
}
@@ -425,7 +425,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
425425
}
426426

427427
// make request to directory listing
428-
req, err = http.NewRequest("GET", ts.URL+"/foo%3F%20%23%3C%27/bar/", nil)
428+
req, err = http.NewRequest(http.MethodGet, ts.URL+"/foo%3F%20%23%3C%27/bar/", nil)
429429
if err != nil {
430430
t.Fatal(err)
431431
}
@@ -458,7 +458,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
458458
}
459459

460460
// make request to directory listing with prefix
461-
req, err = http.NewRequest("GET", ts.URL, nil)
461+
req, err = http.NewRequest(http.MethodGet, ts.URL, nil)
462462
if err != nil {
463463
t.Fatal(err)
464464
}
@@ -492,15 +492,15 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
492492
}
493493

494494
// make request to directory listing with illegal prefix
495-
req, err = http.NewRequest("GET", ts.URL, nil)
495+
req, err = http.NewRequest(http.MethodGet, ts.URL, nil)
496496
if err != nil {
497497
t.Fatal(err)
498498
}
499499
req.Host = "example.net"
500500
req.Header.Set("X-Ipfs-Gateway-Prefix", "/bad-prefix")
501501

502502
// make request to directory listing with evil prefix
503-
req, err = http.NewRequest("GET", ts.URL, nil)
503+
req, err = http.NewRequest(http.MethodGet, ts.URL, nil)
504504
if err != nil {
505505
t.Fatal(err)
506506
}
@@ -539,7 +539,7 @@ func TestCacheControlImmutable(t *testing.T) {
539539
t.Logf("test server url: %s", ts.URL)
540540
defer ts.Close()
541541

542-
req, err := http.NewRequest("GET", ts.URL+emptyDir+"/", nil)
542+
req, err := http.NewRequest(http.MethodGet, ts.URL+emptyDir+"/", nil)
543543
if err != nil {
544544
t.Fatal(err)
545545
}
@@ -566,7 +566,7 @@ func TestGoGetSupport(t *testing.T) {
566566
defer ts.Close()
567567

568568
// mimic go-get
569-
req, err := http.NewRequest("GET", ts.URL+emptyDir+"?go-get=1", nil)
569+
req, err := http.NewRequest(http.MethodGet, ts.URL+emptyDir+"?go-get=1", nil)
570570
if err != nil {
571571
t.Fatal(err)
572572
}
@@ -589,7 +589,7 @@ func TestVersion(t *testing.T) {
589589
t.Logf("test server url: %s", ts.URL)
590590
defer ts.Close()
591591

592-
req, err := http.NewRequest("GET", ts.URL+"/version", nil)
592+
req, err := http.NewRequest(http.MethodGet, ts.URL+"/version", nil)
593593
if err != nil {
594594
t.Fatal(err)
595595
}

‎gateway/core/corehttp/option_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestCheckVersionOption(t *testing.T) {
3737

3838
for _, tc := range tcs {
3939
t.Logf("%#v", tc)
40-
r := httptest.NewRequest("POST", tc.uri, nil)
40+
r := httptest.NewRequest(http.MethodPost, tc.uri, nil)
4141
r.Header.Add("User-Agent", tc.userAgent) // old version, should fail
4242

4343
called := false

‎gateway/core/corehttp/proxy_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var validtestCases = []TestCase{
2626
func TestParseRequest(t *testing.T) {
2727
for _, tc := range validtestCases {
2828
url := tc.urlprefix + "/p2p/" + tc.target + tc.name + "/" + tc.path
29-
req, _ := http.NewRequest("GET", url, strings.NewReader(""))
29+
req, _ := http.NewRequest(http.MethodGet, url, strings.NewReader(""))
3030

3131
parsed, err := parseRequest(req)
3232
if err != nil {
@@ -46,7 +46,7 @@ var invalidtestCases = []string{
4646
func TestParseRequestInvalidPath(t *testing.T) {
4747
for _, tc := range invalidtestCases {
4848
url := tc
49-
req, _ := http.NewRequest("GET", url, strings.NewReader(""))
49+
req, _ := http.NewRequest(http.MethodGet, url, strings.NewReader(""))
5050

5151
_, err := parseRequest(req)
5252
if err == nil {

0 commit comments

Comments
 (0)