From a0ada8bcdcca0a743ab916b634b712d5ccf10c1b Mon Sep 17 00:00:00 2001 From: wizardchen Date: Tue, 25 Nov 2025 23:58:14 +0800 Subject: [PATCH] refactor: Improve Elasticsearch query construction and JWT secret retrieval - Enhanced Elasticsearch query construction by safely building the query body using JSON marshaling, improving error handling for query parsing and marshaling. - Updated JWT secret retrieval to securely generate a random secret if the environment variable is not set, ensuring better security practices. --- .../retriever/elasticsearch/v7/repository.go | 28 +++++++++++++------ internal/application/service/user.go | 28 +++++++++++++++---- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/internal/application/repository/retriever/elasticsearch/v7/repository.go b/internal/application/repository/retriever/elasticsearch/v7/repository.go index 0e282ceb..1f311af2 100644 --- a/internal/application/repository/retriever/elasticsearch/v7/repository.go +++ b/internal/application/repository/retriever/elasticsearch/v7/repository.go @@ -885,18 +885,30 @@ func (e *elasticsearchRepository) querySourceBatch(ctx context.Context, ) ([]interface{}, error) { log := logger.GetLogger(ctx) - // Build query request - filter := e.getBaseConds(retrieveParams) - query := fmt.Sprintf(`{ - "query": %s, - "from": %d, - "size": %d - }`, filter, from, batchSize) + // Build query request safely + filterJSON := e.getBaseConds(retrieveParams) + var filter map[string]interface{} + if err := json.Unmarshal([]byte(filterJSON), &filter); err != nil { + log.Errorf("[ElasticsearchV7] Failed to parse base conditions: %v", err) + filter = map[string]interface{}{} + } + + queryBody := map[string]interface{}{ + "query": filter, + "from": from, + "size": batchSize, + } + + queryBytes, err := json.Marshal(queryBody) + if err != nil { + log.Errorf("[ElasticsearchV7] Failed to marshal query body: %v", err) + return nil, err + } // Execute query response, err := e.client.Search( e.client.Search.WithIndex(e.index), - e.client.Search.WithBody(strings.NewReader(query)), + e.client.Search.WithBody(strings.NewReader(string(queryBytes))), e.client.Search.WithContext(ctx), ) if err != nil { diff --git a/internal/application/service/user.go b/internal/application/service/user.go index 49ef3d61..5c2887fe 100644 --- a/internal/application/service/user.go +++ b/internal/application/service/user.go @@ -2,10 +2,13 @@ package service import ( "context" + "crypto/rand" + "encoding/base64" "errors" "fmt" "os" "strings" + "sync" "time" "github.com/golang-jwt/jwt/v5" @@ -17,14 +20,27 @@ import ( "github.com/Tencent/WeKnora/internal/types/interfaces" ) -// JWT secret key - in production this should be from environment variable +var ( + jwtSecretOnce sync.Once + jwtSecret string +) +// getJwtSecret retrieves the JWT secret from the environment, falling back to a securely generated random secret. func getJwtSecret() string { - jwtSecret := os.Getenv("JWT_SECRET") - if jwtSecret != "" { - return jwtSecret - } - return "your-secret-key" + jwtSecretOnce.Do(func() { + if envSecret := strings.TrimSpace(os.Getenv("JWT_SECRET")); envSecret != "" { + jwtSecret = envSecret + return + } + + randomBytes := make([]byte, 32) + if _, err := rand.Read(randomBytes); err != nil { + panic(fmt.Sprintf("failed to generate JWT secret: %v", err)) + } + jwtSecret = base64.StdEncoding.EncodeToString(randomBytes) + }) + + return jwtSecret } // userService implements the UserService interface