feat(config): 新增出向内部令牌 SSW_TDS_INTERNAL_TOKEN(默认 ssw-internal-token-e2e)
- 与入向 SSW_INTERNAL_TOKEN 同值但不同源(方向相反,不混用) - 纯空白回落默认值;首尾空白 trim - 顺带收敛 config.rs 的 rustfmt 漂移(本轮触碰的文件保持 fmt 干净) Co-Authored-By: Claude Code <[email protected]>
This commit is contained in:
1 parent
a38c8418dd
commit
cda8729a3e
1 file changed
+69
-2
+69
-2
@@ -6,6 +6,12 @@
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
pub const DEFAULT_INTERNAL_TOKEN: &str = "ssw-internal-token-e2e";
|
||||
/// **出向**(TDC → TDS)内部令牌默认值。
|
||||
///
|
||||
/// 照抄上游 `@Value("${ssw.internal-token:ssw-internal-token-e2e}")`。
|
||||
/// 🔴 与 [`DEFAULT_INTERNAL_TOKEN`](**入向**闸门)同值但**不同源**:
|
||||
/// 方向相反,混用会把两套密钥耦在一起 ⇒ 出向单独用 `SSW_TDS_INTERNAL_TOKEN`。
|
||||
pub const DEFAULT_TDS_INTERNAL_TOKEN: &str = "ssw-internal-token-e2e";
|
||||
pub const DEFAULT_PORT: u16 = 30000;
|
||||
pub const DEFAULT_IDENTITY_CODE: &str = "LOCAL-CONNECTOR";
|
||||
pub const DEFAULT_IDENTITY_NAME: &str = "本地连接器";
|
||||
@@ -85,7 +91,19 @@ fn standalone_mode_from(primary: Option<String>, alias: Option<String>) -> Stand
|
||||
///
|
||||
/// 纯函数(不读进程全局 env),便于单测。
|
||||
fn internal_token_from(raw: Option<String>) -> String {
|
||||
env_or_default(raw, DEFAULT_INTERNAL_TOKEN).trim().to_string()
|
||||
env_or_default(raw, DEFAULT_INTERNAL_TOKEN)
|
||||
.trim()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// 归一化**出向**内部令牌:未设置或纯空白 ⇒ 回落默认值;否则去掉首尾空白。
|
||||
///
|
||||
/// 与 [`internal_token_from`] 同口径,但**作用于出向通道**(`SSW_TDS_INTERNAL_TOKEN`)。
|
||||
/// 纯函数(不读进程全局 env),便于单测。
|
||||
fn tds_internal_token_from(raw: Option<String>) -> String {
|
||||
env_or_default(raw, DEFAULT_TDS_INTERNAL_TOKEN)
|
||||
.trim()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
@@ -94,6 +112,10 @@ pub struct Config {
|
||||
pub project_dir: PathBuf,
|
||||
pub data_dir: PathBuf,
|
||||
pub internal_token: String,
|
||||
/// **出向**(TDC → TDS)内部令牌(`SSW_TDS_INTERNAL_TOKEN`)。
|
||||
///
|
||||
/// 🔴 **不复用** `internal_token`(那是**入向**闸门的令牌,方向相反)。
|
||||
pub tds_internal_token: String,
|
||||
pub tds_base_url: Option<String>,
|
||||
pub standalone: StandaloneMode,
|
||||
pub strict_secrets: bool,
|
||||
@@ -120,6 +142,10 @@ impl Config {
|
||||
data_dir_from(std::env::var("TDC_DATA_DIR").ok(), &project_dir, &cwd)
|
||||
};
|
||||
let internal_token = internal_token_from(std::env::var("SSW_INTERNAL_TOKEN").ok());
|
||||
// 🔴 出向令牌独立配置:入向 `SSW_INTERNAL_TOKEN` 与出向 `SSW_TDS_INTERNAL_TOKEN`
|
||||
// 方向相反,混用会把两套密钥耦在一起。
|
||||
let tds_internal_token =
|
||||
tds_internal_token_from(std::env::var("SSW_TDS_INTERNAL_TOKEN").ok());
|
||||
let tds_base_url = {
|
||||
let raw = env_or_default(std::env::var("SSW_TDS_BASE_URL").ok(), "");
|
||||
let v = raw.trim().to_string();
|
||||
@@ -185,6 +211,7 @@ impl Config {
|
||||
project_dir,
|
||||
data_dir,
|
||||
internal_token,
|
||||
tds_internal_token,
|
||||
tds_base_url,
|
||||
standalone,
|
||||
strict_secrets,
|
||||
@@ -238,6 +265,7 @@ mod tests {
|
||||
project_dir: PathBuf::from("/tmp/proj"),
|
||||
data_dir: PathBuf::from("/tmp/proj/data"),
|
||||
internal_token: DEFAULT_INTERNAL_TOKEN.to_string(),
|
||||
tds_internal_token: DEFAULT_TDS_INTERNAL_TOKEN.to_string(),
|
||||
tds_base_url: None,
|
||||
standalone: StandaloneMode::Auto,
|
||||
strict_secrets: false,
|
||||
@@ -358,7 +386,10 @@ mod tests {
|
||||
// 未设置 ⇒ 默认值
|
||||
assert_eq!(internal_token_from(None), DEFAULT_INTERNAL_TOKEN);
|
||||
// 空串 / 纯空白 ⇒ 默认值(不是空令牌)
|
||||
assert_eq!(internal_token_from(Some(String::new())), DEFAULT_INTERNAL_TOKEN);
|
||||
assert_eq!(
|
||||
internal_token_from(Some(String::new())),
|
||||
DEFAULT_INTERNAL_TOKEN
|
||||
);
|
||||
assert_eq!(
|
||||
internal_token_from(Some(" ".to_string())),
|
||||
DEFAULT_INTERNAL_TOKEN,
|
||||
@@ -389,4 +420,40 @@ mod tests {
|
||||
assert_eq!(c.internal_token, "a-real-strong-token");
|
||||
assert!(c.check_secret_guard().is_ok());
|
||||
}
|
||||
|
||||
/// 🔴 **出向**令牌(`SSW_TDS_INTERNAL_TOKEN`)的归一化口径:
|
||||
/// 未设置 / 纯空白 ⇒ 回落默认值;否则去掉首尾空白。
|
||||
#[test]
|
||||
fn tds_internal_token_is_trimmed_and_blank_falls_back_to_default() {
|
||||
assert_eq!(
|
||||
tds_internal_token_from(Some(" tds-secret ".to_string())),
|
||||
"tds-secret"
|
||||
);
|
||||
assert_eq!(tds_internal_token_from(None), DEFAULT_TDS_INTERNAL_TOKEN);
|
||||
assert_eq!(
|
||||
tds_internal_token_from(Some(String::new())),
|
||||
DEFAULT_TDS_INTERNAL_TOKEN
|
||||
);
|
||||
assert_eq!(
|
||||
tds_internal_token_from(Some(" ".to_string())),
|
||||
DEFAULT_TDS_INTERNAL_TOKEN,
|
||||
"纯空白必须回落默认值,不能变成空令牌"
|
||||
);
|
||||
}
|
||||
|
||||
/// 🔴 出向令牌**独立于**入向令牌(方向相反,混用会把两套密钥耦在一起)。
|
||||
#[test]
|
||||
fn tds_internal_token_defaults_to_the_upstream_shared_default() {
|
||||
// 上游 `@Value("${ssw.internal-token:ssw-internal-token-e2e}")` ⇒ 逐字对齐
|
||||
assert_eq!(DEFAULT_TDS_INTERNAL_TOKEN, "ssw-internal-token-e2e");
|
||||
// 入向令牌与出向令牌是**两个字段**,默认值相同但互不影响
|
||||
let mut c = base();
|
||||
assert_eq!(c.internal_token, DEFAULT_INTERNAL_TOKEN);
|
||||
assert_eq!(c.tds_internal_token, DEFAULT_TDS_INTERNAL_TOKEN);
|
||||
c.tds_internal_token = "tds-only-secret".to_string();
|
||||
assert_eq!(
|
||||
c.internal_token, DEFAULT_INTERNAL_TOKEN,
|
||||
"改出向令牌不得牵动入向令牌"
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user