Merge branch 'main' into '4675-add-compliant-logs-for-streaming-analytics' (6190ed3d) · Commits · e / infra / proxy-stt

.gitlab-ci.yml

+7 −10

Original line number	Diff line number	Diff line
		@@ -28,23 +28,20 @@ docker-tag:
		docker-branch:
		extends: .docker
		script:
		- docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME} .
		- docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME}
		- docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} .
		- docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-}
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
		- if: '$CI_COMMIT_REF_NAME != "main"'
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"'


		deploy-staging:
		stage: deploy
		needs: ["docker-branch"]
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
		- if: '$CI_COMMIT_REF_NAME != "main"'
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"'
		variables:
		STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME
		trigger:
		project: 'e/online-services/infra/stt-proxy-compose-stack'
		branch: 'dev/prepare-for-staging'
		strategy: depend
		branch: 'main'
		when: manual
		variables:
		STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME
		No newline at end of file

+17 −6

Original line number	Diff line number	Diff line
		@@ -142,9 +142,7 @@ func (h *UploadHandler) AuthMiddlewareV2() gin.HandlerFunc {
		// Username
		username := c.DefaultQuery("username", "")
		log.Debug().Msgf("%s Requested username : %s", baseLog, username)
		if strings.HasSuffix(username, "@murena.io") {
		username = strings.TrimSuffix(username, "@murena.io")
		}
		username = extractUsernameFromMail(username)
		log.Debug().Msgf("%s Formated username for Murena API request : %s", baseLog, username)

		granted := h.MurenaUserCanDoSTT.InvokeV2(reqID, accessToken, username)
		@@ -163,6 +161,21 @@ func (h *UploadHandler) AuthMiddlewareV2() gin.HandlerFunc {
		}
		}

		func extractUsernameFromMail(mail string) string {
		suffixes := []string{
		"@murena.io",
		"@murenatest.io",
		}

		for _, s := range suffixes {
		if strings.HasSuffix(mail, s) {
		return strings.TrimSuffix(mail, s)
		}
		}

		return mail
		}

		func (h *UploadHandler) AuthMiddlewareV1() gin.HandlerFunc {
		return func(c *gin.Context) {
		reqID := fmt.Sprintf("req_%d", time.Now().UnixNano())
		@@ -176,9 +189,7 @@ func (h *UploadHandler) AuthMiddlewareV1() gin.HandlerFunc {
		// Username
		username := c.DefaultQuery("username", "")
		log.Debug().Msgf("%s Requested username : %s", baseLog, username)
		if strings.HasSuffix(username, "@murena.io") {
		username = strings.TrimSuffix(username, "@murena.io")
		}
		username = extractUsernameFromMail(username)
		log.Debug().Msgf("%s Formated username for Murena API request : %s", baseLog, username)

		granted := h.MurenaUserCanDoSTT.InvokeV1(reqID, username)