refactor(domain): 域名插件整体替换为上游版 + conf/e2e 指令对齐
- plugin-domain 7 文件取上游 ddd4172+(config/store 独立、update_domains 三泛型) - 路由对齐上游:purge 移至 /api/admin/purge;开关指令 sso_domain → ipass_proxy - 未命中语义对齐上游:access 未命中由插件直接 404(不落转发层兜底), e2e zone 外 Host 断言同步修正 - nginx.conf / nginx.test.conf:sso_state/data_dir/api → ipass_*(sso_iap 保留, sso 插件特有开关)
This commit is contained in:
1 parent
7764fa76b7
commit
d006cd0f2f
13 files changed
+421
-443
No files matched your search
@@ -114,8 +114,8 @@ for ln in src:
|
||||
if s.startswith("include ") and "/conf/tls/" in s:
|
||||
out.append(" # include conf/tls/*.conf; # 本机验证配置不需要 TLS")
|
||||
continue
|
||||
if s.startswith("sso_data_dir"):
|
||||
out.append(" sso_data_dir %s;" % os.environ["DATA_DIR"]); continue
|
||||
if s.startswith("ipass_data_dir"):
|
||||
out.append(" ipass_data_dir %s;" % os.environ["DATA_DIR"]); continue
|
||||
if s.startswith("error_log"):
|
||||
out.append("error_log %s info;" % os.environ["ERR_LOG"]); continue
|
||||
if s.startswith("pid "):
|
||||
|
||||
@@ -54,8 +54,8 @@ http {
|
||||
|
||||
# ========== 共享内存(管理会话 / SSO 会话 / 授权码 / 接入方注册表)==========
|
||||
# 一张表按前缀共用,容量实测约 124 B/条,10m 足够放约 8 万条。
|
||||
sso_state state 10m;
|
||||
sso_data_dir /usr/local/nginx/data;
|
||||
ipass_state state 10m;
|
||||
ipass_data_dir /usr/local/nginx/data;
|
||||
|
||||
# 可选 TLS:conf/tls/ 下放任意 *.conf(完整的 443 server 块)即启用对应域名的 HTTPS。
|
||||
# 目录为空时 include 空匹配,不影响启动。说明见 conf/tls/README.md
|
||||
@@ -96,7 +96,7 @@ http {
|
||||
# 除标准端点外还有 MaxKey 别名(/oauth/v20/*、/oauth2.0/*)以及带
|
||||
# context-path 的写法(/maxkey/oauth/v20/*,模块内做前缀归一化),
|
||||
# 逐条列举必然漏,漏掉的表现是接入方拿到 HTML 404。
|
||||
location / { sso_api on; }
|
||||
location / { ipass_api on; }
|
||||
}
|
||||
|
||||
# 明文 80 只做跳转,避免用户在浏览器里手敲地址后停在错误页
|
||||
@@ -186,7 +186,7 @@ http {
|
||||
location / {
|
||||
# 转发开关:access 阶段查 sub: 共享内存,命中写入 $proxy_backend_addr,
|
||||
# 未命中(不存在 / 待审核 / 已过期)直接 404
|
||||
sso_domain on;
|
||||
ipass_proxy on;
|
||||
|
||||
proxy_pass http://$proxy_backend_addr;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -45,8 +45,8 @@ http {
|
||||
include /usr/local/nginx/conf/tls/*.conf;
|
||||
|
||||
# 共享内存 + 数据目录(OAuth 接入方注册表从这里加载)
|
||||
sso_state state 10m;
|
||||
sso_data_dir /usr/local/nginx/data;
|
||||
ipass_state state 10m;
|
||||
ipass_data_dir /usr/local/nginx/data;
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# 18097 回显后端:把注入进来的 X-Auth-* 请求头回显成 JSON,供断言
|
||||
@@ -82,7 +82,7 @@ http {
|
||||
# 全部交给模块分发:MaxKey 别名在 /oauth/v20/*、/oauth2.0/*,还有
|
||||
# /maxkey/oauth/v20/* 这类带 context-path 的写法(模块内做前缀归一化),
|
||||
# 逐条列 location 必然漏,故整站交给 sso_api。
|
||||
location / { sso_api on; }
|
||||
location / { ipass_api on; }
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
@@ -180,7 +180,7 @@ http {
|
||||
|
||||
location / {
|
||||
# 转发开关(access 阶段解析 Host 并注入 $proxy_backend_addr)
|
||||
sso_domain on;
|
||||
ipass_proxy on;
|
||||
|
||||
proxy_pass http://$proxy_backend_addr;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
[package]
|
||||
name = "plugin-domain"
|
||||
version.workspace = true
|
||||
version = "2.0.0"
|
||||
edition.workspace = true
|
||||
publish.workspace = true
|
||||
description = "iPass 域名插件 —— 子域名→后端映射、申请审核、转发解析(依赖 ipass-core 提供账号与 Key)"
|
||||
publish = false
|
||||
description = "iPass 插件:动态域名(子域名映射、申请审批、转发决策)"
|
||||
|
||||
[lib]
|
||||
name = "plugin_domain"
|
||||
# 只有 gateway 是 cdylib;插件一律 rlib(跨 .so 传 Rust 类型会双重 free)
|
||||
crate-type = ["rlib"]
|
||||
|
||||
[dependencies]
|
||||
ngx.workspace = true
|
||||
nginx-sys.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
ipass-core.workspace = true
|
||||
@@ -1,60 +1,33 @@
|
||||
//! 域名管理 API 统一分发器。
|
||||
//! 域名类端点:管理员审核/创建/删除/清理 + 账号态申请/查询/删除。
|
||||
//!
|
||||
//! 三类调用方、三套鉴权(与 `plugin-sso::api` 同构):
|
||||
//!
|
||||
//! ```text
|
||||
//! /api/admin/domains/* 管理员态:登录会话 Cookie(role=admin)
|
||||
//! /api/v1/domains/* 账号态:请求头 X-API-Key
|
||||
//! ```
|
||||
//!
|
||||
//! 写操作完成后由 `domains` 模块自行同步共享内存(`sync_shm` / `reload_shm`),
|
||||
//! 做到「审核一通过、立刻能访问」——本项目**没有**回源读文件这条兜底路径,
|
||||
//! 所以写穿不是优化而是正确性要求。
|
||||
//! 路由表只认领**本插件**的路径;不认领的返回 `None` 交给下一个插件。
|
||||
//! `/api/admin/purge` 清理的是过期域名与陈旧驳回记录,属域名职责。
|
||||
|
||||
use ngx::core::Status;
|
||||
use ngx::ffi::ngx_http_request_t;
|
||||
use ngx::http::HTTPStatus;
|
||||
use serde_json::json;
|
||||
|
||||
use ipass_core::api::{Actor, Guard, run_guarded, user_or_401};
|
||||
use ipass_core::http;
|
||||
use ipass_core::session;
|
||||
use ipass_core::users;
|
||||
use ipass_core::util;
|
||||
|
||||
use crate::config;
|
||||
use crate::domains;
|
||||
use crate::keys::ENTERPRISE_ZONE;
|
||||
|
||||
// ===========================================================================
|
||||
// 路由
|
||||
// ===========================================================================
|
||||
|
||||
/// 鉴权后传给处理器的身份
|
||||
enum Actor {
|
||||
/// 管理员态(登录会话)
|
||||
Admin(String),
|
||||
/// 账号态(X-API-Key)
|
||||
User(String),
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
enum Guard {
|
||||
Admin,
|
||||
User,
|
||||
}
|
||||
|
||||
type Handler = fn(*mut ngx_http_request_t, Actor) -> Status;
|
||||
|
||||
/// 路由表(精确匹配)。
|
||||
fn route(method: &str, uri: &str) -> Option<(Guard, Handler)> {
|
||||
let entry: (Guard, Handler) = match (method, uri) {
|
||||
// ---- 管理台:域名审核 ----------------------------------------
|
||||
("GET", "/api/admin/domains") => (Guard::Admin, h_admin_domains),
|
||||
("POST", "/api/admin/domains/review") => (Guard::Admin, h_admin_domain_review),
|
||||
("POST", "/api/admin/domains/create") => (Guard::Admin, h_admin_domain_create),
|
||||
("POST", "/api/admin/domains/delete") => (Guard::Admin, h_admin_domain_delete),
|
||||
("POST", "/api/admin/domains/purge") => (Guard::Admin, h_admin_purge),
|
||||
|
||||
// ---- 账号态:域名 -------------------------------------------
|
||||
("POST", "/api/admin/purge") => (Guard::Admin, h_admin_purge),
|
||||
("GET", "/api/v1/domains") => (Guard::User, h_my_domains),
|
||||
("POST", "/api/v1/domains/apply") => (Guard::User, h_apply),
|
||||
("POST", "/api/v1/domains/delete") => (Guard::User, h_my_delete),
|
||||
@@ -63,55 +36,16 @@ fn route(method: &str, uri: &str) -> Option<(Guard, Handler)> {
|
||||
Some(entry)
|
||||
}
|
||||
|
||||
/// 该请求是否命中本插件的路由表。
|
||||
pub fn matches(method: &str, uri: &str) -> bool {
|
||||
route(method, uri).is_some()
|
||||
}
|
||||
|
||||
/// 一次请求的完整处理:路由 → 鉴权 → 执行
|
||||
pub fn dispatch(r: *mut ngx_http_request_t) -> Status {
|
||||
/// 本表分发:认领则返回响应状态,不认领返回 `None`。
|
||||
pub fn dispatch(r: *mut ngx_http_request_t) -> Option<Status> {
|
||||
let method = http::method_str(r);
|
||||
let uri = http::uri(r);
|
||||
|
||||
let Some((guard, handler)) = route(&method, &uri) else {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::NOT_FOUND,
|
||||
&format!("接口不存在:{method} {uri}"),
|
||||
);
|
||||
return None;
|
||||
};
|
||||
|
||||
let actor = match guard {
|
||||
Guard::Admin => {
|
||||
let cookie = http::header(r, "cookie");
|
||||
match session::authenticate(cookie.as_deref()).and_then(|name| users::get(&name)) {
|
||||
Some(u) if u.is_admin() => Actor::Admin(u.username),
|
||||
Some(_) => return http::fail(r, HTTPStatus::FORBIDDEN, "需要管理员权限"),
|
||||
None => {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"未登录或会话已过期,请重新登录",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Guard::User => {
|
||||
let key = http::header(r, "x-api-key").unwrap_or_default();
|
||||
match users::find_by_key(&key) {
|
||||
Some(u) => Actor::User(u.username),
|
||||
None => {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"API Key 无效或缺失,请在请求头携带 X-API-Key",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
handler(r, actor)
|
||||
Some(run_guarded(r, guard, handler))
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
@@ -125,12 +59,12 @@ fn h_admin_domains(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
"items": domains::view_all(&domains::all()),
|
||||
"pending": domains::count_pending(),
|
||||
// 子域名命名规则:前端据此渲染「i + 8位数字 + dm」输入框,
|
||||
// 避免前后端各写一份前缀/后缀/zone 而漂移(真源 = keys.rs)
|
||||
// 避免前后端各写一份前缀/后缀/zone 而漂移(真源 = 本插件 config.rs)
|
||||
"subdomain_rule": {
|
||||
"zone": ENTERPRISE_ZONE,
|
||||
"prefix": crate::keys::SUBDOMAIN_PREFIX,
|
||||
"suffix": crate::keys::SUBDOMAIN_SUFFIX,
|
||||
"digits": crate::keys::SUBDOMAIN_RAND_DIGITS,
|
||||
"zone": config::ENTERPRISE_ZONE,
|
||||
"prefix": config::SUBDOMAIN_PREFIX,
|
||||
"suffix": config::SUBDOMAIN_SUFFIX,
|
||||
"digits": config::SUBDOMAIN_RAND_DIGITS,
|
||||
},
|
||||
}),
|
||||
"ok",
|
||||
@@ -141,11 +75,7 @@ fn h_admin_domain_review(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let id = p.get("id").map(String::as_str).unwrap_or("");
|
||||
let action = p.get("action").map(String::as_str).unwrap_or("");
|
||||
let admin = match &actor {
|
||||
Actor::Admin(n) => n,
|
||||
_ => "",
|
||||
};
|
||||
match domains::review(id, action, admin) {
|
||||
match domains::review(id, action, actor.admin_name()) {
|
||||
Ok(entry) => {
|
||||
let msg = if action == "approve" { "已通过审核" } else { "已驳回" };
|
||||
http::ok(r, domains::view(&entry), msg)
|
||||
@@ -156,16 +86,15 @@ fn h_admin_domain_review(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
|
||||
fn h_admin_domain_create(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let admin = match &actor {
|
||||
Actor::Admin(n) => n,
|
||||
_ => "",
|
||||
};
|
||||
|
||||
// subdomain 缺省(或空串)= 由网关按规则自动生成 `i<8位随机数字>dm`,
|
||||
// 与面板上「i + 8位随机数 + dm」是同一套规则(见 domains::gen_subdomain)。
|
||||
match domains::create_by_admin(
|
||||
p.get("subdomain").map(String::as_str).unwrap_or(""),
|
||||
p.get("backend").map(String::as_str).unwrap_or(""),
|
||||
p.get("type"),
|
||||
p.get("owner"),
|
||||
admin,
|
||||
actor.admin_name(),
|
||||
) {
|
||||
Ok(entry) => http::ok(r, domains::view(&entry), "已创建并直接放行"),
|
||||
Err(e) => http::fail(r, HTTPStatus::BAD_REQUEST, &e),
|
||||
@@ -175,6 +104,7 @@ fn h_admin_domain_create(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
fn h_admin_domain_delete(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let id = p.get("id").map(String::as_str).unwrap_or("");
|
||||
|
||||
match domains::remove(id) {
|
||||
Ok(sub) => http::ok(r, json!({ "subdomain": sub }), "已删除"),
|
||||
Err(e) => http::fail(r, HTTPStatus::BAD_REQUEST, &e),
|
||||
@@ -193,41 +123,30 @@ fn h_admin_purge(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
// 账号态:域名
|
||||
// 账号态
|
||||
// ===========================================================================
|
||||
|
||||
fn h_my_domains(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let username = match &actor {
|
||||
Actor::User(n) => n,
|
||||
_ => {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"API Key 无效或缺失,请在请求头携带 X-API-Key",
|
||||
);
|
||||
}
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
http::ok(
|
||||
r,
|
||||
json!({ "items": domains::view_all(&domains::by_owner(username)) }),
|
||||
json!({ "items": domains::view_all(&domains::by_owner(&user.username)) }),
|
||||
"ok",
|
||||
)
|
||||
}
|
||||
|
||||
fn h_apply(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let username = match &actor {
|
||||
Actor::User(n) => n,
|
||||
_ => {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"API Key 无效或缺失,请在请求头携带 X-API-Key",
|
||||
);
|
||||
}
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
|
||||
let p = http::params(r);
|
||||
let entry = match domains::apply(
|
||||
username,
|
||||
&user.username,
|
||||
p.get("subdomain").map(String::as_str).unwrap_or(""),
|
||||
p.get("backend").map(String::as_str).unwrap_or(""),
|
||||
p.get("type"),
|
||||
@@ -239,7 +158,7 @@ fn h_apply(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let view = domains::view(&entry);
|
||||
util::log_notice(&format!(
|
||||
"[api] {} 申请 {} type={} status={}",
|
||||
username,
|
||||
user.username,
|
||||
entry.subdomain,
|
||||
entry.dtype,
|
||||
entry.effective_status(util::now())
|
||||
@@ -248,7 +167,7 @@ fn h_apply(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let msg = if entry.status == "approved" {
|
||||
format!(
|
||||
"已直接放行(临时授权权限生效),{} 小时后自动失效",
|
||||
crate::keys::TEMP_DOMAIN_TTL / 3600
|
||||
config::TEMP_DOMAIN_TTL / 3600
|
||||
)
|
||||
} else {
|
||||
"已提交申请,等待管理员审核".to_owned()
|
||||
@@ -257,19 +176,15 @@ fn h_apply(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
}
|
||||
|
||||
fn h_my_delete(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let username = match &actor {
|
||||
Actor::User(n) => n,
|
||||
_ => {
|
||||
return http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"API Key 无效或缺失,请在请求头携带 X-API-Key",
|
||||
);
|
||||
}
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
|
||||
let p = http::params(r);
|
||||
let id = p.get("id").map(String::as_str).unwrap_or("");
|
||||
match domains::remove_own(id, username) {
|
||||
|
||||
match domains::remove_own(id, &user.username) {
|
||||
Ok(sub) => http::ok(r, json!({ "subdomain": sub }), "已删除"),
|
||||
Err(e) => http::fail(r, HTTPStatus::BAD_REQUEST, &e),
|
||||
}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
//! 域名插件策略常量(自内核 config.rs 迁入;改策略只改这里)。
|
||||
|
||||
/// 临时域名审批通过后的有效期(秒)。到期仅停止转发,记录保留供查阅。
|
||||
pub const TEMP_DOMAIN_TTL: i64 = 6 * 3600;
|
||||
|
||||
/// 子域名总长上限:首字符 + 最多 61 个后续字符
|
||||
pub const SUBDOMAIN_MAX_LEN: usize = 62;
|
||||
|
||||
/// 系统保留名:不允许用户申请,避免抢占管理入口
|
||||
pub const RESERVED_SUBDOMAINS: [&str; 4] = ["proxy-api", "admin", "www", "api"];
|
||||
|
||||
/// 驳回记录保留时长,超期由 purge 清理(秒)
|
||||
pub const REJECTED_PURGE_TTL: i64 = 7 * 86400;
|
||||
|
||||
/// 键前缀:子域名 → 后端映射
|
||||
pub const KEY_SUB_PREFIX: &[u8] = b"sub:";
|
||||
|
||||
/// 企业域名(业务域名)的 zone:**子域名 + `.` + 此后缀 = 完整对外域名**。
|
||||
///
|
||||
/// ⚠️ 与 `conf/nginx.conf` 的「企业域名 server」严格耦合:
|
||||
/// `server_name ~^(?<subdomain>.+dm)\.mayishangshu\.cn$;`
|
||||
/// 改这里必须同步改那条正则(反之亦然)。
|
||||
pub const ENTERPRISE_ZONE: &str = "mayishangshu.cn";
|
||||
|
||||
/// 自动生成子域名的形状:`<前缀><N 位随机数字><后缀>` —— 例如 `i12345678dm`。
|
||||
///
|
||||
/// 后缀**必须是 `dm`**:企业域名 server 的正则要求捕获组以 `dm` 结尾
|
||||
/// (`^(.+dm)\.mayishangshu\.cn$`),否则域名建出来也转发不到。
|
||||
/// 这是「规则」的实质约束,不是命名偏好。
|
||||
pub const SUBDOMAIN_PREFIX: &str = "i";
|
||||
pub const SUBDOMAIN_SUFFIX: &str = "dm";
|
||||
/// 随机数字位数。10^8 的空间,撞车概率极低
|
||||
pub const SUBDOMAIN_RAND_DIGITS: usize = 8;
|
||||
/// 自动生成子域名时的最大重试次数(真撞上已占用的就换一个再试)
|
||||
pub const SUBDOMAIN_GEN_ATTEMPTS: usize = 5;
|
||||
@@ -1,6 +1,6 @@
|
||||
//! 域名(子域名映射)与申请审核。
|
||||
//!
|
||||
//! 对应旧版 `lua/domains.lua`。数据结构见 `models::DomainEntry`。
|
||||
//! 数据结构见 `models::DomainEntry`。
|
||||
//!
|
||||
//! ## 状态机
|
||||
//!
|
||||
@@ -12,26 +12,21 @@
|
||||
//!
|
||||
//! 到期不等于删除:临时域名过期后仅「不再转发」,记录保留供查阅。
|
||||
//!
|
||||
//! ## 与共享内存的关系
|
||||
//! ## 写穿
|
||||
//!
|
||||
//! 热路径**永不回源**(未命中即 404),所以每个写操作都必须**同时更新共享内存与
|
||||
//! 文件**——`sync_shm` 负责共享内存侧,文件侧由 `store::update_plugin` 原子写回。
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
//! 热路径**永不回源**(未命中即 404),所以每个写操作都必须
|
||||
//! **同时更新共享内存与文件**——这就是 `sync_shm` 的存在理由。
|
||||
//! 漏掉一处,就会出现「审核通过了但立刻 404」。
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use ipass_core::store;
|
||||
use ipass_core::users;
|
||||
use ipass_core::util;
|
||||
use ipass_core::{state, users, util};
|
||||
|
||||
use crate::keys::{
|
||||
clear_all, invalidate, put_backend, ENTERPRISE_ZONE, REJECTED_PURGE_TTL, RESERVED_SUBDOMAINS,
|
||||
SUBDOMAIN_GEN_ATTEMPTS, SUBDOMAIN_MAX_LEN, SUBDOMAIN_PREFIX, SUBDOMAIN_RAND_DIGITS,
|
||||
SUBDOMAIN_SUFFIX, TEMP_DOMAIN_TTL,
|
||||
use crate::config::{
|
||||
ENTERPRISE_ZONE, KEY_SUB_PREFIX, REJECTED_PURGE_TTL, RESERVED_SUBDOMAINS, SUBDOMAIN_GEN_ATTEMPTS,
|
||||
SUBDOMAIN_MAX_LEN, SUBDOMAIN_PREFIX, SUBDOMAIN_RAND_DIGITS, SUBDOMAIN_SUFFIX, TEMP_DOMAIN_TTL,
|
||||
};
|
||||
use crate::models::{DomainEntry, DomainTable};
|
||||
use crate::models::DomainEntry;
|
||||
|
||||
// ===========================================================================
|
||||
// 校验
|
||||
@@ -83,6 +78,10 @@ pub fn validate_backend(raw: &str) -> Result<String, String> {
|
||||
Ok(s.to_owned())
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
// 子域名命名规则(唯一真源,前端/API 共用)
|
||||
// ===========================================================================
|
||||
|
||||
/// 生成一个符合企业域名规则的子域名:`i` + 8 位随机数字 + `dm`(如 `i48291376dm`)。
|
||||
///
|
||||
/// **后缀 `dm` 不是装饰**:企业域名 server 的正则是
|
||||
@@ -96,6 +95,10 @@ pub fn gen_subdomain() -> String {
|
||||
}
|
||||
|
||||
/// 子域名 → 完整对外域名(**不含端口**)。
|
||||
///
|
||||
/// 端口刻意不在这里拼:网关用宿主 88 承载三个域名,但端口应当**跟随调用方**
|
||||
/// (见 readme §15),由前端按 `location.port` 拼,写死任何一种都会在另一种
|
||||
/// 部署下给出「看着对、打不通」的地址。
|
||||
pub fn full_host(subdomain: &str) -> String {
|
||||
format!("{subdomain}.{ENTERPRISE_ZONE}")
|
||||
}
|
||||
@@ -112,32 +115,43 @@ pub fn validate_type(raw: Option<&String>) -> String {
|
||||
// ===========================================================================
|
||||
|
||||
/// 把一条记录同步进共享内存。**所有写操作之后必须调用它**。
|
||||
///
|
||||
/// 写失败 = 热路径查不到 = 该域名立刻 404,所以失败必须出声
|
||||
/// (`state::put` 返回 false:共享内存 zone 满或分配失败)。
|
||||
pub fn sync_shm(entry: &DomainEntry) {
|
||||
let now = util::now();
|
||||
if entry.is_forwardable(now) {
|
||||
// long 用 0 表示永不过期;temp 用真实到期时刻,热路径读到即知是否还能用
|
||||
let exp = if entry.dtype == "temp" { entry.expires_at } else { 0 };
|
||||
if !put_backend(entry.subdomain.as_bytes(), entry.backend.as_bytes(), exp) {
|
||||
if !state::put(
|
||||
KEY_SUB_PREFIX,
|
||||
entry.subdomain.as_bytes(),
|
||||
entry.backend.as_bytes(),
|
||||
exp,
|
||||
) {
|
||||
util::log_err(&format!(
|
||||
"[domains] 转发映射写共享内存失败 sub={} —— 该域名会 404(共享内存可能已满)",
|
||||
entry.subdomain
|
||||
));
|
||||
}
|
||||
} else {
|
||||
invalidate(entry.subdomain.as_bytes());
|
||||
state::remove(KEY_SUB_PREFIX, entry.subdomain.as_bytes());
|
||||
}
|
||||
}
|
||||
|
||||
/// 全量重载转发映射(启动装载 / purge / 连带回收后调用)。返回装载条数。
|
||||
///
|
||||
/// 只清 `sub:` 前缀的键,**不会误伤正在登录的管理员会话**。
|
||||
pub fn reload_shm() -> usize {
|
||||
clear_all();
|
||||
state::clear_prefix(KEY_SUB_PREFIX);
|
||||
let now = util::now();
|
||||
let mut expected = 0;
|
||||
let mut loaded = 0;
|
||||
for entry in store::read_plugin::<DomainTable>("domains.json") {
|
||||
for entry in crate::store::read_domains() {
|
||||
if entry.is_forwardable(now) {
|
||||
expected += 1;
|
||||
let exp = if entry.dtype == "temp" { entry.expires_at } else { 0 };
|
||||
if put_backend(entry.subdomain.as_bytes(), entry.backend.as_bytes(), exp) {
|
||||
if state::put(KEY_SUB_PREFIX, entry.subdomain.as_bytes(), entry.backend.as_bytes(), exp) {
|
||||
loaded += 1;
|
||||
}
|
||||
}
|
||||
@@ -156,14 +170,14 @@ pub fn reload_shm() -> usize {
|
||||
|
||||
/// 全部记录,按创建时间倒序
|
||||
pub fn all() -> Vec<DomainEntry> {
|
||||
let mut list = store::read_plugin::<DomainTable>("domains.json");
|
||||
let mut list = crate::store::read_domains();
|
||||
list.sort_by(|a, b| b.created_at.cmp(&a.created_at));
|
||||
list
|
||||
}
|
||||
|
||||
pub fn by_owner(owner: &str) -> Vec<DomainEntry> {
|
||||
let mut list: Vec<DomainEntry> =
|
||||
store::read_plugin::<DomainTable>("domains.json").into_iter().filter(|e| e.owner == owner).collect();
|
||||
crate::store::read_domains().into_iter().filter(|e| e.owner == owner).collect();
|
||||
list.sort_by(|a, b| b.created_at.cmp(&a.created_at));
|
||||
list
|
||||
}
|
||||
@@ -171,16 +185,11 @@ pub fn by_owner(owner: &str) -> Vec<DomainEntry> {
|
||||
/// 按 id 取单条记录(当前无调用方,保留为对外查询接口)
|
||||
#[allow(dead_code)]
|
||||
pub fn by_id(id: &str) -> Option<DomainEntry> {
|
||||
store::read_plugin::<DomainTable>("domains.json")
|
||||
.into_iter()
|
||||
.find(|e| e.id == id)
|
||||
crate::store::read_domains().into_iter().find(|e| e.id == id)
|
||||
}
|
||||
|
||||
pub fn count_pending() -> usize {
|
||||
store::read_plugin::<DomainTable>("domains.json")
|
||||
.iter()
|
||||
.filter(|e| e.status == "pending")
|
||||
.count()
|
||||
crate::store::read_domains().iter().filter(|e| e.status == "pending").count()
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
@@ -188,6 +197,8 @@ pub fn count_pending() -> usize {
|
||||
// ===========================================================================
|
||||
|
||||
/// 用户提交申请。有临时授权权限的 temp 申请直接放行。
|
||||
///
|
||||
/// 返回的 entry 若 `status == approved && reviewed_by == auto`,即免审通过。
|
||||
pub fn apply(
|
||||
username: &str,
|
||||
subdomain: &str,
|
||||
@@ -195,40 +206,43 @@ pub fn apply(
|
||||
dtype: Option<&String>,
|
||||
) -> Result<DomainEntry, String> {
|
||||
let user = users::get(username).ok_or("账号不存在")?;
|
||||
|
||||
let subdomain = validate_subdomain(subdomain)?;
|
||||
let backend = validate_backend(backend)?;
|
||||
let dtype = validate_type(dtype);
|
||||
|
||||
let now = util::now();
|
||||
// 临时授权权限:存在 core User 的 extra.temp_grant_until
|
||||
let auto = dtype == "temp" && user.extra_i64("temp_grant_until") > now;
|
||||
let auto = dtype == "temp" && user.has_temp_permission(now);
|
||||
|
||||
let chosen = subdomain.clone();
|
||||
let entry = DomainEntry {
|
||||
id: util::gen_id(),
|
||||
subdomain: chosen.clone(),
|
||||
backend,
|
||||
dtype,
|
||||
owner: username.to_owned(),
|
||||
status: if auto { "approved".to_owned() } else { "pending".to_owned() },
|
||||
created_at: now,
|
||||
expires_at: if auto { now + TEMP_DOMAIN_TTL } else { 0 },
|
||||
reviewed_by: if auto { "auto".to_owned() } else { String::new() },
|
||||
reviewed_at: if auto { now } else { 0 },
|
||||
};
|
||||
|
||||
let e2 = entry.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
let entry = crate::store::update_domains(move |list| {
|
||||
if let Some(idx) = list.iter().position(|e| e.subdomain == chosen) {
|
||||
let existing = &list[idx];
|
||||
let mine_pending = existing.owner == username && existing.status == "pending";
|
||||
let its_expired = existing.dtype == "temp" && existing.effective_status(now) == "expired";
|
||||
let its_expired =
|
||||
existing.dtype == "temp" && existing.effective_status(now) == "expired";
|
||||
|
||||
// 自己的待审申请可以改写;已失效的临时域名视为空闲可复用
|
||||
if !(mine_pending || its_expired) {
|
||||
return Err(format!("子域名 {chosen} 已被占用"));
|
||||
}
|
||||
list.remove(idx);
|
||||
}
|
||||
list.push(e2);
|
||||
Ok(list.clone())
|
||||
|
||||
let entry = DomainEntry {
|
||||
id: util::gen_id(),
|
||||
subdomain: chosen,
|
||||
backend,
|
||||
dtype,
|
||||
owner: username.to_owned(),
|
||||
status: if auto { "approved".to_owned() } else { "pending".to_owned() },
|
||||
created_at: now,
|
||||
expires_at: if auto { now + TEMP_DOMAIN_TTL } else { 0 },
|
||||
reviewed_by: if auto { "auto".to_owned() } else { String::new() },
|
||||
reviewed_at: if auto { now } else { 0 },
|
||||
};
|
||||
list.push(entry.clone());
|
||||
Ok(entry)
|
||||
})?;
|
||||
|
||||
sync_shm(&entry);
|
||||
@@ -249,9 +263,7 @@ pub fn review(id: &str, action: &str, admin: &str) -> Result<DomainEntry, String
|
||||
let action = action.to_owned();
|
||||
let admin = admin.to_owned();
|
||||
|
||||
let cap = Rc::new(RefCell::new(None::<DomainEntry>));
|
||||
let cc = cap.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
let updated = crate::store::update_domains(move |list| {
|
||||
let item = list.iter_mut().find(|e| e.id == id).ok_or("记录不存在")?;
|
||||
if item.status != "pending" {
|
||||
return Err(format!("该申请已处理(当前状态:{})", item.status));
|
||||
@@ -264,16 +276,18 @@ pub fn review(id: &str, action: &str, admin: &str) -> Result<DomainEntry, String
|
||||
}
|
||||
item.reviewed_by = admin;
|
||||
item.reviewed_at = now;
|
||||
*cc.borrow_mut() = Some(item.clone());
|
||||
Ok(list.clone())
|
||||
Ok(item.clone())
|
||||
})?;
|
||||
|
||||
let updated = cap.borrow_mut().take().ok_or("内部错误:审核结果丢失")?;
|
||||
sync_shm(&updated);
|
||||
Ok(updated)
|
||||
}
|
||||
|
||||
/// 管理员直接创建并放行(等价于「我替你建好并批准」)。
|
||||
///
|
||||
/// `subdomain` **留空即自动生成** `i<8位随机数字>dm`(见 `gen_subdomain`),
|
||||
/// 撞上已占用就换一个重试(最多 `SUBDOMAIN_GEN_ATTEMPTS` 次)。管理台与
|
||||
/// `/api/admin/domains/create` 走同一条路径,规则不会两处漂移。
|
||||
pub fn create_by_admin(
|
||||
subdomain: &str,
|
||||
backend: &str,
|
||||
@@ -297,11 +311,8 @@ pub fn create_by_admin(
|
||||
|
||||
let mut last_err = "子域名生成失败".to_owned();
|
||||
for _ in 0..attempts {
|
||||
let sub = if manual {
|
||||
validate_subdomain(subdomain)?
|
||||
} else {
|
||||
gen_subdomain()
|
||||
};
|
||||
let sub = if manual { validate_subdomain(subdomain)? } else { gen_subdomain() };
|
||||
// 自动生成的也过一遍校验:常量被误改时立刻报错,而不是建出个用不了的域名
|
||||
let sub = validate_subdomain(&sub)?;
|
||||
match insert_approved(&sub, &backend, &dtype, &owner, admin) {
|
||||
Ok(entry) => {
|
||||
@@ -309,6 +320,7 @@ pub fn create_by_admin(
|
||||
return Ok(entry);
|
||||
}
|
||||
Err(e) => {
|
||||
// 手填的子域名撞车是用户要解决的问题;自动生成的直接换一个重试
|
||||
if manual {
|
||||
return Err(e);
|
||||
}
|
||||
@@ -334,17 +346,17 @@ fn insert_approved(
|
||||
let owner = owner.to_owned();
|
||||
let admin = admin.to_owned();
|
||||
|
||||
let cap = Rc::new(RefCell::new(None::<DomainEntry>));
|
||||
let cc = cap.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
crate::store::update_domains(move |list| {
|
||||
if let Some(idx) = list.iter().position(|e| e.subdomain == chosen) {
|
||||
let existing = &list[idx];
|
||||
let its_expired = existing.dtype == "temp" && existing.effective_status(now) == "expired";
|
||||
let its_expired =
|
||||
existing.dtype == "temp" && existing.effective_status(now) == "expired";
|
||||
if !its_expired {
|
||||
return Err(format!("子域名 {chosen} 已被占用"));
|
||||
}
|
||||
list.remove(idx);
|
||||
}
|
||||
|
||||
let entry = DomainEntry {
|
||||
id: util::gen_id(),
|
||||
subdomain: chosen,
|
||||
@@ -357,58 +369,47 @@ fn insert_approved(
|
||||
reviewed_by: admin,
|
||||
reviewed_at: now,
|
||||
};
|
||||
*cc.borrow_mut() = Some(entry.clone());
|
||||
list.push(entry);
|
||||
Ok(list.clone())
|
||||
})?;
|
||||
// 先把临时 RefMut 落到独立语句:尾表达式的临时值会在 cap 之后才释放,否则借用生命周期不足
|
||||
let placed = cap.borrow_mut().take();
|
||||
placed.ok_or_else(|| "内部错误:域名记录丢失".to_owned())
|
||||
list.push(entry.clone());
|
||||
Ok(entry)
|
||||
})
|
||||
}
|
||||
|
||||
/// 用户删除自己的域名。成功返回被删的子域名(供转发侧失效)。
|
||||
pub fn remove_own(id: &str, username: &str) -> Result<String, String> {
|
||||
let id = id.to_owned();
|
||||
let username = username.to_owned();
|
||||
let cap = Rc::new(RefCell::new(None::<String>));
|
||||
let cc = cap.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
|
||||
crate::store::update_domains(move |list| {
|
||||
let idx = list.iter().position(|e| e.id == id).ok_or("记录不存在")?;
|
||||
if list[idx].owner != username {
|
||||
return Err("只能删除自己的域名".to_owned());
|
||||
}
|
||||
let sub = list.remove(idx).subdomain;
|
||||
*cc.borrow_mut() = Some(sub);
|
||||
Ok(list.clone())
|
||||
})?;
|
||||
let sub = cap.borrow_mut().take().ok_or("内部错误:子域名丢失")?;
|
||||
invalidate(sub.as_bytes());
|
||||
Ok(sub)
|
||||
Ok(sub)
|
||||
})
|
||||
.map(|sub| {
|
||||
state::remove(KEY_SUB_PREFIX, sub.as_bytes());
|
||||
sub
|
||||
})
|
||||
}
|
||||
|
||||
/// 管理员删除任意域名
|
||||
pub fn remove(id: &str) -> Result<String, String> {
|
||||
let id = id.to_owned();
|
||||
let cap = Rc::new(RefCell::new(None::<String>));
|
||||
let cc = cap.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
crate::store::update_domains(move |list| {
|
||||
let idx = list.iter().position(|e| e.id == id).ok_or("记录不存在")?;
|
||||
let sub = list.remove(idx).subdomain;
|
||||
*cc.borrow_mut() = Some(sub);
|
||||
Ok(list.clone())
|
||||
})?;
|
||||
let sub = cap.borrow_mut().take().ok_or("内部错误:子域名丢失")?;
|
||||
invalidate(sub.as_bytes());
|
||||
Ok(sub)
|
||||
Ok(list.remove(idx).subdomain)
|
||||
})
|
||||
.map(|sub| {
|
||||
state::remove(KEY_SUB_PREFIX, sub.as_bytes());
|
||||
sub
|
||||
})
|
||||
}
|
||||
|
||||
/// 连带回收某账号名下的全部域名(删除账号时用)。返回回收条数。
|
||||
pub fn remove_by_owner(owner: &str) -> usize {
|
||||
let owner = owner.to_owned();
|
||||
let cap = Rc::new(RefCell::new(0usize));
|
||||
let cc = cap.clone();
|
||||
let result = store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
let mut removed = 0usize;
|
||||
let mut removed = 0usize;
|
||||
let result = crate::store::update_domains(|list| {
|
||||
list.retain(|e| {
|
||||
if e.owner == owner {
|
||||
removed += 1;
|
||||
@@ -417,11 +418,10 @@ pub fn remove_by_owner(owner: &str) -> usize {
|
||||
true
|
||||
}
|
||||
});
|
||||
*cc.borrow_mut() = removed;
|
||||
Ok(list.clone())
|
||||
Ok(())
|
||||
});
|
||||
let removed = *cap.borrow();
|
||||
if result.is_ok() && removed > 0 {
|
||||
// 被回收的可能包含正在转发的域名,必须全量重载
|
||||
reload_shm();
|
||||
}
|
||||
removed
|
||||
@@ -430,13 +430,13 @@ pub fn remove_by_owner(owner: &str) -> usize {
|
||||
/// 清理:已过期的临时域名 + 超过保留期的驳回记录。返回清理条数。
|
||||
pub fn purge() -> Result<usize, String> {
|
||||
let now = util::now();
|
||||
let cap = Rc::new(RefCell::new(0usize));
|
||||
let cc = cap.clone();
|
||||
store::update_plugin::<DomainTable, _>("domains.json", move |list: &mut DomainTable| {
|
||||
let mut removed = 0usize;
|
||||
let mut removed = 0usize;
|
||||
|
||||
crate::store::update_domains(|list| {
|
||||
list.retain(|e| {
|
||||
let status = e.effective_status(now);
|
||||
let stale_rejected = status == "rejected" && (now - e.reviewed_at) > REJECTED_PURGE_TTL;
|
||||
let stale_rejected =
|
||||
status == "rejected" && (now - e.reviewed_at) > REJECTED_PURGE_TTL;
|
||||
if status == "expired" || stale_rejected {
|
||||
removed += 1;
|
||||
false
|
||||
@@ -444,10 +444,9 @@ pub fn purge() -> Result<usize, String> {
|
||||
true
|
||||
}
|
||||
});
|
||||
*cc.borrow_mut() = removed;
|
||||
Ok(list.clone())
|
||||
Ok(())
|
||||
})?;
|
||||
let removed = *cap.borrow();
|
||||
|
||||
if removed > 0 {
|
||||
reload_shm();
|
||||
}
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
//! 域名插件本地常量与共享内存键/值编码。
|
||||
//!
|
||||
//! 这些原属 `ipass-core::config` 的「个性策略常量」与键前缀,在内核收窄时
|
||||
//! 已下放插件自持(与 `oauth_keys` 同款处理)。值以 `refs/ipass` 权威实现为准。
|
||||
|
||||
use ipass_core::state;
|
||||
|
||||
/// 共享内存键前缀:子域名 → 后端映射
|
||||
pub const KEY_SUB_PREFIX: &[u8] = b"sub:";
|
||||
|
||||
/// 企业域名(业务域名)的 zone:**子域名 + `.` + 此后缀 = 完整对外域名**。
|
||||
///
|
||||
/// 与 `nginx.conf` 的「企业域名 server」严格耦合:
|
||||
/// `server_name ~^(?<subdomain>.+dm)\.mayishangshu\.cn$;`
|
||||
pub const ENTERPRISE_ZONE: &str = "mayishangshu.cn";
|
||||
|
||||
/// 临时域名审批通过后的有效期(秒)。到期仅停止转发,记录保留供查阅。
|
||||
pub const TEMP_DOMAIN_TTL: i64 = 6 * 3600;
|
||||
|
||||
/// 驳回记录保留时长,超期由 purge 清理(秒)
|
||||
pub const REJECTED_PURGE_TTL: i64 = 7 * 86400;
|
||||
|
||||
/// 子域名总长上限:首字符 + 最多 61 个后续字符
|
||||
pub const SUBDOMAIN_MAX_LEN: usize = 62;
|
||||
|
||||
/// 系统保留名:不允许用户申请,避免抢占管理入口
|
||||
pub const RESERVED_SUBDOMAINS: [&str; 4] = ["proxy-api", "admin", "www", "api"];
|
||||
|
||||
/// 自动生成子域名的形状前缀/后缀/位数
|
||||
pub const SUBDOMAIN_PREFIX: &str = "i";
|
||||
pub const SUBDOMAIN_SUFFIX: &str = "dm";
|
||||
/// 随机数字位数。10^8 的空间,撞车概率极低
|
||||
pub const SUBDOMAIN_RAND_DIGITS: usize = 8;
|
||||
/// 自动生成子域名时的最大重试次数(真撞上已占用的就换一个再试)
|
||||
pub const SUBDOMAIN_GEN_ATTEMPTS: usize = 5;
|
||||
|
||||
// ===========================================================================
|
||||
// 转发映射共享内存(写穿):子域名 → 后端
|
||||
// ===========================================================================
|
||||
//
|
||||
// 热路径**永不回源**:未命中即 404,所以每个写操作必须同时更新共享内存与文件
|
||||
// (`domains::sync_shm`)。
|
||||
|
||||
/// 把一条转发映射写进共享内存。`exp == 0` 表示永不过期(long 域名)。
|
||||
pub fn put_backend(subdomain: &[u8], backend: &[u8], expires_at: i64) -> bool {
|
||||
state::put(KEY_SUB_PREFIX, subdomain, backend, expires_at)
|
||||
}
|
||||
|
||||
/// 读转发映射(带 TTL 判定)。未命中或已过期返回 None。
|
||||
pub fn get_backend(subdomain: &[u8], now: i64) -> Option<String> {
|
||||
state::get_live(KEY_SUB_PREFIX, subdomain, now)
|
||||
}
|
||||
|
||||
/// 摘掉一条转发映射(审核拒绝 / 删除 / 过期)。
|
||||
pub fn invalidate(subdomain: &[u8]) -> bool {
|
||||
state::remove(KEY_SUB_PREFIX, subdomain)
|
||||
}
|
||||
|
||||
/// 清空全部转发映射(只清 `sub:` 前缀)。
|
||||
pub fn clear_all() {
|
||||
state::clear_prefix(KEY_SUB_PREFIX);
|
||||
}
|
||||
@@ -1,28 +1,33 @@
|
||||
//! # plugin-domain —— 域名插件
|
||||
//! plugin-domain —— 动态域名插件。
|
||||
//!
|
||||
//! 提供企业域名的子域名转发:
|
||||
//! 职责:子域名 → 后端映射(`sub:` 键空间)、申请与审批、转发决策
|
||||
//! (access 阶段查共享内存)。数据文件 `data/domains.json`。
|
||||
//!
|
||||
//! * **转发解析**:access 阶段从 Host 取子域名 → 查 `sub:` 共享内存 → 写入
|
||||
//! `$proxy_backend_addr`,由 nginx `proxy_pass http://$proxy_backend_addr;` 转发;
|
||||
//! * **申请审核**:用户提交子域名申请,管理员审核放行(临时域名到期自动停止)。
|
||||
//! ## 与旧版最大的差异:写穿
|
||||
//!
|
||||
//! 本插件**不持有**账号数据——只读 `ipass_core::users`,写入一律走内核。
|
||||
//! 热路径**永不回源**(未命中即 404),所以每个写操作都必须
|
||||
//! **同时更新共享内存与文件**——这就是 `domains::sync_shm` 的存在理由。
|
||||
//! 漏掉一处,就会出现「审核通过了但立刻 404」。
|
||||
//!
|
||||
//! ## 装配点(gateway)
|
||||
//!
|
||||
//! * `preconfig` —— 注册 `$proxy_backend_addr` 变量(`proxy_pass` 依赖)
|
||||
//! * `postconfig` —— 注册 `ResolveHandler`(access 阶段)
|
||||
//! * `zone_load` —— 全量装载 `sub:` 映射
|
||||
//! * `dispatch_api` —— 认领域名类管理/账号端点
|
||||
|
||||
mod api;
|
||||
mod domains;
|
||||
mod keys;
|
||||
mod models;
|
||||
mod resolve;
|
||||
pub mod api;
|
||||
pub mod config;
|
||||
pub mod domains;
|
||||
pub mod models;
|
||||
pub mod resolve;
|
||||
pub mod store;
|
||||
|
||||
use ngx::core::Status;
|
||||
use ngx::ffi::{ngx_conf_t, ngx_http_request_t};
|
||||
|
||||
use ipass_core::plugin::Plugin;
|
||||
|
||||
/// 域名插件。
|
||||
///
|
||||
/// 与 `plugin-sso` 平级——去掉它,网关仍然能鉴身份、执行 IAP,
|
||||
/// 只是不再做企业域名转发。
|
||||
pub struct DomainPlugin;
|
||||
|
||||
impl Plugin for DomainPlugin {
|
||||
@@ -31,24 +36,16 @@ impl Plugin for DomainPlugin {
|
||||
}
|
||||
|
||||
fn preconfig(&self, cf: *mut ngx_conf_t) -> bool {
|
||||
// SAFETY: 配置回调必然拿到有效 cf
|
||||
unsafe { resolve::register_vars(cf) }
|
||||
resolve::preconfig(cf)
|
||||
}
|
||||
|
||||
fn postconfig(&self, cf: *mut ngx_conf_t) -> bool {
|
||||
// SAFETY: 配置回调必然拿到有效 cf
|
||||
let cf = unsafe { &mut *cf };
|
||||
ngx::http::add_phase_handler::<resolve::ResolveHandler>(cf).is_ok()
|
||||
// SAFETY: cf 由 nginx 传入且有效
|
||||
ngx::http::add_phase_handler::<resolve::ResolveHandler>(unsafe { &mut *cf }).is_ok()
|
||||
}
|
||||
|
||||
fn dispatch_api(&self, r: *mut ngx_http_request_t) -> Option<Status> {
|
||||
let method = ipass_core::http::method_str(r);
|
||||
let uri = ipass_core::http::uri(r);
|
||||
if api::matches(&method, &uri) {
|
||||
Some(api::dispatch(r))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
api::dispatch(r)
|
||||
}
|
||||
|
||||
fn zone_load(&self) -> usize {
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
//! 域名数据模型:一条记录 = 一个子域名。
|
||||
//! 域名持久化模型(`domains.json`:一条记录 = 一个子域名)。
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// 域名表(`domains.json`):一条记录一个子域名。
|
||||
pub type DomainTable = Vec<DomainEntry>;
|
||||
|
||||
/// 单个子域名记录。
|
||||
/// 单条域名记录。
|
||||
///
|
||||
/// 字段名与旧版 `data/domains.json` **逐字对应**,以便新版直接接管旧数据文件。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct DomainEntry {
|
||||
pub id: String,
|
||||
@@ -33,6 +32,8 @@ pub struct DomainEntry {
|
||||
|
||||
impl DomainEntry {
|
||||
/// 实际状态:approved 的临时域名过期后视为 `expired`。
|
||||
///
|
||||
/// 这是「到期不等于删除」语义的落点——记录保留,只是不再转发。
|
||||
pub fn effective_status(&self, now: i64) -> &'static str {
|
||||
if self.status == "approved" && self.dtype == "temp" {
|
||||
if self.expires_at > 0 && self.expires_at <= now {
|
||||
@@ -52,6 +53,7 @@ impl DomainEntry {
|
||||
return false;
|
||||
}
|
||||
if self.dtype == "temp" {
|
||||
// 临时域名必须有明确的、尚未到达的到期时刻
|
||||
return self.expires_at > now;
|
||||
}
|
||||
true
|
||||
|
||||
@@ -1,30 +1,164 @@
|
||||
//! 域名转发解析:access 阶段从 Host 提取子域名 → 查 `sub:` 共享内存 → 写入
|
||||
//! `$proxy_backend_addr`,由 nginx `proxy_pass http://$proxy_backend_addr;` 转发。
|
||||
//! 转发热路径:查共享内存取后端地址,供 nginx 的 `proxy_pass` 使用。
|
||||
//!
|
||||
//! 与 MaxKey / IAP 同构:网关在转发前解析身份/目标,把结果写进变量,
|
||||
//! 下游 `proxy_pass` 据此转发,业务后端零改造。
|
||||
//! **热路径唯一入口**——只读内存,未命中不产生任何 I/O。
|
||||
//! 旧版这里在 miss 时会去读 `domains.json` 并全量 JSON 解码,
|
||||
//! 那正是「随便发一堆随机子域名就能打穿磁盘」的入口。
|
||||
|
||||
use core::ptr;
|
||||
use core::sync::atomic::{AtomicUsize, Ordering};
|
||||
|
||||
use std::ffi::CString;
|
||||
|
||||
use ipass_core::loc;
|
||||
use ipass_core::util;
|
||||
use ngx::core::{Pool, Status};
|
||||
use ngx::ffi::{
|
||||
ngx_conf_t, ngx_http_add_variable, ngx_http_get_variable_index, ngx_http_request_t,
|
||||
ngx_http_variable_value_t, ngx_int_t, ngx_str_t, ngx_uint_t, NGX_HTTP_VAR_CHANGEABLE,
|
||||
NGX_HTTP_VAR_CHANGEABLE, NGX_HTTP_VAR_NOCACHEABLE, ngx_conf_t, ngx_http_add_variable,
|
||||
ngx_http_get_variable_index, ngx_http_request_t, ngx_http_variable_value_t, ngx_int_t,
|
||||
ngx_uint_t,
|
||||
};
|
||||
use ngx::http::{HttpPhase, HttpRequestHandler, HTTPStatus};
|
||||
use ngx::http::{HTTPStatus, HttpPhase, HttpRequestHandler};
|
||||
use ngx::ngx_string;
|
||||
|
||||
use crate::keys::{get_backend, ENTERPRISE_ZONE};
|
||||
use crate::config;
|
||||
use ipass_core::loc::{self, Switch};
|
||||
use ipass_core::state;
|
||||
use ipass_core::util;
|
||||
|
||||
/// `$proxy_backend_addr` 的下标(access 阶段写入,proxy_pass 读取)
|
||||
/// `$proxy_backend_addr` 在 `r->variables` 里的下标
|
||||
static BACKEND_VAR_INDEX: AtomicUsize = AtomicUsize::new(usize::MAX);
|
||||
const BACKEND_VAR_NAME: &str = "proxy_backend_addr";
|
||||
|
||||
/// 域名转发解析:access 阶段判定目标后端并注入 `$proxy_backend_addr`。
|
||||
/// 查共享内存取后端地址;已过期的条目视为不存在。
|
||||
fn resolve_backend(subdomain: &[u8]) -> Option<String> {
|
||||
let (backend, expires_at) = state::get(config::KEY_SUB_PREFIX, subdomain)?;
|
||||
if expires_at > 0 && expires_at <= util::now() {
|
||||
return None;
|
||||
}
|
||||
Some(backend)
|
||||
}
|
||||
|
||||
/// 取 Host 头里第一个点之前的部分作为子域名。
|
||||
///
|
||||
/// 刻意不走 nginx 的 server_name 正则捕获变量(那需要再算一次变量 hash),
|
||||
/// 热路径上手工切更省。
|
||||
pub fn subdomain_of(r: *mut ngx_http_request_t) -> Option<Vec<u8>> {
|
||||
// SAFETY: r 有效;迭代器只在本函数存续期内使用
|
||||
let request = unsafe { ngx::http::Request::from_ngx_http_request(r) };
|
||||
for (key, value) in request.headers_in_iterator() {
|
||||
if key.as_bytes().eq_ignore_ascii_case(b"host") {
|
||||
let host = value.as_bytes();
|
||||
// 去掉端口
|
||||
let host = match host.iter().position(|&b| b == b':') {
|
||||
Some(i) => &host[..i],
|
||||
None => host,
|
||||
};
|
||||
// 取第一段标签
|
||||
let label = match host.iter().position(|&b| b == b'.') {
|
||||
Some(i) => &host[..i],
|
||||
None => host,
|
||||
};
|
||||
if label.is_empty() {
|
||||
return None;
|
||||
}
|
||||
return Some(label.to_ascii_lowercase());
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 把后端地址写进 `r->variables[$proxy_backend_addr]`,供 `proxy_pass` 使用
|
||||
fn set_backend_var(r: *mut ngx_http_request_t, backend: &str) {
|
||||
let idx = BACKEND_VAR_INDEX.load(Ordering::SeqCst);
|
||||
if idx == usize::MAX {
|
||||
return;
|
||||
}
|
||||
// SAFETY: idx 由 ngx_http_get_variable_index 分配且落在 r->variables 内;
|
||||
// 值分配在请求池里,随请求回收
|
||||
unsafe {
|
||||
let pool = Pool::from_ngx_pool((*r).pool);
|
||||
let bytes = backend.as_bytes();
|
||||
let data = pool.alloc(bytes.len()) as *mut u8;
|
||||
if data.is_null() {
|
||||
return;
|
||||
}
|
||||
ptr::copy_nonoverlapping(bytes.as_ptr(), data, bytes.len());
|
||||
|
||||
let vv: *mut ngx_http_variable_value_t = (*r).variables.add(idx);
|
||||
(*vv).data = data;
|
||||
(*vv).set_len(bytes.len() as _);
|
||||
(*vv).set_valid(1);
|
||||
(*vv).set_not_found(0);
|
||||
(*vv).set_no_cacheable(1);
|
||||
}
|
||||
}
|
||||
|
||||
/// 变量 get_handler:`proxy_pass` 求值 `$proxy_backend_addr` 时被调用。
|
||||
///
|
||||
/// 与 access 阶段互补——这里保证「即使 access 未赋值也能取到」,
|
||||
/// access 阶段则负责决定命中不了时返回 404。
|
||||
extern "C" fn backend_get(
|
||||
r: *mut ngx_http_request_t,
|
||||
v: *mut ngx_http_variable_value_t,
|
||||
_data: usize,
|
||||
) -> ngx_int_t {
|
||||
// SAFETY: nginx 传入的 r/v 必然有效
|
||||
unsafe {
|
||||
let resolved = subdomain_of(r).as_deref().and_then(resolve_backend);
|
||||
|
||||
let Some(backend) = resolved else {
|
||||
(*v).set_not_found(1);
|
||||
return Status::NGX_ERROR.into();
|
||||
};
|
||||
|
||||
let pool = Pool::from_ngx_pool((*r).pool);
|
||||
let bytes = backend.as_bytes();
|
||||
let data = pool.alloc(bytes.len()) as *mut u8;
|
||||
if data.is_null() {
|
||||
(*v).set_not_found(1);
|
||||
return Status::NGX_ERROR.into();
|
||||
}
|
||||
ptr::copy_nonoverlapping(bytes.as_ptr(), data, bytes.len());
|
||||
|
||||
(*v).data = data;
|
||||
(*v).set_len(bytes.len() as _);
|
||||
(*v).set_valid(1);
|
||||
(*v).set_no_cacheable(1);
|
||||
(*v).set_not_found(0);
|
||||
|
||||
Status::NGX_OK.into()
|
||||
}
|
||||
}
|
||||
|
||||
/// 配置解析前注册 `$proxy_backend_addr`。
|
||||
///
|
||||
/// 必须在 preconfiguration 阶段调用,否则配置里的
|
||||
/// `proxy_pass http://$proxy_backend_addr` 无法解析。
|
||||
pub fn preconfig(cf: *mut ngx_conf_t) -> bool {
|
||||
let mut name = ngx_string!("proxy_backend_addr");
|
||||
|
||||
let idx = unsafe { ngx_http_get_variable_index(cf, &raw mut name) };
|
||||
if idx == -1 {
|
||||
return false;
|
||||
}
|
||||
BACKEND_VAR_INDEX.store(idx as usize, Ordering::SeqCst);
|
||||
|
||||
let var = unsafe {
|
||||
ngx_http_add_variable(
|
||||
cf,
|
||||
&raw mut name,
|
||||
(NGX_HTTP_VAR_CHANGEABLE | NGX_HTTP_VAR_NOCACHEABLE) as ngx_uint_t,
|
||||
)
|
||||
};
|
||||
if var.is_null() {
|
||||
return false;
|
||||
}
|
||||
|
||||
// SAFETY: var 非空且由本函数独占初始化
|
||||
unsafe {
|
||||
(*var).get_handler = Some(backend_get);
|
||||
(*var).set_handler = None;
|
||||
(*var).data = 0;
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
/// 转发热路径:命中则放行(`proxy_pass` 会去取 `$proxy_backend_addr`),未命中直接 404。
|
||||
pub struct ResolveHandler;
|
||||
|
||||
impl HttpRequestHandler for ResolveHandler {
|
||||
@@ -32,97 +166,23 @@ impl HttpRequestHandler for ResolveHandler {
|
||||
type Output = Status;
|
||||
|
||||
fn handler(request: &mut ngx::http::Request) -> Self::Output {
|
||||
if !loc::enabled(request, loc::Switch::Domain) {
|
||||
return Status::NGX_DECLINED;
|
||||
}
|
||||
// 未开启该开关的 location 一律放行(管理台/API 走这里)
|
||||
let r: *mut ngx_http_request_t = request.as_mut() as *mut ngx_http_request_t;
|
||||
|
||||
let host = ipass_core::http::header(r, "host").unwrap_or_default();
|
||||
// 去掉端口(Host 头可能带 :port)
|
||||
let host_only = host.split(':').next().unwrap_or(&host);
|
||||
let suffix = format!(".{ENTERPRISE_ZONE}");
|
||||
let Some(sub) = host_only.strip_suffix(&suffix) else {
|
||||
// 不是本域名的请求:放行(交给其它逻辑处理),变量保持未设
|
||||
return Status::NGX_DECLINED;
|
||||
};
|
||||
if sub.is_empty() {
|
||||
if !loc::enabled(r, Switch::Proxy) {
|
||||
return Status::NGX_DECLINED;
|
||||
}
|
||||
|
||||
let now = util::now();
|
||||
match get_backend(sub.as_bytes(), now) {
|
||||
let Some(host) = subdomain_of(r) else {
|
||||
return HTTPStatus::NOT_FOUND.into();
|
||||
};
|
||||
|
||||
match resolve_backend(&host) {
|
||||
Some(backend) => {
|
||||
set_backend_var(r, &backend);
|
||||
Status::NGX_DECLINED
|
||||
}
|
||||
None => {
|
||||
// 子域名未解析到后端:404(记录不存在 / 已失效 / 待审核)
|
||||
HTTPStatus::NOT_FOUND.into()
|
||||
}
|
||||
// 与旧版语义一致:查不到 = 未配置 / 已过期 / 已删除 / 尚未审核通过
|
||||
None => HTTPStatus::NOT_FOUND.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 把后端地址写入 `$proxy_backend_addr`,供 `proxy_pass` 求值时取到。
|
||||
fn set_backend_var(r: *mut ngx_http_request_t, val: &str) {
|
||||
let idx = BACKEND_VAR_INDEX.load(Ordering::SeqCst);
|
||||
if idx == usize::MAX {
|
||||
return;
|
||||
}
|
||||
// SAFETY: idx 由 ngx_http_get_variable_index 分配且在 r->variables 内;
|
||||
// 值分配在请求池,随请求回收。
|
||||
unsafe {
|
||||
let pool = Pool::from_ngx_pool((*r).pool);
|
||||
let bytes = val.as_bytes();
|
||||
let data = pool.alloc(bytes.len()) as *mut u8;
|
||||
if data.is_null() {
|
||||
return;
|
||||
}
|
||||
ptr::copy_nonoverlapping(bytes.as_ptr(), data, bytes.len());
|
||||
let vv: *mut ngx_http_variable_value_t = (*r).variables.add(idx);
|
||||
(*vv).data = data;
|
||||
(*vv).set_len(bytes.len() as _);
|
||||
(*vv).set_valid(1);
|
||||
(*vv).set_not_found(0);
|
||||
(*vv).set_no_cacheable(0);
|
||||
}
|
||||
}
|
||||
|
||||
/// 注册 `$proxy_backend_addr` 变量(运行时名,需手动构造 `ngx_str_t`)。
|
||||
///
|
||||
/// 必须在配置解析前注册,否则 `proxy_pass http://$proxy_backend_addr` 无法解析。
|
||||
pub unsafe fn register_vars(cf: *mut ngx_conf_t) -> bool {
|
||||
let cf = &mut *cf;
|
||||
let c = match CString::new(BACKEND_VAR_NAME) {
|
||||
Ok(c) => c,
|
||||
Err(_) => return false,
|
||||
};
|
||||
let mut ns = ngx_str_t {
|
||||
len: BACKEND_VAR_NAME.len() as ngx_uint_t,
|
||||
data: c.as_ptr() as *mut u8,
|
||||
};
|
||||
let var = ngx_http_add_variable(cf, &mut ns, NGX_HTTP_VAR_CHANGEABLE as ngx_uint_t);
|
||||
if var.is_null() {
|
||||
return false;
|
||||
}
|
||||
// 兜底的 get_handler:变量未被 access 阶段写入时(理论上不会)返回 DECLINED
|
||||
unsafe {
|
||||
(*var).get_handler = Some(backend_var_get);
|
||||
(*var).set_handler = None;
|
||||
(*var).data = 0;
|
||||
}
|
||||
let idx = ngx_http_get_variable_index(cf, &mut ns);
|
||||
if idx == -1 {
|
||||
return false;
|
||||
}
|
||||
BACKEND_VAR_INDEX.store(idx as usize, Ordering::SeqCst);
|
||||
true
|
||||
}
|
||||
|
||||
extern "C" fn backend_var_get(
|
||||
_r: *mut ngx_http_request_t,
|
||||
_v: *mut ngx_http_variable_value_t,
|
||||
_data: usize,
|
||||
) -> ngx_int_t {
|
||||
Status::NGX_DECLINED.into()
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
//! 域名表的文件读写(复用内核 store 的原子写 + 全局文件写锁)。
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
use ipass_core::{state, store};
|
||||
|
||||
use crate::models::DomainEntry;
|
||||
|
||||
fn domains_path() -> PathBuf {
|
||||
store::path_in_data("domains.json")
|
||||
}
|
||||
|
||||
pub fn read_domains() -> Vec<DomainEntry> {
|
||||
store::read_json(&domains_path(), Vec::new())
|
||||
}
|
||||
|
||||
pub fn write_domains(data: &[DomainEntry]) -> Result<(), String> {
|
||||
store::write_json(&domains_path(), &data.to_vec())
|
||||
}
|
||||
|
||||
/// 加锁「读-改-写」域名表。
|
||||
///
|
||||
/// 闭包返回 `Ok(T)` 表示提交,`Err(msg)` 表示放弃(不写盘)。
|
||||
pub fn update_domains<T, F>(f: F) -> Result<T, String>
|
||||
where
|
||||
F: FnOnce(&mut Vec<DomainEntry>) -> Result<T, String>,
|
||||
{
|
||||
let _guard = state::file_lock().ok_or("内部错误:状态锁不可用")?;
|
||||
let mut data = read_domains();
|
||||
let out = f(&mut data)?;
|
||||
write_domains(&data)?;
|
||||
Ok(out)
|
||||
}
|
||||
+6
-6
@@ -178,13 +178,13 @@ code="$(fwd_code "i00000000dm")"
|
||||
[ "$code" = "404" ] && ok "未知子域名 → 404" || bad "未知子域名应 404,实际 $code"
|
||||
[ "$(fwd_body "i00000000dm")" != "NO_BACKEND" ] && ok "该 404 由插件发出(非转发层兜底)" || bad "该 404 来自转发层兜底,说明插件没拦住"
|
||||
|
||||
# zone 外的 Host 不归本插件管:插件 decline → 没有可转发后端 → 落到转发层兜底。
|
||||
# 兜底 body 固定为 NO_BACKEND,据此与「插件自己发的 404」区分开,断言才有意义。
|
||||
# (生产用正则 server_name,这类 Host 根本进不到转发 server;本例是测试配置的形态)
|
||||
# zone 外的 Host:上游语义下同样由插件 access 未命中直接 404(不 decline、
|
||||
# 不落转发层兜底)——与「未知子域名」行为一致,均不泄漏存在性。
|
||||
# conf 里的 error_page NO_BACKEND 兜底仅作为转发层最后的保险,正常不会触发。
|
||||
code="$(curl -s -o /dev/null -w '%{http_code}' --max-time 5 "$DOMAIN_BASE/" -H "Host: other.example.com")"
|
||||
body="$(curl -s --max-time 5 "$DOMAIN_BASE/" -H "Host: other.example.com")"
|
||||
{ [ "${code}" = "404" ] && [ "${body}" = "NO_BACKEND" ]; } \
|
||||
&& ok "zone 外的 Host 未被插件接管(转发层兜底)" || bad "zone 外 Host 处理异常:code=${code} body=${body}"
|
||||
{ [ "${code}" = "404" ] && [ "${body}" != "NO_BACKEND" ]; } \
|
||||
&& ok "zone 外的 Host → 插件直接 404(上游未命中语义)" || bad "zone 外 Host 处理异常:code=${code} body=${body}"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
echo "==> [4] 参数校验"
|
||||
@@ -272,7 +272,7 @@ R="$(areq POST /api/admin/domains/delete "{\"id\":\"$(entry_id "$SUB_AUTO")\"}")
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
echo "==> [14] purge 清理"
|
||||
R="$(areq POST /api/admin/domains/purge)"
|
||||
R="$(areq POST /api/admin/purge)"
|
||||
[ "$(jget "$R" code)" = "200" ] && ok "purge 可用:$(jget "$R" msg)" || bad "purge 失败:$R"
|
||||
# 被驳回且未过保留期的记录不应被清掉(保留期 7 天)
|
||||
[ "$(entry_field "$SUB_REJ" status)" = "rejected" ] && ok "保留期内驳回记录未被误清" || bad "驳回记录被误清"
|
||||
|
||||
Reference in new issue
Block a user