Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc31ad51 authored by Nicolas Melin's avatar Nicolas Melin
Browse files

Merge branch '5038-sanitizing-username-for-staging-tests' into 'main' 

Sanitizing username is not correct for staging server

See merge request e/infra/proxy-stt!9
parents 74dbc0a7 e6508ace

app/quic-router/quic-router.go

+17 −6
Original line number Diff line number Diff line
@@ -134,9 +134,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)
@@ -155,6 +153,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())
@@ -168,9 +181,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)