Unverified Commit 84c3799e authored by Stephen Guo's avatar Stephen Guo Committed by GitHub

rpc: more accurate checking of handler method signatures (#27287)

This changes the RPC server to ignore methods using *context.Context as parameter
and *error as return value type. Methods with such types would crash the server when
called.
parent ae1d90e7
...@@ -214,19 +214,8 @@ func (c *callback) call(ctx context.Context, method string, args []reflect.Value ...@@ -214,19 +214,8 @@ func (c *callback) call(ctx context.Context, method string, args []reflect.Value
return results[0].Interface(), nil return results[0].Interface(), nil
} }
// Is t context.Context or *context.Context?
func isContextType(t reflect.Type) bool {
for t.Kind() == reflect.Ptr {
t = t.Elem()
}
return t == contextType
}
// Does t satisfy the error interface? // Does t satisfy the error interface?
func isErrorType(t reflect.Type) bool { func isErrorType(t reflect.Type) bool {
for t.Kind() == reflect.Ptr {
t = t.Elem()
}
return t.Implements(errorType) return t.Implements(errorType)
} }
...@@ -245,7 +234,7 @@ func isPubSub(methodType reflect.Type) bool { ...@@ -245,7 +234,7 @@ func isPubSub(methodType reflect.Type) bool {
if methodType.NumIn() < 2 || methodType.NumOut() != 2 { if methodType.NumIn() < 2 || methodType.NumOut() != 2 {
return false return false
} }
return isContextType(methodType.In(1)) && return methodType.In(1) == contextType &&
isSubscriptionType(methodType.Out(0)) && isSubscriptionType(methodType.Out(0)) &&
isErrorType(methodType.Out(1)) isErrorType(methodType.Out(1))
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment