fix(auth): 消除 API Key 校验连接池死锁
先完整收集同前缀候选项并关闭查询结果,再执行 bcrypt 比对和 last_used_at 更新,避免小连接池下查询与更新相互等待。 新增 Rows 关闭顺序、前缀碰撞、MaxConns=1 和 8 并发真实 PostgreSQL 回归测试。
This commit is contained in:
@@ -1519,11 +1519,35 @@ WHERE subject_type = 'api_key' AND subject_id = $1::uuid`, apiKeyID); err != nil
|
||||
}
|
||||
|
||||
func (s *Store) VerifyLocalAPIKey(ctx context.Context, secret string) (*auth.User, error) {
|
||||
return verifyLocalAPIKey(ctx, s.pool, secret)
|
||||
}
|
||||
|
||||
type localAPIKeyDatabase interface {
|
||||
Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error)
|
||||
Exec(ctx context.Context, sql string, arguments ...any) (pgconn.CommandTag, error)
|
||||
}
|
||||
|
||||
type localAPIKeyCandidate struct {
|
||||
apiKeyID string
|
||||
hash string
|
||||
keyPrefix string
|
||||
keyName string
|
||||
scopesBytes []byte
|
||||
userGroupID string
|
||||
gatewayUserID string
|
||||
username string
|
||||
rolesBytes []byte
|
||||
gatewayTenantID string
|
||||
tenantID string
|
||||
tenantKey string
|
||||
}
|
||||
|
||||
func verifyLocalAPIKey(ctx context.Context, database localAPIKeyDatabase, secret string) (*auth.User, error) {
|
||||
prefix := apiKeyPrefix(secret)
|
||||
if prefix == "" {
|
||||
return nil, auth.ErrUnauthorized
|
||||
}
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
rows, err := database.Query(ctx, `
|
||||
SELECT k.id::text, k.key_hash, k.key_prefix, k.name, k.scopes, COALESCE(k.user_group_id::text, u.default_user_group_id::text, ''),
|
||||
u.id::text, u.username, u.roles, COALESCE(u.gateway_tenant_id::text, ''),
|
||||
COALESCE(u.tenant_id, ''), COALESCE(u.tenant_key, '')
|
||||
@@ -1538,49 +1562,51 @@ WHERE k.key_prefix = $1
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
candidates, err := pgx.CollectRows(rows, func(row pgx.CollectableRow) (localAPIKeyCandidate, error) {
|
||||
var candidate localAPIKeyCandidate
|
||||
err := row.Scan(
|
||||
&candidate.apiKeyID,
|
||||
&candidate.hash,
|
||||
&candidate.keyPrefix,
|
||||
&candidate.keyName,
|
||||
&candidate.scopesBytes,
|
||||
&candidate.userGroupID,
|
||||
&candidate.gatewayUserID,
|
||||
&candidate.username,
|
||||
&candidate.rolesBytes,
|
||||
&candidate.gatewayTenantID,
|
||||
&candidate.tenantID,
|
||||
&candidate.tenantKey,
|
||||
)
|
||||
return candidate, err
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
var apiKeyID string
|
||||
var hash string
|
||||
var keyPrefix string
|
||||
var keyName string
|
||||
var scopesBytes []byte
|
||||
var userGroupID string
|
||||
var gatewayUserID string
|
||||
var username string
|
||||
var rolesBytes []byte
|
||||
var gatewayTenantID string
|
||||
var tenantID string
|
||||
var tenantKey string
|
||||
if err := rows.Scan(&apiKeyID, &hash, &keyPrefix, &keyName, &scopesBytes, &userGroupID, &gatewayUserID, &username, &rolesBytes, &gatewayTenantID, &tenantID, &tenantKey); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if bcrypt.CompareHashAndPassword([]byte(hash), []byte(secret)) != nil {
|
||||
for _, candidate := range candidates {
|
||||
if bcrypt.CompareHashAndPassword([]byte(candidate.hash), []byte(secret)) != nil {
|
||||
continue
|
||||
}
|
||||
if _, err := s.pool.Exec(ctx, `UPDATE gateway_api_keys SET last_used_at = now(), updated_at = now() WHERE id = $1::uuid`, apiKeyID); err != nil {
|
||||
if _, err := database.Exec(ctx, `UPDATE gateway_api_keys SET last_used_at = now(), updated_at = now() WHERE id = $1::uuid`, candidate.apiKeyID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &auth.User{
|
||||
ID: gatewayUserID,
|
||||
Username: username,
|
||||
Roles: decodeStringArray(rolesBytes),
|
||||
TenantID: tenantID,
|
||||
GatewayTenantID: gatewayTenantID,
|
||||
TenantKey: tenantKey,
|
||||
ID: candidate.gatewayUserID,
|
||||
Username: candidate.username,
|
||||
Roles: decodeStringArray(candidate.rolesBytes),
|
||||
TenantID: candidate.tenantID,
|
||||
GatewayTenantID: candidate.gatewayTenantID,
|
||||
TenantKey: candidate.tenantKey,
|
||||
Source: "gateway",
|
||||
GatewayUserID: gatewayUserID,
|
||||
UserGroupID: userGroupID,
|
||||
APIKeyID: apiKeyID,
|
||||
APIKeyName: keyName,
|
||||
APIKeyPrefix: keyPrefix,
|
||||
APIKeyScopes: decodeStringArray(scopesBytes),
|
||||
GatewayUserID: candidate.gatewayUserID,
|
||||
UserGroupID: candidate.userGroupID,
|
||||
APIKeyID: candidate.apiKeyID,
|
||||
APIKeyName: candidate.keyName,
|
||||
APIKeyPrefix: candidate.keyPrefix,
|
||||
APIKeyScopes: decodeStringArray(candidate.scopesBytes),
|
||||
}, nil
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return nil, auth.ErrUnauthorized
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user