refactor: drop deps/ipass submodule, depend on ../ipass-core via path

This commit is contained in:
admin committed 2026-09-24 16:34:22 +08:00
1 parent 2821adf116
commit b2e59c4fee
3 files changed
+9 -15

No files matched your search

-3
View File
@@ -1,3 +0,0 @@
[submodule "deps/ipass"]
path = deps/ipass
url = http://192.168.1.18:13300/ipass/ipass.git
Vendored
-1
Submodule deps/ipass deleted from 9c46e27eb5.
+9 -11
View File
@@ -6,18 +6,16 @@
# gateway —— 装配层:module 壳 + 插件注册表 → 产出单个 .so
#
# 通用框架(内核 ipass-core / 唯一 cdylib 装配 / vendored ngx-rust / 其它子系统)
# 全部来自主项目 ipass/ipass,经仓库根 `deps/ipass` git submodule 引入,
# 不在此仓库重复维护(避免与上游内核 fork 漂移)。
# 全部来自主项目 ipass/ipass-core(兄弟仓库 ../ipass-core),
# 通过 path 依赖引入,不在此仓库重复维护(避免与上游内核 fork 漂移)。
#
# 为什么是「单 .so + crate 级插件」而不是「多 .so 运行时插件」:
# nginx 动态模块没有稳定 ABI,Rust 侧更是如此(每个 cdylib 各链一份 std)。
# 跨 .so 共享状态要自己造 C ABI 契约,且 zone tag / 同名变量都会冲突
# (详见 docs/plugin-architecture-analysis.md)。
#
# ⚠️ deps/ipass 是独立 workspace,必须 exclude,否则 cargo 报歧义。
[workspace]
members = ["crates/plugin-sso", "gateway"]
exclude = ["../deps/ipass", "target"]
exclude = ["target"]
[workspace.package]
version = "1.0.0"
@@ -25,7 +23,7 @@ edition = "2021"
publish = false
# ---------------------------------------------------------------------------
# ⚠️ 依赖必须用 vendored 源码(deps/ipass 子模块内的 ngx-rust),不能走 crates.io,
# ⚠️ 依赖必须用 vendored 源码(../ipass-core/rust/vendor/ngx-rust),不能走 crates.io,
# 也不能走 git:
#
# 1) `ngx = "0.5"`(crates.io 0.5.1)只发布了配置阶段接口(HttpModule),
@@ -38,13 +36,13 @@ publish = false
# 国内网络下卡死(实测 cargo 5 分钟 0% CPU,调用栈停在
# GitSource::block_until_ready -> GitCheckout::update_submodules -> fetch -> wait4)。
#
# 因此 vendor 到 deps/ipass/rust/vendor/ngx-rust/,用 path 依赖:
# 因此 vendor 到 ../ipass-core/rust/vendor/ngx-rust/,用 path 依赖:
# 离线可编译、无子模块、版本锁定。
# ---------------------------------------------------------------------------
[workspace.dependencies]
ngx = { path = "../deps/ipass/rust/vendor/ngx-rust" }
nginx-sys = { path = "../deps/ipass/rust/vendor/ngx-rust/nginx-sys" }
ipass-core = { path = "../deps/ipass/rust/crates/ipass-core" }
ngx = { path = "../../ipass-core/rust/vendor/ngx-rust" }
nginx-sys = { path = "../../ipass-core/rust/vendor/ngx-rust/nginx-sys" }
ipass-core = { path = "../../ipass-core/rust/crates/ipass-core" }
plugin-sso = { path = "crates/plugin-sso" }
# 业务层依赖:全部是纯 Rust 实现,不引入任何系统库或常驻依赖
@@ -60,4 +58,4 @@ lto = true
codegen-units = 1
# 模块被加载进 nginx 这个 C 进程,panic 绝不能跨 FFI 边界展开
panic = "abort"
strip = true
strip = true