Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
3c6b9c5d
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
3c6b9c5d
编写于
11月 17, 2017
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rpc: minor cleanups to RPC PR
上级
c5b85697
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
28 deletion
+38
-28
rpc/http.go
rpc/http.go
+14
-18
rpc/http_test.go
rpc/http_test.go
+24
-10
未找到文件。
rpc/http.go
浏览文件 @
3c6b9c5d
...
...
@@ -20,6 +20,7 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
...
...
@@ -151,41 +152,36 @@ func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if
r
.
Method
==
"GET"
&&
r
.
ContentLength
==
0
&&
r
.
URL
.
RawQuery
==
""
{
return
}
if
responseCode
,
errorMessage
:=
httpErrorResponse
(
r
);
responseCode
!=
0
{
http
.
Error
(
w
,
err
orMessage
,
responseC
ode
)
if
code
,
err
:=
validateRequest
(
r
);
err
!=
nil
{
http
.
Error
(
w
,
err
.
Error
(),
c
ode
)
return
}
// All checks passed, create a codec that reads direct from the request body
// untilEOF and writes the response to w and order the server to process a
// single request.
codec
:=
NewJSONCodec
(
&
httpReadWriteNopCloser
{
r
.
Body
,
w
})
defer
codec
.
Close
()
w
.
Header
()
.
Set
(
"content-type"
,
"application/json"
)
w
.
Header
()
.
Set
(
"content-type"
,
contentType
)
srv
.
ServeSingleRequest
(
codec
,
OptionMethodInvocation
)
}
// Returns a non-zero response code and error message if the request is invalid.
func
httpErrorResponse
(
r
*
http
.
Request
)
(
int
,
string
)
{
// validateRequest returns a non-zero response code and error message if the
// request is invalid.
func
validateRequest
(
r
*
http
.
Request
)
(
int
,
error
)
{
if
r
.
Method
==
"PUT"
||
r
.
Method
==
"DELETE"
{
errorMessage
:=
"method not allowed"
return
http
.
StatusMethodNotAllowed
,
errorMessage
return
http
.
StatusMethodNotAllowed
,
errors
.
New
(
"method not allowed"
)
}
if
r
.
ContentLength
>
maxHTTPRequestContentLength
{
err
orMessage
:=
fmt
.
Sprint
f
(
"content length too large (%d>%d)"
,
r
.
ContentLength
,
maxHTTPRequestContentLength
)
return
http
.
StatusRequestEntityTooLarge
,
err
orMessage
err
:=
fmt
.
Error
f
(
"content length too large (%d>%d)"
,
r
.
ContentLength
,
maxHTTPRequestContentLength
)
return
http
.
StatusRequestEntityTooLarge
,
err
}
ct
:=
r
.
Header
.
Get
(
"content-type"
)
mt
,
_
,
err
:=
mime
.
ParseMediaType
(
ct
)
mt
,
_
,
err
:=
mime
.
ParseMediaType
(
r
.
Header
.
Get
(
"content-type"
))
if
err
!=
nil
||
mt
!=
contentType
{
err
orMessage
:=
fmt
.
Sprint
f
(
"invalid content type, only %s is supported"
,
contentType
)
return
http
.
StatusUnsupportedMediaType
,
err
orMessage
err
:=
fmt
.
Error
f
(
"invalid content type, only %s is supported"
,
contentType
)
return
http
.
StatusUnsupportedMediaType
,
err
}
return
0
,
""
return
0
,
nil
}
func
newCorsHandler
(
srv
*
Server
,
allowedOrigins
[]
string
)
http
.
Handler
{
...
...
rpc/http_test.go
浏览文件 @
3c6b9c5d
// Copyright 2017 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package
rpc
import
(
...
...
@@ -8,33 +24,31 @@ import (
)
func
TestHTTPErrorResponseWithDelete
(
t
*
testing
.
T
)
{
httpErrorResponseTest
(
t
,
"DELETE"
,
contentType
,
""
,
http
.
StatusMethodNotAllowed
)
testHTTPErrorResponse
(
t
,
"DELETE"
,
contentType
,
""
,
http
.
StatusMethodNotAllowed
)
}
func
TestHTTPErrorResponseWithPut
(
t
*
testing
.
T
)
{
httpErrorResponseTest
(
t
,
"PUT"
,
contentType
,
""
,
http
.
StatusMethodNotAllowed
)
testHTTPErrorResponse
(
t
,
"PUT"
,
contentType
,
""
,
http
.
StatusMethodNotAllowed
)
}
func
TestHTTPErrorResponseWithMaxContentLength
(
t
*
testing
.
T
)
{
body
:=
make
([]
rune
,
maxHTTPRequestContentLength
+
1
,
maxHTTPRequestContentLength
+
1
)
httpErrorResponseTest
(
t
,
testHTTPErrorResponse
(
t
,
"POST"
,
contentType
,
string
(
body
),
http
.
StatusRequestEntityTooLarge
)
}
func
TestHTTPErrorResponseWithEmptyContentType
(
t
*
testing
.
T
)
{
httpErrorResponseTest
(
t
,
"POST"
,
""
,
""
,
http
.
StatusUnsupportedMediaType
)
testHTTPErrorResponse
(
t
,
"POST"
,
""
,
""
,
http
.
StatusUnsupportedMediaType
)
}
func
TestHTTPErrorResponseWithValidRequest
(
t
*
testing
.
T
)
{
httpErrorResponseTest
(
t
,
"POST"
,
contentType
,
""
,
0
)
testHTTPErrorResponse
(
t
,
"POST"
,
contentType
,
""
,
0
)
}
func
httpErrorResponseTest
(
t
*
testing
.
T
,
method
,
contentType
,
body
string
,
expectedResponse
int
)
{
func
testHTTPErrorResponse
(
t
*
testing
.
T
,
method
,
contentType
,
body
string
,
expected
int
)
{
request
:=
httptest
.
NewRequest
(
method
,
"http://url.com"
,
strings
.
NewReader
(
body
))
request
.
Header
.
Set
(
"content-type"
,
contentType
)
if
response
,
_
:=
httpErrorResponse
(
request
);
response
!=
expectedResponse
{
t
.
Fatalf
(
"response code should be %d not %d"
,
expected
Response
,
respons
e
)
if
code
,
_
:=
validateRequest
(
request
);
code
!=
expected
{
t
.
Fatalf
(
"response code should be %d not %d"
,
expected
,
cod
e
)
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录