feat: encrypt provider credentials

This commit is contained in:
wlx committed 2026-09-07 17:23:18 +08:00
1 parent 31a34757be
commit 7949f29f1a
6 files changed
+97 -7

No files matched your search

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.moyi.controlplane.auth.AuthService; import com.moyi.controlplane.auth.AuthService;
import com.moyi.controlplane.auth.AuthService.UserView; import com.moyi.controlplane.auth.AuthService.UserView;
import com.moyi.controlplane.common.ApiException; import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.security.SecretCipher;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.SecureRandom; import java.security.SecureRandom;
@@ -32,11 +33,13 @@ public class CatalogService {
private static final List<String> SOURCE_TYPES = List.of("official", "relay", "self-hosted", "custom"); private static final List<String> SOURCE_TYPES = List.of("official", "relay", "self-hosted", "custom");
private final JdbcTemplate jdbc; private final JdbcTemplate jdbc;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final SecretCipher secretCipher;
private final SecureRandom secureRandom = new SecureRandom(); private final SecureRandom secureRandom = new SecureRandom();
public CatalogService(JdbcTemplate jdbc, ObjectMapper objectMapper) { public CatalogService(JdbcTemplate jdbc, ObjectMapper objectMapper, SecretCipher secretCipher) {
this.jdbc = jdbc; this.jdbc = jdbc;
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.secretCipher = secretCipher;
} }
public List<Map<String, Object>> listProviders(boolean includeDisabled) { public List<Map<String, Object>> listProviders(boolean includeDisabled) {
@@ -67,7 +70,7 @@ public class CatalogService {
String masked = secret == null ? null : mask(secret); String masked = secret == null ? null : mask(secret);
jdbc.update( jdbc.update(
"INSERT INTO model_providers (id, code, name, protocol, source_type, base_url, description, credential_type, credential_ciphertext, credential_masked, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'active')", "INSERT INTO model_providers (id, code, name, protocol, source_type, base_url, description, credential_type, credential_ciphertext, credential_masked, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'active')",
id, code, name, protocol, sourceType, baseUrl, description, credentialType, null, masked id, code, name, protocol, sourceType, baseUrl, description, credentialType, secret == null ? null : secretCipher.encrypt(secret), masked
); );
auth.audit("provider.created", admin.id(), new AuthService.RequestMeta(null, null), Map.of("providerId", id)); auth.audit("provider.created", admin.id(), new AuthService.RequestMeta(null, null), Map.of("providerId", id));
return findProvider(id); return findProvider(id);
@@ -3,6 +3,7 @@ package com.moyi.controlplane.provider;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.moyi.controlplane.common.ApiException; import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.security.SecretCipher;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient; import java.net.http.HttpClient;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
@@ -11,20 +12,28 @@ import java.time.Duration;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class OpenAiCompatibleProvider { public class OpenAiCompatibleProvider {
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final HttpClient httpClient; private final HttpClient httpClient;
private final JdbcTemplate jdbc;
private final SecretCipher secretCipher;
private final Map<String, ProviderConfig> providers; private final Map<String, ProviderConfig> providers;
public OpenAiCompatibleProvider( public OpenAiCompatibleProvider(
ObjectMapper objectMapper, ObjectMapper objectMapper,
org.springframework.core.env.Environment environment org.springframework.core.env.Environment environment,
JdbcTemplate jdbc,
SecretCipher secretCipher
) { ) {
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(); this.httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
this.jdbc = jdbc;
this.secretCipher = secretCipher;
this.providers = Map.of( this.providers = Map.of(
"provider-deepseek", new ProviderConfig(environment.getProperty("moyi.providers.deepseek.api-key", ""), environment.getProperty("moyi.providers.deepseek.base-url", "https://api.deepseek.com")), "provider-deepseek", new ProviderConfig(environment.getProperty("moyi.providers.deepseek.api-key", ""), environment.getProperty("moyi.providers.deepseek.base-url", "https://api.deepseek.com")),
"provider-kimi", new ProviderConfig(environment.getProperty("moyi.providers.kimi.api-key", ""), environment.getProperty("moyi.providers.kimi.base-url", "https://api.moonshot.ai/v1")), "provider-kimi", new ProviderConfig(environment.getProperty("moyi.providers.kimi.api-key", ""), environment.getProperty("moyi.providers.kimi.base-url", "https://api.moonshot.ai/v1")),
@@ -33,12 +42,12 @@ public class OpenAiCompatibleProvider {
} }
public boolean isConfigured(String providerId) { public boolean isConfigured(String providerId) {
ProviderConfig provider = providers.get(providerId); ProviderConfig provider = resolve(providerId);
return provider != null && !provider.apiKey().isBlank(); return provider != null && !provider.apiKey().isBlank();
} }
public Map<String, Object> chat(String providerId, String upstreamModel, List<?> messages) { public Map<String, Object> chat(String providerId, String upstreamModel, List<?> messages) {
ProviderConfig provider = providers.get(providerId); ProviderConfig provider = resolve(providerId);
if (provider == null || provider.apiKey().isBlank()) { if (provider == null || provider.apiKey().isBlank()) {
throw new ApiException("PROVIDER_NOT_CONFIGURED", "该模型的供应商尚未配置服务端 API Key", 503); throw new ApiException("PROVIDER_NOT_CONFIGURED", "该模型的供应商尚未配置服务端 API Key", 503);
} }
@@ -74,6 +83,20 @@ public class OpenAiCompatibleProvider {
return value == null ? "" : value.replaceAll("/+$", ""); return value == null ? "" : value.replaceAll("/+$", "");
} }
private ProviderConfig resolve(String providerId) {
ProviderConfig fixed = providers.get(providerId);
if (fixed != null && !fixed.apiKey().isBlank()) return fixed;
try {
Map<String, Object> row = jdbc.queryForMap("SELECT base_url, credential_ciphertext FROM model_providers WHERE id = ? AND status = 'active'", providerId);
String ciphertext = row.get("credential_ciphertext") == null ? "" : String.valueOf(row.get("credential_ciphertext"));
String apiKey = ciphertext.isBlank() ? "" : secretCipher.decrypt(ciphertext);
String baseUrl = row.get("base_url") == null ? "" : String.valueOf(row.get("base_url"));
return new ProviderConfig(apiKey, baseUrl);
} catch (EmptyResultDataAccessException exception) {
return fixed;
}
}
private String writeJson(Object value) { private String writeJson(Object value) {
try { try {
return objectMapper.writeValueAsString(value); return objectMapper.writeValueAsString(value);
@@ -0,0 +1,62 @@
package com.moyi.controlplane.security;
import com.moyi.controlplane.common.ApiException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.spec.GCMParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
public class SecretCipher {
private static final int NONCE_LENGTH = 12;
private static final int TAG_LENGTH = 128;
private final SecureRandom secureRandom = new SecureRandom();
private final SecretKeySpec key;
public SecretCipher(@Value("${moyi.credentials.encryption-key}") String encryptionKey) {
if (encryptionKey == null || encryptionKey.isBlank()) {
this.key = null;
} else {
this.key = new SecretKeySpec(hash(encryptionKey), "AES");
}
}
public String encrypt(String plaintext) {
if (key == null) throw new ApiException("CREDENTIAL_ENCRYPTION_NOT_CONFIGURED", "请先配置供应商凭证加密密钥", 500);
try {
byte[] nonce = new byte[NONCE_LENGTH];
secureRandom.nextBytes(nonce);
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
cipher.init(Cipher.ENCRYPT_MODE, key, new GCMParameterSpec(TAG_LENGTH, nonce));
byte[] ciphertext = cipher.doFinal(plaintext.getBytes(StandardCharsets.UTF_8));
return "v1$" + encode(nonce) + "$" + encode(ciphertext);
} catch (Exception exception) {
throw new ApiException("CREDENTIAL_ENCRYPTION_FAILED", "供应商凭证加密失败", 500);
}
}
public String decrypt(String encoded) {
if (key == null) throw new ApiException("CREDENTIAL_ENCRYPTION_NOT_CONFIGURED", "请先配置供应商凭证加密密钥", 500);
try {
String[] parts = encoded.split("\\$", 3);
if (parts.length != 3 || !"v1".equals(parts[0])) throw new IllegalArgumentException("invalid ciphertext");
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
cipher.init(Cipher.DECRYPT_MODE, key, new GCMParameterSpec(TAG_LENGTH, Base64.getUrlDecoder().decode(parts[1])));
return new String(cipher.doFinal(Base64.getUrlDecoder().decode(parts[2])), StandardCharsets.UTF_8);
} catch (Exception exception) {
throw new ApiException("CREDENTIAL_DECRYPTION_FAILED", "供应商凭证解密失败", 500);
}
}
private String encode(byte[] value) { return Base64.getUrlEncoder().withoutPadding().encodeToString(value); }
private byte[] hash(String value) {
try { return MessageDigest.getInstance("SHA-256").digest(value.getBytes(StandardCharsets.UTF_8)); }
catch (Exception exception) { throw new IllegalStateException(exception); }
}
}
+2 -2
View File
@@ -41,7 +41,7 @@
- `V5__usage_events.sql`:用量事件基础表; - `V5__usage_events.sql`:用量事件基础表;
- `V6__seed_catalog.sql`:本地首批模型目录初始数据,可由管理员继续增删改造。 - `V6__seed_catalog.sql`:本地首批模型目录初始数据,可由管理员继续增删改造。
Java 版本沿用现有 TypeScript 服务的表命名,便于后续迁移 RDS;供应商密钥当前只返回掩码并预留密文列,真实调用接入前需要补齐 KMS/RAM 或 AES-GCM 密钥管理。 Java 版本沿用现有 TypeScript 服务的表命名,便于后续迁移 RDS;供应商密钥只返回掩码,数据库保存 AES-GCM 密文,主密钥由 `CREDENTIAL_ENCRYPTION_KEY` 注入。生产环境应进一步使用 KMS/RAM 托管该主密钥。
## 本地启动 ## 本地启动
@@ -60,7 +60,7 @@ Invoke-WebRequest http://localhost:8080/health
本节点完成的是“控制面基础闭环 + 同步供应商转发”,不是生产网关完成版: 本节点完成的是“控制面基础闭环 + 同步供应商转发”,不是生产网关完成版:
- 数据已写入 PostgreSQL,Redis 连接配置已预留,但限流、队列和分布式幂等尚未接入; - 数据已写入 PostgreSQL,Redis 连接配置已预留,但限流、队列和分布式幂等尚未接入;
- `/v1/chat/completions` 已支持 DeepSeek、Kimi、GLM 的 OpenAI 兼容转发;未配置 Key 时返回 Mock,流式响应暂未开放; - `/v1/chat/completions` 已支持 DeepSeek、Kimi、GLM 的 OpenAI 兼容转发;管理员在目录中新增带凭证的兼容供应商后,也可按模型绑定动态渠道;未配置 Key 时返回 Mock,流式响应暂未开放;
- Seedance、Tripo/VAST 的异步任务和 OSS 结果存储尚未迁移到 Java; - Seedance、Tripo/VAST 的异步任务和 OSS 结果存储尚未迁移到 Java;
- 价格、额度扣减、计费账单和并发排队仍沿用下一节点计划; - 价格、额度扣减、计费账单和并发排队仍沿用下一节点计划;
- Docker 镜像需要在具备 Maven 和 Docker daemon 的环境中构建验证。 - Docker 镜像需要在具备 Maven 和 Docker daemon 的环境中构建验证。
+1
View File
@@ -12,6 +12,7 @@ MOYI_REDIS_URL=rediss://:replace-with-redis-password@redis-private-endpoint:6379
SESSION_TTL_HOURS=168 SESSION_TTL_HOURS=168
AUTH_PASSWORD_PEPPER=replace-with-a-long-random-secret-at-least-32-chars AUTH_PASSWORD_PEPPER=replace-with-a-long-random-secret-at-least-32-chars
CREDENTIAL_ENCRYPTION_KEY=replace-with-a-long-random-secret-for-provider-credentials
ADMIN_ACCOUNT=adimin ADMIN_ACCOUNT=adimin
ADMIN_PASSWORD=replace-with-a-strong-initial-password ADMIN_PASSWORD=replace-with-a-strong-initial-password
ADMIN_DISPLAY_NAME=平台管理员 ADMIN_DISPLAY_NAME=平台管理员
+1
View File
@@ -9,6 +9,7 @@ REDIS_PASSWORD=replace-with-a-long-random-password
SESSION_TTL_HOURS=168 SESSION_TTL_HOURS=168
AUTH_PASSWORD_PEPPER=replace-with-a-long-random-secret-at-least-32-chars AUTH_PASSWORD_PEPPER=replace-with-a-long-random-secret-at-least-32-chars
CREDENTIAL_ENCRYPTION_KEY=replace-with-a-long-random-secret-for-provider-credentials
ADMIN_ACCOUNT=adimin ADMIN_ACCOUNT=adimin
ADMIN_PASSWORD=replace-with-a-strong-initial-password ADMIN_PASSWORD=replace-with-a-strong-initial-password
ADMIN_DISPLAY_NAME=平台管理员 ADMIN_DISPLAY_NAME=平台管理员