Gen seahub and notif jwt token

haiwen · Sep 18, 2024 · 472d3fa · 472d3fa
1 parent 678e0dc
commit 472d3fa
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/fileserver/fileop.go b/fileserver/fileop.go
@@ -323,7 +323,7 @@ type UserInfo struct {
 }
 
 func checkFileAccess(repoID, token, cookie, filePath, op string) (string, *appError) {
-	tokenString, err := utils.GenJWTToken("", "", true)
+	tokenString, err := utils.GenSeahubJWTToken()
 	if err != nil {
 		err := fmt.Errorf("failed to sign jwt token: %v", err)
 		return "", &appError{err, "", http.StatusInternalServerError}
@@ -2089,7 +2089,7 @@ func notifRepoUpdate(repoID string, commitID string) error {
 	}
 
 	url := fmt.Sprintf("http://%s/events", option.NotificationURL)
-	token, err := utils.GenJWTToken(repoID, "", false)
+	token, err := utils.GenNotifJWTToken(repoID, "")
 	if err != nil {
 		log.Printf("failed to generate jwt token: %v", err)
 		return err
@@ -3623,7 +3623,7 @@ type ShareLinkInfo struct {
 }
 
 func queryShareLinkInfo(token, cookie, opType string) (*ShareLinkInfo, *appError) {
-	tokenString, err := utils.GenJWTToken("", "", true)
+	tokenString, err := utils.GenSeahubJWTToken()
 	if err != nil {
 		err := fmt.Errorf("failed to sign jwt token: %v", err)
 		return nil, &appError{err, "", http.StatusInternalServerError}
@@ -3656,7 +3656,7 @@ func queryShareLinkInfo(token, cookie, opType string) (*ShareLinkInfo, *appError
 }
 
 func accessLinkCB(rsp http.ResponseWriter, r *http.Request) *appError {
-	if option.PrivateKey == "" {
+	if option.JWTPrivateKey == "" {
 		err := fmt.Errorf("no seahub private key is configured")
 		return &appError{err, "", http.StatusNotFound}
 	}

diff --git a/fileserver/merge.go b/fileserver/merge.go
@@ -381,7 +381,7 @@ func getNickNameByModifier(emailToNickname map[string]string, modifier string) s
 	if ok {
 		return nickname
 	}
-	if option.PrivateKey != "" {
+	if option.JWTPrivateKey != "" {
 		nickname = postGetNickName(modifier)
 	}
 
@@ -395,7 +395,7 @@ func getNickNameByModifier(emailToNickname map[string]string, modifier string) s
 }
 
 func postGetNickName(modifier string) string {
-	tokenString, err := utils.GenJWTToken("", "", true)
+	tokenString, err := utils.GenSeahubJWTToken()
 	if err != nil {
 		return ""
 	}

diff --git a/fileserver/option/option.go b/fileserver/option/option.go
@@ -65,8 +65,8 @@ var (
 	DBOpTimeout time.Duration
 
 	// seahub
-	SeahubURL  string
-	PrivateKey string
+	SeahubURL     string
+	JWTPrivateKey string
 )
 
 func initDefaultOptions() {
@@ -263,8 +263,8 @@ func parseQuota(quotaStr string) int64 {
 }
 
 func LoadSeahubConfig() error {
-	PrivateKey = os.Getenv("JWT_PRIVATE_KEY")
-	if PrivateKey == "" {
+	JWTPrivateKey = os.Getenv("JWT_PRIVATE_KEY")
+	if JWTPrivateKey == "" {
 		return fmt.Errorf("failed to read JWT_PRIVATE_KEY")
 	}
 

diff --git a/fileserver/sync_api.go b/fileserver/sync_api.go
@@ -738,7 +738,7 @@ func getJWTTokenCB(rsp http.ResponseWriter, r *http.Request) *appError {
 		return appErr
 	}
 
-	tokenString, err := utils.GenJWTToken(repoID, user, false)
+	tokenString, err := utils.GenNotifJWTToken(repoID, user)
 	if err != nil {
 		return &appError{err, "", http.StatusInternalServerError}
 	}

diff --git a/fileserver/utils/utils.go b/fileserver/utils/utils.go
@@ -28,33 +28,52 @@ func IsObjectIDValid(objID string) bool {
 	return true
 }
 
+type SeahubClaims struct {
+	Exp        int64 `json:"exp"`
+	IsInternal bool  `json:"is_internal"`
+	jwt.RegisteredClaims
+}
+
+func (*SeahubClaims) Valid() error {
+	return nil
+}
+
+func GenSeahubJWTToken() (string, error) {
+	claims := new(SeahubClaims)
+	claims.Exp = time.Now().Add(time.Second * 300).Unix()
+	claims.IsInternal = true
+
+	token := jwt.NewWithClaims(jwt.GetSigningMethod("HS256"), claims)
+	tokenString, err := token.SignedString([]byte(option.JWTPrivateKey))
+	if err != nil {
+		err := fmt.Errorf("failed to gen seahub jwt token: %w", err)
+		return "", err
+	}
+
+	return tokenString, nil
+}
+
 type MyClaims struct {
-	Exp        int64  `json:"exp"`
-	RepoID     string `json:"repo_id,omitempty"`
-	UserName   string `json:"username,omitempty"`
-	IsInternal bool   `json:"is_internal,omitempty"`
+	Exp      int64  `json:"exp"`
+	RepoID   string `json:"repo_id"`
+	UserName string `json:"username"`
 	jwt.RegisteredClaims
 }
 
 func (*MyClaims) Valid() error {
 	return nil
 }
 
-func GenJWTToken(repoID, user string, isInternal bool) (string, error) {
+func GenNotifJWTToken(repoID, user string) (string, error) {
 	claims := new(MyClaims)
-	if isInternal {
-		claims.Exp = time.Now().Add(time.Second * 300).Unix()
-		claims.IsInternal = true
-	} else {
-		claims.Exp = time.Now().Add(time.Hour * 72).Unix()
-		claims.RepoID = repoID
-		claims.UserName = user
-	}
+	claims.Exp = time.Now().Add(time.Hour * 72).Unix()
+	claims.RepoID = repoID
+	claims.UserName = user
 
 	token := jwt.NewWithClaims(jwt.GetSigningMethod("HS256"), claims)
-	tokenString, err := token.SignedString([]byte(option.PrivateKey))
+	tokenString, err := token.SignedString([]byte(option.JWTPrivateKey))
 	if err != nil {
-		err := fmt.Errorf("failed to gen jwt token for repo %s", repoID)
+		err := fmt.Errorf("failed to gen jwt token for repo %s: %w", repoID, err)
 		return "", err
 	}