Add check for nil service passed to route handler

m3db · Nov 10, 2017 · 5589250 · 5589250
1 parent 0880c87
commit 5589250
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/r2/service_routes.go b/r2/service_routes.go
@@ -251,8 +251,8 @@ func fetchRollupRuleHistory(s *service, r *http.Request) (data interface{}, err
 type routeFunc func(s *service, r *http.Request) (data interface{}, err error)
 
 func handleRoute(rf routeFunc, s *service, r *http.Request, namespace string) (interface{}, error) {
-	if r == nil {
-		return nil, errors.New("Nil request passed to handler")
+	if r == nil || s == nil {
+		return nil, errors.New("Must pass non nil service and request to route handler")
 	}
 	start := s.nowFn()
 	data, err := rf(s, r)

diff --git a/r2/service_routes_test.go b/r2/service_routes_test.go
@@ -46,8 +46,11 @@ func TestHandleRoute(t *testing.T) {
 
 func TestHandleRouteNilRequest(t *testing.T) {
 	s := newTestService()
-	_, err := handleRoute(fetchNamespaces, s, nil, "ns")
-	require.EqualError(t, err, "Nil request passed to handler")
+	r := newTestGetRequest()
+	_, err1 := handleRoute(fetchNamespaces, s, nil, "ns")
+	_, err2 := handleRoute(fetchNamespaces, nil, r, "ns")
+	require.EqualError(t, err1, "Must pass non nil service and request to route handler")
+	require.EqualError(t, err2, "Must pass non nil service and request to route handler")
 }
 func TestFetchNamespacesSuccess(t *testing.T) {
 	expected := newNamespacesJSON(&rules.NamespacesView{})