Merge pull request #110 from codex-team/master

Update prod
codex-team · Dec 19, 2024 · c3ed446 · c3ed446
2 parents f44d759 + d35a280
commit c3ed446
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 28 deletions.
diff --git a/pkg/server/errorshandler/handler_sentry.go b/pkg/server/errorshandler/handler_sentry.go
@@ -10,7 +10,7 @@ import (
 )
 
 const SentryQueueName = "external/sentry"
-const CatcherType = "sentry"
+const CatcherType = "external/sentry"
 
 // HandleHTTP processes HTTP requests with JSON body
 func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
@@ -20,32 +20,46 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
 		return
 	}
 
-	// check that X-Sentry-Auth header is available
-	auth := ctx.Request.Header.Peek("X-Sentry-Auth")
-	if auth == nil {
-		log.Warnf("Incoming request without X-Sentry-Auth header")
-		sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: "X-Sentry-Auth header is missing"})
-		return
-	}
-
-	hawkToken, err := getSentryKeyFromAuth(string(auth))
-	if err != nil {
-		log.Warnf("Incoming request with invalid X-Sentry-Auth header: %s", err)
-		sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: err.Error()})
-		return
+	var hawkToken string
+	var err error
+
+	// parse incoming get request params
+	sentryKey := ctx.QueryArgs().Peek("sentry_key")
+	if sentryKey == nil {
+		log.Warnf("Incoming request with deprecated sentry_key parameter")
+
+		// check that X-Sentry-Auth header is available
+		auth := ctx.Request.Header.Peek("X-Sentry-Auth")
+		if auth == nil {
+			log.Warnf("Incoming request without X-Sentry-Auth header")
+			sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: "X-Sentry-Auth header is missing"})
+			return
+		}
+
+		hawkToken, err = getSentryKeyFromAuth(string(auth))
+		if err != nil {
+			log.Warnf("Incoming request with invalid X-Sentry-Auth header=%s: %s", auth, err)
+			sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: err.Error()})
+			return
+		}
+	} else {
+		hawkToken = string(sentryKey)
 	}
 
 	log.Debugf("Incoming request with hawk integration token: %s", hawkToken)
 
-	body := ctx.PostBody()
-
-	sentryEnvelopeBody, err := decompressGzipString(body)
-	if err != nil {
-		log.Warnf("Failed to decompress gzip body: %s", err)
-		sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: "Failed to decompress gzip body"})
-		return
+	sentryEnvelopeBody := ctx.PostBody()
+
+	// todo: add check of gzip header
+	if sentryKey == nil {
+		sentryEnvelopeBody, err = decompressGzipString(sentryEnvelopeBody)
+		if err != nil {
+			log.Warnf("Failed to decompress gzip body: %s", err)
+			sendAnswerHTTP(ctx, ResponseMessage{Code: 400, Error: true, Message: "Failed to decompress gzip body"})
+			return
+		}
+		log.Debugf("Decompressed body: %s", sentryEnvelopeBody)
 	}
-	log.Debugf("Decompressed body: %s", sentryEnvelopeBody)
 
 	projectId, ok := handler.AccountsMongoDBClient.ValidTokens[hawkToken]
 	if !ok {

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -137,12 +137,7 @@ func (s *Server) handler(ctx *fasthttp.RequestCtx) {
 	case "/release":
 		s.ReleaseHandler.HandleHTTP(ctx)
 	case "/api/0/envelope/":
-		auth := ctx.Request.Header.Peek("X-Sentry-Auth")
-		if auth != nil {
-			s.ErrorsHandler.HandleSentry(ctx)
-		} else {
-			ctx.Error("X-Sentry-Auth not found", fasthttp.StatusBadRequest)
-		}
+		s.ErrorsHandler.HandleSentry(ctx)
 	default:
 		ctx.Error("Not found", fasthttp.StatusNotFound)
 	}