fix: remediated integration url generation & GET handling (#696)

turbot · Feb 21, 2024 · 86f1656 · 86f1656
1 parent d0a0d51
commit 86f1656
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/service/api/webhook.go b/internal/service/api/webhook.go
@@ -39,7 +39,7 @@ import (
 
 func (api *APIService) WebhookRegisterAPI(router *gin.RouterGroup) {
 	router.POST("/hook/:hook/:hash", api.passHookToProcessor)
-	router.GET("/hook/:hook/:hash", api.runTriggerHook)
+	router.GET("/hook/:hook/:hash", api.passHookToProcessor)
 }
 
 type JSONPayload struct {
@@ -101,6 +101,10 @@ func (api *APIService) passHookToProcessor(c *gin.Context) {
 	case len(nameParts) >= 2 && (nameParts[0] == "trigger" || nameParts[1] == "trigger"):
 		api.runTriggerHook(c)
 	case len(nameParts) >= 2 && nameParts[0] == "integration":
+		if c.Request.Method != http.MethodPost {
+			common.AbortWithError(c, perr.MethodNotAllowed())
+			return
+		}
 		api.runIntegrationHook(c)
 	default:
 		common.AbortWithError(c, perr.NotFoundWithMessage(fmt.Sprintf("Not Found %s", webhookUri.Hook)))

diff --git a/internal/service/manager/manager.go b/internal/service/manager/manager.go
@@ -529,7 +529,7 @@ func integrationUrlProcessor(integration modconfig.Integration) error {
 		integrationName := fmt.Sprintf("integration.%s", integration.GetHclResourceImpl().FullName)
 		hashString := util.CalculateHash(integrationName, salt)
 
-		integrationUrl := fmt.Sprintf("%s/hook/%s/%s", util.GetBaseUrl(), integrationName, hashString)
+		integrationUrl := fmt.Sprintf("%s/api/latest/hook/%s/%s", util.GetBaseUrl(), integrationName, hashString)
 		integration.SetUrl(integrationUrl)
 	}
 	return nil