Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update audience name (#1484)
boojack204c03e772fe
diff --git a/server/auth.go b/server/auth.goindex 7f2387749..f874b7e9c 100644--- a/server/auth.go+++ b/server/auth.go@@ -44,7 +44,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group, secret string) {return echo.NewHTTPError(http.StatusUnauthorized, "Incorrect login credentials, please try again")}- if err := GenerateTokensAndSetCookies(c, user, s.Profile.Mode, secret); err != nil {+ if err := GenerateTokensAndSetCookies(c, user, secret); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate tokens").SetInternal(err)}if err := s.createUserAuthSignInActivity(c, user); err != nil {@@ -128,7 +128,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group, secret string) {return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with username %s", userInfo.Identifier))}- if err := GenerateTokensAndSetCookies(c, user, s.Profile.Mode, secret); err != nil {+ if err := GenerateTokensAndSetCookies(c, user, secret); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate tokens").SetInternal(err)}if err := s.createUserAuthSignInActivity(c, user); err != nil {@@ -196,7 +196,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group, secret string) {if err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err)}- if err := GenerateTokensAndSetCookies(c, user, s.Profile.Mode, secret); err != nil {+ if err := GenerateTokensAndSetCookies(c, user, secret); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate tokens").SetInternal(err)}if err := s.createUserAuthSignUpActivity(c, user); err != nil {diff --git a/server/auth/auth.go b/server/auth/auth.goindex f481795f7..d4b89b884 100644--- a/server/auth/auth.go+++ b/server/auth/auth.go@@ -1,7 +1,6 @@package authimport (- "fmt""strconv""time"@@ -13,13 +12,13 @@ const (// Signing key section. For now, this is only used for signing, not for verifying since we only// have 1 version. But it will be used to maintain backward compatibility if we change the signing mechanism.keyID = "v1"- // AccessTokenAudienceFmt is the format of the acccess token audience.- AccessTokenAudienceFmt = "user.access.%s"- // RefreshTokenAudienceFmt is the format of the refresh token audience.- RefreshTokenAudienceFmt = "user.refresh.%s"- apiTokenDuration = 2 * time.Hour- accessTokenDuration = 24 * time.Hour- refreshTokenDuration = 7 * 24 * time.Hour+ // AccessTokenAudienceName is the audience name of the access token.+ AccessTokenAudienceName = "user.access-token"+ // RefreshTokenAudienceName is the audience name of the refresh token.+ RefreshTokenAudienceName = "user.refresh-token"+ apiTokenDuration = 2 * time.Hour+ accessTokenDuration = 24 * time.Hour+ refreshTokenDuration = 7 * 24 * time.Hour// RefreshThresholdDuration is the threshold duration for refreshing token.RefreshThresholdDuration = 1 * time.Hour@@ -43,21 +42,21 @@ type claimsMessage struct {}// GenerateAPIToken generates an API token.-func GenerateAPIToken(userName string, userID int, mode string, secret string) (string, error) {+func GenerateAPIToken(userName string, userID int, secret string) (string, error) {expirationTime := time.Now().Add(apiTokenDuration)- return generateToken(userName, userID, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userName, userID, AccessTokenAudienceName, expirationTime, []byte(secret))}// GenerateAccessToken generates an access token for web.-func GenerateAccessToken(userName string, userID int, mode string, secret string) (string, error) {+func GenerateAccessToken(userName string, userID int, secret string) (string, error) {expirationTime := time.Now().Add(accessTokenDuration)- return generateToken(userName, userID, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userName, userID, AccessTokenAudienceName, expirationTime, []byte(secret))}// GenerateRefreshToken generates a refresh token for web.-func GenerateRefreshToken(userName string, userID int, mode string, secret string) (string, error) {+func GenerateRefreshToken(userName string, userID int, secret string) (string, error) {expirationTime := time.Now().Add(refreshTokenDuration)- return generateToken(userName, userID, fmt.Sprintf(RefreshTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userName, userID, RefreshTokenAudienceName, expirationTime, []byte(secret))}func generateToken(username string, userID int, aud string, expirationTime time.Time, secret []byte) (string, error) {diff --git a/server/jwt.go b/server/jwt.goindex 5cb6e252f..abe99930b 100644--- a/server/jwt.go+++ b/server/jwt.go@@ -34,8 +34,8 @@ func getUserIDContextKey() string {}// GenerateTokensAndSetCookies generates jwt token and saves it to the http-only cookie.-func GenerateTokensAndSetCookies(c echo.Context, user *api.User, mode string, secret string) error {- accessToken, err := auth.GenerateAccessToken(user.Username, user.ID, mode, secret)+func GenerateTokensAndSetCookies(c echo.Context, user *api.User, secret string) error {+ accessToken, err := auth.GenerateAccessToken(user.Username, user.ID, secret)if err != nil {return errors.Wrap(err, "failed to generate access token")}@@ -44,7 +44,7 @@ func GenerateTokensAndSetCookies(c echo.Context, user *api.User, mode string, sesetTokenCookie(c, auth.AccessTokenCookieName, accessToken, cookieExp)// We generate here a new refresh token and saving it to the cookie.- refreshToken, err := auth.GenerateRefreshToken(user.Username, user.ID, mode, secret)+ refreshToken, err := auth.GenerateRefreshToken(user.Username, user.ID, secret)if err != nil {return errors.Wrap(err, "failed to generate refresh token")}@@ -108,7 +108,6 @@ func JWTMiddleware(server *Server, next echo.HandlerFunc, secret string) echo.Hareturn func(c echo.Context) error {path := c.Request().URL.Pathmethod := c.Request().Method- mode := server.Profile.Modeif server.defaultAuthSkipper(c) {return next(c)@@ -145,11 +144,11 @@ func JWTMiddleware(server *Server, next echo.HandlerFunc, secret string) echo.Hareturn nil, errors.Errorf("unexpected access token kid=%v", t.Header["kid"])})- if !audienceContains(claims.Audience, fmt.Sprintf(auth.AccessTokenAudienceFmt, mode)) {+ if !audienceContains(claims.Audience, auth.AccessTokenAudienceName) {return echo.NewHTTPError(http.StatusUnauthorized,fmt.Sprintf("Invalid access token, audience mismatch, got %q, expected %q. you may send request to the wrong environment",claims.Audience,- fmt.Sprintf(auth.AccessTokenAudienceFmt, mode),+ auth.AccessTokenAudienceName,))}@@ -218,17 +217,17 @@ func JWTMiddleware(server *Server, next echo.HandlerFunc, secret string) echo.Hareturn echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Server error to refresh expired token. User Id %d", userID)).SetInternal(err)}- if !audienceContains(refreshTokenClaims.Audience, fmt.Sprintf(auth.RefreshTokenAudienceFmt, mode)) {+ if !audienceContains(refreshTokenClaims.Audience, auth.RefreshTokenAudienceName) {return echo.NewHTTPError(http.StatusUnauthorized,fmt.Sprintf("Invalid refresh token, audience mismatch, got %q, expected %q. you may send request to the wrong environment",refreshTokenClaims.Audience,- fmt.Sprintf(auth.RefreshTokenAudienceFmt, mode),+ auth.RefreshTokenAudienceName,))}// If we have a valid refresh token, we will generate new access token and refresh tokenif refreshToken != nil && refreshToken.Valid {- if err := GenerateTokensAndSetCookies(c, user, mode, secret); err != nil {+ if err := GenerateTokensAndSetCookies(c, user, secret); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Server error to refresh expired token. User Id %d", userID)).SetInternal(err)}}