http: use Method* constants
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Feb 26, 2019 at 17:53 UTC
5eea0a4ba0f4f9dc223ca3d5e34fc226085070d2
7 files changed
+26
-26
core/corehttp/commands.go
+2
-2
@@ -89,7 +89,7 @@ func addCORSDefaults(c *cmdsHttp.ServerConfig) {
89
90
// by default, use GET, PUT, POST
91
if len(c.AllowedMethods()) == 0 {
92
- c.SetAllowedMethods("GET", "POST", "PUT")
92
+ c.SetAllowedMethods(http.MethodGet, http.MethodPost, http.MethodPut)
93
}
94
}
95
@@ -121,7 +121,7 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption {
121
return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
122
123
cfg := cmdsHttp.NewServerConfig()
124
- cfg.SetAllowedMethods("GET", "POST", "PUT")
124
+ cfg.SetAllowedMethods(http.MethodGet, http.MethodPost, http.MethodPut)
125
cfg.APIPath = APIPath
126
rcfg, err := n.Repo.Config()
127
if err != nil {
core/corehttp/gateway.go
+1
-1
@@ -69,7 +69,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
69
}
70
if _, ok := headers[ACAMethodsName]; !ok {
71
// Default to GET
72
- headers[ACAMethodsName] = []string{"GET"}
72
+ headers[ACAMethodsName] = []string{http.MethodGet}
73
}
74
75
headers[ACAHeadersName] = cleanHeaderSet(
core/corehttp/gateway_handler.go
+6
-6
@@ -83,24 +83,24 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
83
84
if i.config.Writable {
85
switch r.Method {
86
- case "POST":
86
+ case http.MethodPost:
87
i.postHandler(w, r)
88
return
89
- case "PUT":
89
+ case http.MethodPut:
90
i.putHandler(w, r)
91
return
92
- case "DELETE":
92
+ case http.MethodDelete:
93
i.deleteHandler(w, r)
94
return
95
}
96
}
97
98
- if r.Method == "GET" || r.Method == "HEAD" {
98
+ if r.Method == http.MethodGet || r.Method == http.MethodHead {
99
i.getOrHeadHandler(w, r)
100
return
101
}
102
103
- if r.Method == "OPTIONS" {
103
+ if r.Method == http.MethodOptions {
104
i.optionsHandler(w, r)
105
return
106
}
@@ -298,7 +298,7 @@ func (i *gatewayHandler) getOrHeadHandler(w http.ResponseWriter, r *http.Request
298
return
299
}
300
301
- if r.Method == "HEAD" {
301
+ if r.Method == http.MethodHead {
302
return
303
}
304
core/corehttp/gateway_test.go
+13
-13
@@ -202,7 +202,7 @@ func TestGatewayGet(t *testing.T) {
202
{"example.man", "/", http.StatusOK, "fnord"},
203
} {
204
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)
206
if err != nil {
207
t.Fatal(err)
208
}
@@ -259,7 +259,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
259
ns["/ipns/example.net"] = path.FromString(k.String())
260
261
// 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)
263
if err != nil {
264
t.Fatal(err)
265
}
@@ -282,7 +282,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
282
}
283
284
// 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)
286
if err != nil {
287
t.Fatal(err)
288
}
@@ -306,7 +306,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
306
}
307
308
// 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)
310
if err != nil {
311
t.Fatal(err)
312
}
@@ -359,7 +359,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
359
ns["/ipns/example.net"] = path.FromString(k.String())
360
361
// 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)
363
if err != nil {
364
t.Fatal(err)
365
}
@@ -392,7 +392,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
392
}
393
394
// 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)
396
if err != nil {
397
t.Fatal(err)
398
}
@@ -425,7 +425,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
425
}
426
427
// 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)
429
if err != nil {
430
t.Fatal(err)
431
}
@@ -458,7 +458,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
458
}
459
460
// 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)
462
if err != nil {
463
t.Fatal(err)
464
}
@@ -492,7 +492,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
492
}
493
494
// 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)
496
if err != nil {
497
t.Fatal(err)
498
}
@@ -500,7 +500,7 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
500
req.Header.Set("X-Ipfs-Gateway-Prefix", "/bad-prefix")
501
502
// 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)
504
if err != nil {
505
t.Fatal(err)
506
}
@@ -539,7 +539,7 @@ func TestCacheControlImmutable(t *testing.T) {
539
t.Logf("test server url: %s", ts.URL)
540
defer ts.Close()
541
542
- req, err := http.NewRequest("GET", ts.URL+emptyDir+"/", nil)
542
+ req, err := http.NewRequest(http.MethodGet, ts.URL+emptyDir+"/", nil)
543
if err != nil {
544
t.Fatal(err)
545
}
@@ -566,7 +566,7 @@ func TestGoGetSupport(t *testing.T) {
566
defer ts.Close()
567
568
// 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)
570
if err != nil {
571
t.Fatal(err)
572
}
@@ -589,7 +589,7 @@ func TestVersion(t *testing.T) {
589
t.Logf("test server url: %s", ts.URL)
590
defer ts.Close()
591
592
- req, err := http.NewRequest("GET", ts.URL+"/version", nil)
592
+ req, err := http.NewRequest(http.MethodGet, ts.URL+"/version", nil)
593
if err != nil {
594
t.Fatal(err)
595
}
core/corehttp/option_test.go
+1
-1
@@ -37,7 +37,7 @@ func TestCheckVersionOption(t *testing.T) {
37
38
for _, tc := range tcs {
39
t.Logf("%#v", tc)
40
- r := httptest.NewRequest("POST", tc.uri, nil)
40
+ r := httptest.NewRequest(http.MethodPost, tc.uri, nil)
41
r.Header.Add("User-Agent", tc.userAgent) // old version, should fail
42
43
called := false
core/corehttp/proxy_test.go
+2
-2
@@ -26,7 +26,7 @@ var validtestCases = []TestCase{
26
func TestParseRequest(t *testing.T) {
27
for _, tc := range validtestCases {
28
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(""))
30
31
parsed, err := parseRequest(req)
32
if err != nil {
@@ -46,7 +46,7 @@ var invalidtestCases = []string{
46
func TestParseRequestInvalidPath(t *testing.T) {
47
for _, tc := range invalidtestCases {
48
url := tc
49
- req, _ := http.NewRequest("GET", url, strings.NewReader(""))
49
+ req, _ := http.NewRequest(http.MethodGet, url, strings.NewReader(""))
50
51
_, err := parseRequest(req)
52
if err == nil {
repo/fsrepo/migrations/migrations.go
+1
-1
@@ -169,7 +169,7 @@ func GetLatestVersion(ipfspath, dist string) (string, error) {
169
}
170
171
func httpGet(url string) (*http.Response, error) {
172
- req, err := http.NewRequest("GET", url, nil)
172
+ req, err := http.NewRequest(http.MethodGet, url, nil)
173
if err != nil {
174
return nil, fmt.Errorf("http.NewRequest error: %s", err)
175
}