add 400 status code

Signed-off-by: lhy1024 <[email protected]>
tikv · Dec 25, 2024 · 79a7508 · 79a7508
1 parent 97ad20e
commit 79a7508
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go
@@ -1474,6 +1474,10 @@ func getRegionByID(c *gin.Context) {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
+	if regionID == 0 {
+		c.String(http.StatusBadRequest, errs.ErrRegionInvalidID.FastGenByArgs().Error())
+		return
+	}
 	regionInfo := svr.GetBasicCluster().GetRegion(regionID)
 	if regionInfo == nil {
 		c.String(http.StatusNotFound, errs.ErrRegionNotFound.FastGenByArgs(regionID).Error())

diff --git a/server/api/region.go b/server/api/region.go
@@ -65,6 +65,10 @@ func (h *regionHandler) GetRegionByID(w http.ResponseWriter, r *http.Request) {
 		h.rd.JSON(w, http.StatusBadRequest, err.Error())
 		return
 	}
+	if regionID == 0 {
+		h.rd.JSON(w, http.StatusBadRequest, errs.ErrRegionInvalidID.FastGenByArgs())
+		return
+	}
 
 	regionInfo := rc.GetRegion(regionID)
 	if regionInfo == nil {

diff --git a/server/api/region_test.go b/server/api/region_test.go
@@ -79,6 +79,8 @@ func (suite *regionTestSuite) TestRegion() {
 	re := suite.Require()
 	mustRegionHeartbeat(re, suite.svr, r)
 	url := fmt.Sprintf("%s/region/id/%d", suite.urlPrefix, 0)
+	re.NoError(tu.CheckGetJSON(testDialClient, url, nil, tu.Status(re, http.StatusBadRequest)))
+	url = fmt.Sprintf("%s/region/id/%d", suite.urlPrefix, 2333)
 	re.NoError(tu.CheckGetJSON(testDialClient, url, nil, tu.Status(re, http.StatusNotFound)))
 	url = fmt.Sprintf("%s/region/id/%d", suite.urlPrefix, r.GetID())
 	r1 := &response.RegionInfo{}

diff --git a/tests/integrations/mcs/scheduling/api_test.go b/tests/integrations/mcs/scheduling/api_test.go
@@ -711,6 +711,9 @@ func (suite *apiTestSuite) checkRegions(cluster *tests.TestCluster) {
 	err = testutil.ReadGetJSON(re, tests.TestDialClient, urlPrefix, &resp)
 	re.NoError(err)
 	re.Equal(3., resp["count"])
+	urlPrefix = fmt.Sprintf("%s/scheduling/api/v1/regions/0", scheServerAddr)
+	testutil.CheckGetJSON(tests.TestDialClient, urlPrefix, nil,
+		testutil.Status(re, http.StatusBadRequest))
 	urlPrefix = fmt.Sprintf("%s/scheduling/api/v1/regions/233", scheServerAddr)
 	testutil.CheckGetJSON(tests.TestDialClient, urlPrefix, nil,
 		testutil.Status(re, http.StatusNotFound), testutil.StringContain(re, "not found"))