From bd3804dec379ae501d8ee42b081dc82c25d0d1d8 Mon Sep 17 00:00:00 2001 From: d4x1 <1507509064@qq.com> Date: Wed, 15 May 2024 12:03:56 +0800 Subject: [PATCH 1/2] fix(apikey): abort request if api key doesn't match --- backend/server/api/middlewares.go | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/server/api/middlewares.go b/backend/server/api/middlewares.go index 32ec5e85490..86c8c6a6fb7 100644 --- a/backend/server/api/middlewares.go +++ b/backend/server/api/middlewares.go @@ -121,6 +121,7 @@ func RestAuthentication(router *gin.Engine, basicRes context.BasicRes) gin.Handl authHeader := c.GetHeader("Authorization") ok := CheckAuthorizationHeader(c, logger, db, apiKeyHelper, authHeader, path) if !ok { + c.Abort() return } else { router.HandleContext(c) From 6279bce57bebc3daca7c87bdf3cc08ec7f913ef3 Mon Sep 17 00:00:00 2001 From: d4x1 <1507509064@qq.com> Date: Fri, 17 May 2024 11:05:45 +0800 Subject: [PATCH 2/2] feat(webhook): update deployment commit id --- backend/plugins/webhook/api/deployments.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/plugins/webhook/api/deployments.go b/backend/plugins/webhook/api/deployments.go index 47ff8e9b9d6..f49591bb336 100644 --- a/backend/plugins/webhook/api/deployments.go +++ b/backend/plugins/webhook/api/deployments.go @@ -69,9 +69,9 @@ type DeploymentCommit struct { CommitMsg string `mapstructure:"commit_msg"` } -func generateDeploymentCommitId(connectionId uint64, repoUrl string, commitSha string) string { +func GenerateDeploymentCommitId(connectionId uint64, pipelineId string, repoUrl string, commitSha string) string { urlHash16 := fmt.Sprintf("%x", md5.Sum([]byte(repoUrl)))[:16] - return fmt.Sprintf("%s:%d:%s:%s", "webhook", connectionId, urlHash16, commitSha) + return fmt.Sprintf("%s:%d:%s:%s:%s", "webhook", connectionId, pipelineId, urlHash16, commitSha) } func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection, request *WebhookDeployTaskRequest, tx dal.Transaction, logger log.Logger) errors.Error { @@ -122,7 +122,7 @@ func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection, // create a deployment_commit record deploymentCommit := &devops.CicdDeploymentCommit{ DomainEntity: domainlayer.DomainEntity{ - Id: generateDeploymentCommitId(connection.ID, request.RepoUrl, request.CommitSha), + Id: GenerateDeploymentCommitId(connection.ID, request.PipelineId, request.RepoUrl, request.CommitSha), }, CicdDeploymentId: request.PipelineId, CicdScopeId: scopeId, @@ -157,7 +157,7 @@ func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection, // create a deployment_commit record deploymentCommit := &devops.CicdDeploymentCommit{ DomainEntity: domainlayer.DomainEntity{ - Id: generateDeploymentCommitId(connection.ID, commit.RepoUrl, commit.CommitSha), + Id: GenerateDeploymentCommitId(connection.ID, request.PipelineId, commit.RepoUrl, commit.CommitSha), }, CicdDeploymentId: request.PipelineId, CicdScopeId: scopeId,