fix: remove http_method to config

models/webhook.go

@@ -55,6 +55,13 @@ func IsValidHookContentType(name string) bool {
 	return ok
 }
 
+func IsValidHookHttpMethod(name string) bool {
+	if name == "POST" || name == "GET" {
+		return true
+	}
+	return false
+}
+
 // HookEvents is a set of web hook events
 type HookEvents struct {
 	Create               bool `json:"create"`
@@ -83,7 +90,6 @@ type HookEvent struct {
 	SendEverything bool   `json:"send_everything"`
 	ChooseEvents   bool   `json:"choose_events"`
 	BranchFilter   string `json:"branch_filter"`
-	HTTPMethod	   string 	`json:"http_method"`
 
 	HookEvents `json:"events"`
 }
@@ -116,7 +122,7 @@ type Webhook struct {
 	HookTaskType    HookTaskType
 	Meta            string     `xorm:"TEXT"` // store hook-specific attributes
 	LastStatus      HookStatus // Last delivery status
-	BranchFilter 	string 	`xorm:"TEXT"`
+	BranchFilter    string     `xorm:"TEXT"`
 
 	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
 	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`

modules/convert/convert.go

@@ -255,6 +255,7 @@ func ToHook(repoLink string, w *models.Webhook) *api.Hook {
 	config := map[string]string{
 		"url":          w.URL,
 		"content_type": w.ContentType.Name(),
+		"http_method":  w.HTTPMethod,
 	}
 	if w.HookTaskType == models.SLACK {
 		s := webhook.GetSlackHook(w)
@@ -265,16 +266,15 @@ func ToHook(repoLink string, w *models.Webhook) *api.Hook {
 	}
 
 	return &api.Hook{
-		ID:      w.ID,
-		Type:    w.HookTaskType.Name(),
-		URL:     fmt.Sprintf("%s/settings/hooks/%d", repoLink, w.ID),
-		BranchFilter:w.HookEvent.BranchFilter,
-		Active:  w.IsActive,
-		Config:  config,
-		Events:  w.EventsArray(),
-		Updated: w.UpdatedUnix.AsTime(),
-		Created: w.CreatedUnix.AsTime(),
-		HTTPMethod: w.HookEvent.HTTPMethod,
+		ID:           w.ID,
+		Type:         w.HookTaskType.Name(),
+		URL:          fmt.Sprintf("%s/settings/hooks/%d", repoLink, w.ID),
+		BranchFilter: w.HookEvent.BranchFilter,
+		Active:       w.IsActive,
+		Config:       config,
+		Events:       w.EventsArray(),
+		Updated:      w.UpdatedUnix.AsTime(),
+		Created:      w.CreatedUnix.AsTime(),
 	}
 }
 

modules/structs/hook.go

@@ -19,14 +19,13 @@ var (
 
 // Hook a hook is a web hook when one repository changed
 type Hook struct {
-	ID     int64             `json:"id"`
-	Type   string            `json:"type"`
-	URL    string            `json:"-"`
-	Config map[string]string `json:"config"`
-	Events []string          `json:"events"`
-	Active bool              `json:"active"`
-	BranchFilter string 		 `json:"branch_filter"`
-	HTTPMethod string 			`json:"http_method"`
+	ID           int64             `json:"id"`
+	Type         string            `json:"type"`
+	URL          string            `json:"-"`
+	Config       map[string]string `json:"config"`
+	Events       []string          `json:"events"`
+	Active       bool              `json:"active"`
+	BranchFilter string            `json:"branch_filter"`
 	// swagger:strfmt date-time
 	Updated time.Time `json:"updated_at"`
 	// swagger:strfmt date-time

routers/api/v1/utils/hook.go

@@ -66,6 +66,11 @@ func CheckCreateHookOption(ctx *context.APIContext, form *api.CreateHookOption)
 		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid content type")
 		return false
 	}
+
+	if !models.IsValidHookHttpMethod(form.Config["http_method"]) {
+		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid http method")
+		return false
+	}
 	return true
 }
 
@@ -220,6 +225,14 @@ func editHook(ctx *context.APIContext, form *api.EditHookOption, w *models.Webho
 			w.ContentType = models.ToHookContentType(ct)
 		}
 
+		if hm, ok := form.Config["http_method"]; ok {
+			if !models.IsValidHookHttpMethod(hm) {
+				ctx.Error(http.StatusUnprocessableEntity, "", "Invalid http method")
+				return false
+			}
+			w.HTTPMethod = hm
+		}
+
 		if w.HookTaskType == models.SLACK {
 			if channel, ok := form.Config["channel"]; ok {
 				meta, err := json.Marshal(&webhook.SlackMeta{