Compare commits

...

52 Commits

Author SHA1 Message Date
xiaojunnuo
7a1c6d2918 v1.37.12 2025-11-30 02:30:29 +08:00
xiaojunnuo
9fcc0dc8e7 build: prepare to build 2025-11-30 02:28:22 +08:00
xiaojunnuo
286f244caf build: prepare to build 2025-11-30 02:18:12 +08:00
xiaojunnuo
52ebeab90b chore: group dict刷新 2025-11-30 02:16:04 +08:00
xiaojunnuo
6be7591332 perf: 支持证书颁发机构 LiteSSL
https://github.com/certd/certd/issues/590
2025-11-30 01:30:47 +08:00
xiaojunnuo
73325aaefb perf: 支持微信扫码登录 2025-11-30 01:13:55 +08:00
xiaojunnuo
0adcc6a8d1 fix: 修复waf tls版本号小写 2025-11-29 12:15:58 +08:00
xiaojunnuo
93fb6acd1d build: release 2025-11-29 04:30:52 +08:00
xiaojunnuo
77d52b323d build: publish 2025-11-29 04:17:51 +08:00
xiaojunnuo
ca8e8bf6ef build: trigger build image 2025-11-29 04:17:34 +08:00
xiaojunnuo
9acac86ed5 v1.37.11 2025-11-29 04:15:57 +08:00
xiaojunnuo
ba5007219d build: prepare to build 2025-11-29 04:13:44 +08:00
xiaojunnuo
ec046fd599 build: prepare to build 2025-11-29 04:10:55 +08:00
xiaojunnuo
5452ff1153 build: prepare to build 2025-11-29 04:08:56 +08:00
xiaojunnuo
d03b1e0608 chore: 数据库脚本同步 2025-11-29 04:06:51 +08:00
xiaojunnuo
53c88ad5af perf: 优化天翼云cdn 等待5秒部署完成 2025-11-29 03:25:21 +08:00
xiaojunnuo
21585ca565 chore: 优化oidc登录 2025-11-28 01:42:42 +08:00
xiaojunnuo
2fabee647a fix: 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 2025-11-27 22:36:33 +08:00
xiaojunnuo
cf4632045c Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-27 01:59:28 +08:00
xiaojunnuo
ec75afbc44 perf: 支持oidc单点登录 2025-11-27 01:59:22 +08:00
xiaojunnuo
c7b298c46f fix: 修复备注撑开表格行高的bug
https://github.com/certd/certd/issues/586
2025-11-26 23:38:34 +08:00
xiaojunnuo
3406bb5a4a fix: 修复域名管理无法创建tencent-eo dns授权的bug
https://github.com/certd/certd/issues/587
2025-11-26 23:36:34 +08:00
xiaojunnuo
e9427b4694 chore: oauth-second 2025-11-26 23:25:51 +08:00
xiaojunnuo
517a1f1835 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-26 16:04:24 +08:00
xiaojunnuo
6e735bbd1e fix: openapi 成功后失败都返回msg 2025-11-26 16:04:14 +08:00
xiaojunnuo
5a148aa3b9 chore: oidc first 2025-11-26 07:34:42 +08:00
xiaojunnuo
b4c362da37 docs: openapi 2025-11-25 09:12:35 +08:00
xiaojunnuo
575ae164c8 perf: ssh支持ppk格式私钥 2025-11-25 00:48:21 +08:00
xiaojunnuo
a9606bfb4e chore: 1 2025-11-24 23:43:14 +08:00
xiaojunnuo
b5ec04723d perf: ssl.com支持ecc 2025-11-24 23:33:25 +08:00
xiaojunnuo
51cc08411f perf: 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 2025-11-24 23:18:56 +08:00
xiaojunnuo
d75034deae build: release 2025-11-19 23:57:16 +08:00
xiaojunnuo
4ce23debb6 build: publish 2025-11-19 23:55:03 +08:00
xiaojunnuo
063706a7bf build: trigger build image 2025-11-19 23:54:03 +08:00
xiaojunnuo
eb41a3655f v1.37.10 2025-11-19 23:52:19 +08:00
xiaojunnuo
a84476187f build: prepare to build 2025-11-19 23:49:47 +08:00
xiaojunnuo
70b603d601 perf: 站点证书监控备注输入框改成textarea 2025-11-19 23:49:09 +08:00
xiaojunnuo
c9709f2698 perf: 优化dokploy 部署插件,配置选择serverId 2025-11-19 23:47:26 +08:00
xiaojunnuo
be4f479afd build: release 2025-11-19 15:41:19 +08:00
xiaojunnuo
a251465dbc build: publish 2025-11-19 15:30:56 +08:00
xiaojunnuo
9b7051f2be build: trigger build image 2025-11-19 15:30:33 +08:00
xiaojunnuo
8bfdef79c4 v1.37.9 2025-11-19 15:28:27 +08:00
xiaojunnuo
f2c2bf81b3 build: prepare to build 2025-11-19 15:24:37 +08:00
xiaojunnuo
8b5247b9bb build: prepare to build 2025-11-19 15:23:57 +08:00
xiaojunnuo
075b1dc0eb fix: 商用证书上传保存失败的bug 2025-11-19 15:13:08 +08:00
xiaojunnuo
42e1f0478d chore: docs 2025-11-19 13:24:40 +08:00
xiaojunnuo
d4653678b2 perf: 优化阿里云clb 过期证书清理报错的问题 2025-11-18 18:09:59 +08:00
xiaojunnuo
a4ce752e58 chore: 阿里云nlb证书清理增加日志打印 2025-11-18 18:02:55 +08:00
xiaojunnuo
f6649398ef chore: 清理过期证书增加日志打印 2025-11-18 18:01:23 +08:00
xiaojunnuo
02859cc270 build: release 2025-11-18 01:28:48 +08:00
xiaojunnuo
4ed30e082f build: publish 2025-11-18 01:18:48 +08:00
xiaojunnuo
d3985dd129 build: trigger build image 2025-11-18 01:18:32 +08:00
116 changed files with 3701 additions and 2006 deletions

View File

@@ -8,5 +8,6 @@
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
},
"editor.tabSize": 2
}

View File

@@ -3,6 +3,51 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
### Bug Fixes
* 修复waf tls版本号小写 ([0adcc6a](https://github.com/certd/certd/commit/0adcc6a8d194469be0c26940ed4837fb34929b68))
### Performance Improvements
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
* openapi 成功后失败都返回msg ([6e735bb](https://github.com/certd/certd/commit/6e735bbd1e29712e939f775a4db974db70e3b4b0))
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes

View File

@@ -17,12 +17,6 @@ Certd® 是一个免费的全自动证书管理系统,让你的网站证书永
> 流水线数量现已调整为无限制,欢迎大家使用
**************************************************************************************************
🔥🔥🔥永久专业版上线双11活动火热进行中🔥🔥🔥
赶快升级到最新版点击右上角金色VIP按钮点击立即赞助看看你的优惠券金额是多少
**************************************************************************************************
## 一、特性
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
@@ -158,9 +152,9 @@ https://certd.handfree.work/
## 八、捐赠
************************
开源为什么要做专业版收费?
1. 纯靠为爱发电不可持续比如我的dev-sidecar项目即便是拥有20K+star,也差点凉凉,幸亏有另外大佬接手用爱发电)
1. 纯靠为爱发电不可持续比如我的dev-sidecar项目即便是拥有20K+star也差点凉凉,幸亏有另外大佬接手用爱发电)
2. 没有赞助的项目,作者会比较任性,不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
@@ -171,16 +165,16 @@ https://certd.handfree.work/
专业版特权对比
| 功能 | 免费版 | 专业版 |
| 功能 | 免费版 | 专业版 |
|---------|---------------------------------------|--------------------------------|
| 免费证书申请 | 免费无限制 | 免费无限制 |
| 域名数量 | 无限制 | 无限制 |
| 证书流水线条数 | 无限制 | 无限制 |
| 站点证书监控 | 限制1条 | 无限制 |
| 自动部署插件 | 阿里云CDN、腾讯云、七牛CDN、主机部署、宝塔、1Panel等大部分插件 | 群晖 |
| 通知 | 邮件通知、自定义webhook | 邮件免配置、企微、钉钉、飞书、anpush、server酱等 |
| VIP群 | 无 | 可加,一对一技术支持,必要时远程协助 |
************************
| 免费证书申请 | 免费无限制 | 免费无限制 |
| 域名数量 | 无限制 | 无限制 |
| 证书流水线条数 | 无限制 | 无限制 |
| 站点证书监控 | 限制1条 | 无限制 |
| 自动部署插件 | 阿里云CDN、腾讯云、七牛CDN、主机部署、宝塔、1Panel等大部分插件 | 群晖、威联通、proxmox等 |
| 通知 | 邮件通知、自定义webhook | 邮件免配置、企微、钉钉、飞书、anpush、server酱等 |
| 批量操作 | 无 | 流水线模版,流水线复制,批量运行,批量设置通知、定时等 |
| VIP群 | 无 | 可加,一对一技术支持,必要时可申请远程协助 |
## 九、贡献代码

View File

@@ -9,8 +9,7 @@ services:
restart: unless-stopped # 自动重启
volumes:
# ↓↓↓↓↓ -------------------------------------------------------- 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下,【您需要定时备份此目录,以保障数据容灾】
# 只要修改冒号前面的,冒号后面的/app/data不要动
- /data/certd:/app/data
- /data/certd:/app/data # 只要修改冒号前面的,冒号后面的/app/data切记切记不要动
#- /volume1/docker/certd:/app/data:delegated #群晖使用这个配置
# ↓↓↓↓↓ -------------------------------------------------------- 如果走时不准考虑挂载localtime文件
#- /etc/localtime:/etc/localtime

View File

@@ -3,6 +3,51 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
* openapi 成功后失败都返回msg ([6e735bb](https://github.com/certd/certd/commit/6e735bbd1e29712e939f775a4db974db70e3b4b0))
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes

View File

@@ -57,6 +57,10 @@ https://your_server_ip:7002
::: warning
如果您是第一次升级certd版本切记切记先备份一下数据
```
# docker-compose.yaml配置
- /data/certd:/app/data # 请务必确保 /app/data 这个路径没有改动,固定写死
```
:::

View File

@@ -10,6 +10,12 @@
::: warning
如果您是第一次升级certd版本切记切记先备份一下数据
很多人docker不太会配置数据目录没有映射出来升级导致数据丢失
```
# docker-compose.yaml配置
- /data/certd:/app/data # 请务必确保 /app/data 这个路径没有改动,固定写死
```
具体备份方法可以参考上面每种部署方式升级方法后面的备份章节
:::
## 升级日志

View File

@@ -19,9 +19,15 @@ header中传入x-certd-token即可调用开放接口
4、然后将content和sign分别base64后用.号连接: x-certd-token = base64(content) +"."+base64(sign)
## 补充说明
1.证书申请接口支持证书id和域名两种方式获取证书。
2.autoApply=true将在没有证书时自动触发申请申请过程中会提示`正在申请中`,可轮循获取状态,直到证书申请成功。
## 参数
支持证书id和域名两种方式获取证书。
## 创建新的证书申请
参数autoApply=true将在没有证书时自动触发申请证书检查逻辑如下
1. 如果证书仓库里面有,且没有过期,就直接返回证书
2. 如果没有或者已过期,就会去找流水线,有就触发流水线执行
3. 如果没有流水线,就创建一个流水线,触发运行(`注意:需要提前在域名管理中配置好域名校验方式,否则会申请失败`
4. 再次采用相同参数请求接口,如果在申请过程中,就会提示`正在申请中`,可轮循获取状态,直到证书申请成功。
## SDK

View File

@@ -1,5 +1,5 @@
# 任务插件
`102` 款任务插件
`103` 款任务插件
## 1. 证书申请
| 序号 | 名称 | 说明 |
@@ -29,18 +29,19 @@
| 6.| **白山云-更新证书** | |
| 7.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 |
| 8.| **括彩云-部署到括彩云CDN** | 括彩云CDN每月免费30G[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
| 9.| **多吉云-部署到多吉云CDN** | |
| 10.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
| 11.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
| 12.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
| 13.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
| 14.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN又拍云云存储USS |
| 15.| **FlexCDN-更新证书** | |
| 16.| **farcdn-更新证书** | www.farcdn.net |
| 17.| **雨云-更新证书** | app.rainyun.com |
| 18.| **网宿-更新证书** | 网宿证书自动更新 |
| 19.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 |
| 20.| **APISIX-更新证书** | 自动更新APISIX证书 |
| 9.| **西数-部署到虚拟主机** | 西部数码部署证书到虚拟主机 |
| 10.| **多吉云-部署到多吉云CDN** | |
| 11.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
| 12.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
| 13.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
| 14.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
| 15.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN又拍云云存储USS |
| 16.| **FlexCDN-更新证书** | |
| 17.| **farcdn-更新证书** | www.farcdn.net |
| 18.| **雨云-更新证书** | app.rainyun.com |
| 19.| **网宿-更新证书** | 网宿证书自动更新 |
| 20.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 |
| 21.| **APISIX-更新证书** | 自动更新APISIX证书 |
## 4. 面板
| 序号 | 名称 | 说明 |
@@ -61,7 +62,7 @@
| 14.| **威联通-部署证书到威联通** | 部署证书到qnap |
| 15.| **飞牛NAS-部署证书** | |
| 16.| **Proxmox-上传证书到Proxmox** | |
| 17.| **Dokploy-更新证书** | 自动更新Dokploy证书 |
| 17.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 |
## 5. 阿里云
| 序号 | 名称 | 说明 |
@@ -71,7 +72,7 @@
| 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
| 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务自动部署域名证书至阿里云DCDN |
| 5.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名不是上传到阿里云oss |
| 6.| **阿里云-上传证书到阿里云CAS** | 上传证书到阿里云数字证书管理服务CAS注意:不会部署到任何应用上;如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
| 6.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务CAS如果不想在阿里云上同一份证书上传多次可以把此任务作为前置任务其他阿里云任务证书那一项选择此任务的输出 |
| 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
| 8.| **阿里云-部署至ALB应用负载均衡** | ALB,更新监听器的默认证书 |
| 9.| **阿里云-部署至NLB网络负载均衡** | NLB,网络负载均衡,更新监听器的默认证书 |

View File

@@ -9,5 +9,5 @@
}
},
"npmClient": "pnpm",
"version": "1.37.8"
"version": "1.37.12"
}

View File

@@ -3,6 +3,26 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/publishlab/node-acme-client/compare/v1.37.11...v1.37.12) (2025-11-29)
### Performance Improvements
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/publishlab/node-acme-client/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
## [1.37.11](https://github.com/publishlab/node-acme-client/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssl.com支持ecc ([b5ec047](https://github.com/publishlab/node-acme-client/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.9](https://github.com/publishlab/node-acme-client/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.8](https://github.com/publishlab/node-acme-client/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/acme-client

View File

@@ -3,7 +3,7 @@
"description": "Simple and unopinionated ACME client",
"private": false,
"author": "nmorsman",
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"module": "scr/index.js",
"main": "src/index.js",
@@ -18,7 +18,7 @@
"types"
],
"dependencies": {
"@certd/basic": "^1.37.8",
"@certd/basic": "^1.37.12",
"@peculiar/x509": "^1.11.0",
"asn1js": "^3.0.5",
"axios": "^1.7.2",
@@ -70,5 +70,5 @@
"bugs": {
"url": "https://github.com/publishlab/node-acme-client/issues"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -31,9 +31,32 @@ export const directory = {
sslcom:{
staging: 'https://acme.ssl.com/sslcom-dv-rsa',
production: 'https://acme.ssl.com/sslcom-dv-rsa',
}
ec: 'https://acme.ssl.com/sslcom-dv-ecc',
},
litessl: {
staging: 'https://acme.litessl.com/acme/v2/directory',
production: 'https://acme.litessl.com/acme/v2/directory',
},
};
export function getDirectoryUrl(opts) {
const {sslProvider, pkType} = opts
const list= directory[sslProvider]
if (!list) {
throw new Error(`sslProvider ${sslProvider} not found`)
}
let pkTypePrefix = pkType || 'rsa'
if (pkType) {
pkTypePrefix = pkType.toLowerCase().split("_")[0]
}
if (pkTypePrefix && list[pkTypePrefix]) {
return list[pkTypePrefix]
}
return list.production
}
/**
* Crypto
*/

View File

@@ -117,6 +117,8 @@ export const directory: {
}
};
export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
/**
* Crypto
*/

View File

@@ -3,6 +3,26 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/basic
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/basic

View File

@@ -1 +1 @@
01:14
02:28

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/basic",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,6 +17,7 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"async-lock": "^1.4.1",
"axios": "^1.7.2",
"dayjs": "^1.11.7",
"http-proxy-agent": "^7.0.2",
@@ -46,5 +47,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -1,46 +1,16 @@
import { logger, utils } from './index.js';
// @ts-ignore
import AsyncLock from "async-lock";
export class Locker {
locked: Record<string, any> = {};
private asyncLocker: AsyncLock;
async execute(lockStr: string, callback: any) {
await this.lock(lockStr);
const timeoutId = setTimeout(() => {
logger.warn('Lock timeout,自动解锁', lockStr);
this.unlock(lockStr);
}, 20000);
try {
return await callback();
} finally {
clearTimeout(timeoutId);
this.unlock(lockStr);
}
constructor() {
this.asyncLocker = new AsyncLock();
}
async lock(str: string) {
const isLocked = this.isLocked(str);
if (isLocked) {
let count = 0;
while (true) {
await utils.sleep(100);
if (!this.isLocked(str)) {
break;
}
count++;
if (count > 20) {
throw new Error('Lock timeout');
}
}
}
this.locked[str] = true;
}
unlock(str: string) {
delete this.locked[str];
}
isLocked(str: string) {
return this.locked[str] ?? false;
async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
const timeout = options?.timeout ?? 120000;
return this.asyncLocker.acquire(lockStr, callback, { timeout });
}
}

View File

@@ -0,0 +1,14 @@
import { random } from "lodash-es";
import { locker } from "./dist/utils/util.lock.js";
async function testLocker() {
for (let i = 0; i < 10; i++) {
await locker.execute("test", async () => {
console.log("test", i);
await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
throw new Error("test error");
});
}
}
await testLocker();

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/pipeline
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
**Note:** Version bump only for package @certd/pipeline
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/pipeline
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/pipeline
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/pipeline

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/pipeline",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -18,8 +18,8 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/basic": "^1.37.8",
"@certd/plus-core": "^1.37.8",
"@certd/basic": "^1.37.12",
"@certd/plus-core": "^1.37.12",
"dayjs": "^1.11.7",
"lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13"
@@ -45,5 +45,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-huawei

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
"prettier": "^2.8.8",
"tslib": "^2.8.1"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-iframe

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/jdcloud

View File

@@ -1,13 +1,11 @@
{
"name": "@certd/jdcloud",
"version": "1.37.8",
"version": "1.37.12",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
"scripts": {
"test": "cross-env NODE_CONFIG_DIR=./test/config mocha --recursive --require babel-register",
"dev": "babel src --out-dir babel -w",
"build": "rollup -c ",
"dev-build": "npm run build",
"pub": "npm publish"
@@ -15,7 +13,6 @@
"author": "",
"license": "Apache",
"dependencies": {
"babel-register": "^6.26.0",
"buffer": "^5.0.8",
"create-hash": "^1.1.3",
"create-hmac": "^1.1.6",
@@ -30,8 +27,6 @@
"@rollup/plugin-typescript": "^11.0.0",
"@typescript-eslint/eslint-plugin": "^8.26.1",
"@typescript-eslint/parser": "^8.26.1",
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.6.1",
"chai": "^4.1.2",
"config": "^1.30.0",
"cross-env": "^5.1.4",
@@ -61,5 +56,5 @@
"fetch"
]
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-k8s

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,7 +17,7 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.37.8",
"@certd/basic": "^1.37.12",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
@@ -32,5 +32,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/lib-server
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-server

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/lib-server",
"version": "1.37.8",
"version": "1.37.12",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -28,11 +28,11 @@
],
"license": "AGPL",
"dependencies": {
"@certd/acme-client": "^1.37.8",
"@certd/basic": "^1.37.8",
"@certd/pipeline": "^1.37.8",
"@certd/plugin-lib": "^1.37.8",
"@certd/plus-core": "^1.37.8",
"@certd/acme-client": "^1.37.12",
"@certd/basic": "^1.37.12",
"@certd/pipeline": "^1.37.12",
"@certd/plugin-lib": "^1.37.12",
"@certd/plus-core": "^1.37.12",
"@midwayjs/cache": "3.14.0",
"@midwayjs/core": "3.20.11",
"@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -1,5 +1,5 @@
import { PermissionException, ValidateException } from './exception/index.js';
import { In, Repository, SelectQueryBuilder } from 'typeorm';
import { FindOneOptions, In, Repository, SelectQueryBuilder } from 'typeorm';
import { Inject } from '@midwayjs/core';
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
@@ -238,4 +238,8 @@ export abstract class BaseService<T> {
await this.delete(ids);
}
async findOne(options: FindOneOptions<T>) {
return await this.getRepository().findOne(options);
}
}

View File

@@ -16,7 +16,7 @@ export class SysPublicSettings extends BaseSettings {
static __access__ = 'public';
registerEnabled = false;
userValidTimeEnabled?:boolean = false;
userValidTimeEnabled?: boolean = false;
passwordLoginEnabled = true;
usernameRegisterEnabled = true;
mobileRegisterEnabled = false;
@@ -36,7 +36,7 @@ export class SysPublicSettings extends BaseSettings {
captchaEnabled = false;
//验证码类型
captchaType?: string;
captchaAddonId?:number;
captchaAddonId?: number;
@@ -49,6 +49,14 @@ export class SysPublicSettings extends BaseSettings {
// 固定证书有效期天数0表示不固定
fixedCertExpireDays?: number;
// 第三方OAuth配置
oauthEnabled?: boolean = false;
oauthProviders: Record<string, {
type: string;
title: string;
addonId: number;
}> = {};
}
export class SysPrivateSettings extends BaseSettings {
@@ -69,9 +77,9 @@ export class SysPrivateSettings extends BaseSettings {
type?: string;
config?: any;
} = {
type: 'aliyun',
config: {},
};
type: 'aliyun',
config: {},
};
removeSecret() {
const clone = cloneDeep(this);
@@ -196,7 +204,7 @@ export class SysSuiteSetting extends BaseSettings {
static __key__ = 'sys.suite';
static __access__ = 'private';
enabled:boolean = false;
enabled: boolean = false;
registerGift?: {
productId: number;
@@ -221,11 +229,9 @@ export class SysSafeSetting extends BaseSettings {
static __access__ = 'private';
// 站点隐藏
hidden:SiteHidden = {
hidden: SiteHidden = {
enabled: false,
hiddenOpenApi:false,
hiddenOpenApi: false,
autoHiddenTimes: 5,
};
}

View File

@@ -31,6 +31,7 @@ export type AddonDefine = Registrable & {
[key: string]: AddonInputDefine;
};
showTest?: boolean;
icon?: string;
};
export type AddonInstanceConfig = {

View File

@@ -76,7 +76,7 @@ export class AddonService extends BaseService<AddonEntity> {
getDefineList(addonType: string) {
return addonRegistry.getDefineList();
return addonRegistry.getDefineList(addonType);
}
getDefineByType(type: string, prefix?: string) {
@@ -187,4 +187,14 @@ export class AddonService extends BaseService<AddonEntity> {
});
return this.buildAddonInstanceConfig(res);
}
async getOneByType(req:{addonType:string,type:string,userId:number}) {
return await this.repository.findOne({
where: {
addonType: req.addonType,
type: req.type,
userId: req.userId
}
});
}
}

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/midway-flyway-js

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.37.8",
"version": "1.37.12",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
### Performance Improvements
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-cert

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-cert",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/acme-client": "^1.37.8",
"@certd/basic": "^1.37.8",
"@certd/pipeline": "^1.37.8",
"@certd/plugin-lib": "^1.37.8",
"@certd/acme-client": "^1.37.12",
"@certd/basic": "^1.37.12",
"@certd/pipeline": "^1.37.12",
"@certd/plugin-lib": "^1.37.12",
"@google-cloud/publicca": "^1.3.0",
"dayjs": "^1.11.7",
"jszip": "^3.10.1",
@@ -43,5 +43,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -128,7 +128,7 @@ export class AcmeService {
await this.saveAccountConfig(email, conf);
this.logger.info(`创建新的Accountkey:${email}`);
}
const directoryUrl = acme.directory[this.sslProvider].production;
const directoryUrl = acme.getDirectoryUrl({ sslProvider: this.sslProvider, pkType: this.options.privateKeyType });
if (this.options.useMappingProxy) {
urlMapping.enabled = true;
} else {

View File

@@ -36,6 +36,7 @@ export class CertReader {
detail: CertificateInfo;
//毫秒时间戳
effective: number;
//毫秒时间戳
expires: number;
constructor(certInfo: CertInfo) {
this.cert = certInfo;

View File

@@ -136,6 +136,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
{ value: "letsencrypt", label: "Let's Encrypt免费新手推荐", icon: "simple-icons:letsencrypt" },
{ value: "google", label: "Google免费", icon: "flat-color-icons:google" },
{ value: "zerossl", label: "ZeroSSL免费", icon: "emojione:digit-zero" },
{ value: "litessl", label: "litessl免费", icon: "roentgen:free" },
{ value: "sslcom", label: "SSL.com仅主域名和www免费", icon: "la:expeditedssl" },
{ value: "letsencrypt_staging", label: "Let's Encrypt测试环境IP证书", icon: "simple-icons:letsencrypt" },
],
@@ -250,6 +251,13 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
})
sslcomCommonEabAccessId!: number;
@TaskInput({
title: "litessl公共EAB授权",
isSys: true,
show: false,
})
litesslCommonEabAccessId!: number;
@TaskInput({
title: "EAB授权",
component: {
@@ -262,13 +270,15 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
"需要提供EAB授权" +
"\nZeroSSL请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
"\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)用过一次后会绑定邮箱后续复用EAB要用同一个邮箱" +
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接然后点击编辑按钮查看Secret key和HMAC key",
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接然后点击编辑按钮查看Secret key和HMAC key" +
"\nlitessl:[litesslEAB页面](https://freessl.cn/automation/eab-manager),然后点击新增EAB",
mergeScript: `
return {
show: ctx.compute(({form})=>{
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|| (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
|| (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
|| (form.sslProvider === 'litessl' && !form.litesslCommonEabAccessId)
})
}
`,

View File

@@ -17,6 +17,7 @@
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-unused-vars": "off"
"@typescript-eslint/no-unused-vars": "off",
"max-len": [0, 160, 2, { "ignoreUrls": true }]
}
}

View File

@@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-lib

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-lib",
"private": false,
"version": "1.37.8",
"version": "1.37.12",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -22,8 +22,8 @@
"@alicloud/pop-core": "^1.7.10",
"@alicloud/tea-util": "^1.4.10",
"@aws-sdk/client-s3": "^3.787.0",
"@certd/basic": "^1.37.8",
"@certd/pipeline": "^1.37.8",
"@certd/basic": "^1.37.12",
"@certd/pipeline": "^1.37.12",
"@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.22.0",
"basic-ftp": "^5.0.5",
@@ -35,7 +35,7 @@
"rimraf": "^5.0.5",
"socks": "^2.8.3",
"socks-proxy-agent": "^8.0.4",
"ssh2": "^1.15.0",
"ssh2": "1.17.0",
"strip-ansi": "^7.1.0",
"tencentcloud-sdk-nodejs": "^4.0.1005"
},
@@ -53,5 +53,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
"gitHead": "9acac86ed58616fef31ec4d63021bb221429a425"
}

View File

@@ -7,4 +7,5 @@ export * from "./qiniu/index.js";
export * from "./ctyun/index.js";
export * from "./oss/index.js";
export * from "./s3/index.js";
export * from "./lib/index.js";
export * from "./lib/index.js";
export * from "./service/index.js";

View File

@@ -0,0 +1 @@
export * from "./site-info.js";

View File

@@ -0,0 +1,7 @@
export type SiteInfo = {
siteUrl: string;
};
export interface ISiteInfoGetter {
getSiteInfo(): Promise<SiteInfo>;
}

View File

@@ -36,7 +36,7 @@ export class TencentSslClient {
checkRet(ret: any) {
if (!ret || ret.Error) {
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message);
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message + ",requestId" + ret.RequestId);
}
}
@@ -70,43 +70,33 @@ export class TencentSslClient {
}
async deployCertificateInstance(params: any) {
const client = await this.getSslClient();
const res = await client.DeployCertificateInstance(params);
this.checkRet(res);
return res;
return await this.doRequest("DeployCertificateInstance", params);
}
async DescribeHostUploadUpdateRecordDetail(params: any) {
const client = await this.getSslClient();
const res = await client.request("DescribeHostUploadUpdateRecordDetail", params);
this.checkRet(res);
return res;
return await this.doRequest("DescribeHostUploadUpdateRecordDetail", params);
}
async UploadUpdateCertificateInstance(params: any) {
const client = await this.getSslClient();
const res = await client.request("UploadUpdateCertificateInstance", params);
this.checkRet(res);
return res;
return await this.doRequest("UploadUpdateCertificateInstance", params);
}
async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
const client = await this.getSslClient();
const res = await client.DescribeCertificates({
return await this.doRequest("DescribeCertificates", {
ExpirationSort: "ASC",
...params,
});
this.checkRet(res);
return res;
}
async doRequest(action: string, params: any) {
const client = await this.getSslClient();
if (!client[action]) {
throw new Error(`action ${action} not found`);
try {
const res = await client.request(action, params);
this.checkRet(res);
return res;
} catch (e) {
this.logger.error(`action ${action} error: ${e.message},requestId=${e.RequestId}`);
throw e;
}
const res = await client[action](params);
this.checkRet(res);
return res;
}
}

View File

@@ -19,6 +19,8 @@ RUN apk add --no-cache openjdk8
WORKDIR /app/
COPY --from=builder /workspace/certd-server/ /app/
COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/
ENV LEGO_VERSION=4.22.2
ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
RUN mkdir -p $LEGO_DOWNLOAD_DIR

View File

@@ -3,6 +3,37 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
### Performance Improvements
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
### Performance Improvements
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Performance Improvements

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/ui-client",
"version": "1.37.8",
"version": "1.37.12",
"private": true,
"scripts": {
"dev": "vite --open",
@@ -106,8 +106,8 @@
"zod-defaults": "^0.1.3"
},
"devDependencies": {
"@certd/lib-iframe": "^1.37.8",
"@certd/pipeline": "^1.37.8",
"@certd/lib-iframe": "^1.37.12",
"@certd/pipeline": "^1.37.12",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@types/chai": "^4.3.12",

View File

@@ -1,8 +1,8 @@
<template>
<div id="userLayout" :class="['user-layout-wrapper']">
<div class="login-container flex-center">
<div class="user-layout-content flex-center flex-col">
<div class="top flex flex-col items-center justify-center">
<div class="login-container flex justify-start">
<div class="user-layout-content flex-col justify-start">
<div class="top flex flex-col items-center justify-start">
<div class="header flex flex-row items-center">
<img :src="siteInfo.loginLogo" class="logo" alt="logo" />
<span class="title"></span>
@@ -10,8 +10,9 @@
<div class="desc">{{ siteInfo.slogan }}</div>
</div>
<router-view />
<div class="flex-1 flex flex-col justify-start items-center">
<router-view />
</div>
<div class="footer">
<div class="copyright">
<span v-if="!settingStore.isComm">

View File

@@ -57,6 +57,7 @@ export default {
passwordPlaceholder: "Please enter your password",
mobilePlaceholder: "Please enter your mobile number",
loginButton: "Log In",
bindButton: "Bind Account",
forgotPassword: "Forgot password?",
forgotAdminPassword: "Forgot admin password?",
registerLink: "Register",

View File

@@ -760,6 +760,16 @@ export default {
fixedCertExpireDays: "Fixed Cert Expire Days",
fixedCertExpireDaysHelper: "Fixed cert expiration days, helpful for table list progress bar display",
fixedCertExpireDaysRecommend: "Recommend 90",
enableOauth: "Enable OAuth2 Login",
oauthEnabledHelper: "Whether to enable OAuth2 login",
oauthProviders: "OAuth2 Login Providers",
oauthType: "OAuth2 Login Type",
oauthConfig: "OAuth2 Login Config",
oauthProviderSelectorPlaceholder: "Not Configured",
oauthCallback: "Callback URL",
oauthCallbackHelper: "Copy this URL to the callback address of the OAuth2 login provider",
oauthCallbackCopy: "Copy Callback URL",
},
},
modal: {

View File

@@ -57,6 +57,7 @@ export default {
passwordPlaceholder: "请输入密码",
mobilePlaceholder: "请输入手机号",
loginButton: "登录",
bindButton: "绑定账号",
forgotPassword: "忘记密码?",
forgotAdminPassword: "忘记管理员密码?",
registerLink: "注册",

View File

@@ -604,7 +604,7 @@ export default {
limitUserPipelineCountHelper: "0为不限制",
enableSelfRegistration: "开启自助注册",
enableUserValidityPeriod: "开启用户有效期",
userValidityPeriodHelper: "有效期内用户可正常使用,失效后流水线将被停用",
userValidityPeriodHelper: "有效期内用户可正常使用,失效后用户的流水线将被停用",
enableUsernameRegistration: "开启用户名注册",
enableEmailRegistration: "开启邮箱注册",
proFeature: "专业版功能",
@@ -761,6 +761,16 @@ export default {
fixedCertExpireDays: "固定证书有效期天数",
fixedCertExpireDaysHelper: "固定证书有效期天数,有助于列表进度条整齐显示",
fixedCertExpireDaysRecommend: "推荐90",
enableOauth: "启用第三方登录",
oauthEnabledHelper: "是否启用第三方登录",
oauthProviders: "第三方登录提供商",
oauthType: "第三方登录类型",
oauthConfig: "第三方登录配置",
oauthProviderSelectorPlaceholder: "未配置",
oauthCallback: "回调地址",
oauthCallbackHelper: "复制回调地址,配置到对应提供商的回调地址中",
oauthCallbackCopy: "复制回调地址",
},
},
modal: {

View File

@@ -32,6 +32,14 @@ export const outsideResource = [
path: "/forgotPassword",
component: "/framework/forgot-password/index.vue",
},
{
meta: {
title: "第三方登录回调",
},
name: "oauthCallback",
path: "/oauth/callback/:type",
component: "/framework/oauth/oauth-callback.vue",
},
],
},
...errorPage,

View File

@@ -59,6 +59,17 @@ export type SysPublicSetting = {
// 固定证书有效期天数0表示不固定
fixedCertExpireDays?: number;
// 第三方OAuth配置
oauthEnabled?: boolean;
oauthProviders?: Record<
string,
{
type: string;
title: string;
addonId: number;
}
>;
};
export type SuiteSetting = {
enabled?: boolean;

View File

@@ -1,6 +1,6 @@
<template>
<div class="addon-selector">
<div class="flex-o w-100">
<div class="flex-o w-100 inner">
<!-- <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" v-bind="select" @update:value="onChange" />-->
<span v-if="modelValue" class="mr-5 cd-flex-inline">
<a-tag class="mr-5" color="green">{{ target?.name || modelValue }}</a-tag>
@@ -82,6 +82,7 @@ function createCrudOptionsWithApi(opts: any) {
opts.context = {
api,
addonType: props.addonType,
type: props.type,
};
return createCrudOptions(opts);
}
@@ -174,5 +175,9 @@ async function doRefresh() {
<style lang="less">
.addon-selector {
width: 100%;
.inner {
display: flex;
align-items: center;
}
}
</style>

View File

@@ -1,7 +1,8 @@
import { request } from "/src/api/service";
import { RequestHandleReq } from "/@/components/plugins/lib";
import { AddonTypeDefines } from "./types";
export function createAddonApi(opts: { from: any; addonType: string }) {
export function createAddonApi(opts: { from: any; addonType: string } = { from: "user", addonType: "" }) {
let apiPrefix = "/addon";
if (opts.from === "sys") {
apiPrefix = "/sys/addon";
@@ -128,15 +129,6 @@ export function createAddonApi(opts: { from: any; addonType: string }) {
};
}
export const AddonTypeDefines = {
captcha: {
name: "captcha",
title: "验证码",
showDefault: false,
showTest: false,
},
};
export function getAddonTypeDefine(addonType: string) {
return AddonTypeDefines[addonType];
}

View File

@@ -110,7 +110,8 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
type: "dict-select",
dict: addonTypeDictRef,
search: {
show: false,
show: true,
valueChange: null,
},
column: {
width: 200,
@@ -120,7 +121,14 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
},
editForm: {
component: {
disabled: false,
disabled: true,
},
},
addForm: {
component: {
disabled: compute(({ form }) => {
return form.type ? true : false;
}),
},
},
form: {

View File

@@ -5,7 +5,12 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq,
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const api = context.api;
const addonType = context.addonType;
const type = context.type;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
if (query.query?.body) {
delete query.query.body;
}
return await api.GetList(query);
};
const editRequest = async (req: EditReq) => {
@@ -35,6 +40,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
editRequest,
delRequest,
},
search: {
initialForm: {
addonType: addonType,
type: type,
},
},
form: {
labelCol: {
//固定label宽度
@@ -44,6 +55,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
},
},
addForm: {
initialForm: {
addonType: addonType,
type: type,
},
},
rowHandle: {
width: 200,
},

View File

@@ -20,7 +20,7 @@ import { addonProvide } from "/@/views/certd/addon/common";
export default defineComponent({
name: "AddonManager",
setup() {
const api = createAddonApi();
const api = createAddonApi({ from: "user", addonType: "" });
addonProvide(api);
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });

View File

@@ -0,0 +1,15 @@
export interface AddonTypeDefine {
name: string;
title: string;
showDefault: boolean;
showTest: boolean;
}
export const AddonTypeDefines: Record<string, AddonTypeDefine> = {
captcha: {
name: "captcha",
title: "验证码",
showDefault: false,
showTest: false,
},
};

View File

@@ -184,7 +184,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
name: "AccessSelector",
vModel: "modelValue",
type: compute(({ form }) => {
return form.dnsProviderType;
const type = form.dnsProviderType || "aliyun";
return dnsProviderTypeDict?.dataMap[type]?.accessType;
}),
},
show: compute(({ form }) => {

View File

@@ -22,3 +22,36 @@ export async function UpdateProfile(form: any) {
data: form,
});
}
export async function GetOauthBounds() {
return await request({
url: "/oauth/bounds",
method: "POST",
});
}
export async function GetOauthProviders() {
return await request({
url: "/oauth/providers",
method: "POST",
});
}
export async function UnbindOauth(type: string) {
return await request({
url: "/oauth/unbind",
method: "POST",
data: { type },
});
}
export async function OauthBoundUrl(type: string) {
return await request({
url: "/oauth/login",
method: "POST",
data: {
type,
forType: "bind",
},
});
}

View File

@@ -15,7 +15,14 @@
</a-descriptions-item>
<a-descriptions-item :label="t('authentication.email')">{{ userInfo.email }}</a-descriptions-item>
<a-descriptions-item :label="t('authentication.phoneNumber')">{{ userInfo.phoneCode }}{{ userInfo.mobile }}</a-descriptions-item>
<a-descriptions-item></a-descriptions-item>
<a-descriptions-item v-if="settingStore.sysPublic.oauthEnabled && settingStore.isPlus" label="第三方账号绑定">
<div v-for="item in computedOauthBounds" :key="item.name" class="flex items-center gap-2">
<fs-icon :icon="item.icon" class="mr-2 text-blue-500" />
<span class="mr-2 w-36">{{ item.title }}</span>
<a-button v-if="item.bound" type="link" danger @click="unbind(item.name)">解绑</a-button>
<a-button v-else type="primary" @click="bind(item.name)">绑定</a-button>
</div>
</a-descriptions-item>
<a-descriptions-item :label="t('common.handle')">
<a-button type="primary" @click="doUpdate">{{ t("authentication.updateProfile") }}</a-button>
<change-password-button class="ml-10" :show-button="true"> </change-password-button>
@@ -27,10 +34,12 @@
<script lang="ts" setup>
import * as api from "./api";
import { Ref, ref } from "vue";
import { computed, onMounted, Ref, ref } from "vue";
import ChangePasswordButton from "/@/views/certd/mine/change-password-button.vue";
import { useI18n } from "/src/locales";
import { useUserProfile } from "./use";
import { Modal } from "ant-design-vue";
import { useSettingStore } from "/@/store/settings";
const { t } = useI18n();
@@ -38,13 +47,13 @@ defineOptions({
name: "UserProfile",
});
const settingStore = useSettingStore();
const userInfo: Ref = ref({});
const getUserInfo = async () => {
userInfo.value = await api.getMineInfo();
};
getUserInfo();
const { openEditProfileDialog } = useUserProfile();
function doUpdate() {
@@ -54,4 +63,51 @@ function doUpdate() {
},
});
}
const oauthBounds = ref([]);
const oauthProviders = ref([]);
async function loadOauthBounds() {
const res = await api.GetOauthBounds();
oauthBounds.value = res;
}
async function loadOauthProviders() {
const res = await api.GetOauthProviders();
oauthProviders.value = res;
}
const computedOauthBounds = computed(() => {
const list = oauthProviders.value.map(item => {
const bound = oauthBounds.value.find(bound => bound.type === item.name);
return {
...item,
bound,
};
});
return list;
});
async function unbind(type: string) {
Modal.confirm({
title: "确认解绑吗?",
okText: "确认",
okType: "danger",
onOk: async () => {
await api.UnbindOauth(type);
await loadOauthBounds();
},
});
}
async function bind(type: string) {
//获取第三方登录URL
const res = await api.OauthBoundUrl(type);
const loginUrl = res.loginUrl;
window.location.href = loginUrl;
}
onMounted(async () => {
await getUserInfo();
await loadOauthBounds();
await loadOauthProviders();
});
</script>

View File

@@ -555,10 +555,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
search: {
show: false,
},
type: "text",
type: "textarea",
column: {
width: 200,
sorter: true,
ellipsis: true,
cellRender({ value }) {
return <a-tooltip title={value}>{value}</a-tooltip>;
},

View File

@@ -350,6 +350,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
show: false,
},
column: {
ellipsis: true,
width: 200,
sorter: true,
tooltip: true,

View File

@@ -204,7 +204,7 @@ export function useCertUpload() {
notifications,
};
const id = await api.Save({
const { id } = await api.Save({
title: pipeline.title,
content: JSON.stringify(pipeline),
keepHistoryCount: 30,

View File

@@ -15,8 +15,9 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
import { useCertViewer } from "/@/views/certd/pipeline/use";
import { useI18n } from "/src/locales";
import { GetDetail, GetObj } from "./api";
import { groupDictRef } from "./group/dicts";
export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
export default function ({ crudExpose, context: { selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const router = useRouter();
const lastResRef = ref();
@@ -495,6 +496,11 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
component: {
name: GroupSelector,
vModel: "modelValue",
on: {
refresh: async () => {
await groupDictRef.reloadDict();
},
},
},
},
column: {

View File

@@ -0,0 +1,7 @@
import { dict } from "@fast-crud/fast-crud";
export const groupDictRef = dict({
url: "/pi/pipeline/group/all",
value: "id",
label: "name",
});

View File

@@ -35,6 +35,7 @@
<script setup lang="ts">
import createCrudOptions from "./crud";
import { dict, FsDictSelect } from "@fast-crud/fast-crud";
import { groupDictRef } from "./dicts";
const props = defineProps<{
modelValue?: number;
@@ -43,11 +44,7 @@ const props = defineProps<{
defineOptions({
name: "GroupSelector",
});
const groupDictRef = dict({
url: "/pi/pipeline/group/all",
value: "id",
label: "name",
});
const emit = defineEmits(["refresh", "update:modelValue"]);
function doRefresh() {
emit("refresh");

View File

@@ -35,19 +35,14 @@ import { useI18n } from "/src/locales";
const { t } = useI18n();
import ChangeNotification from "/@/views/certd/pipeline/components/change-notification.vue";
import { useSettingStore } from "/@/store/settings";
import { groupDictRef } from "./group/dicts";
defineOptions({
name: "PipelineManager",
});
const groupDictRef = dict({
url: "/pi/pipeline/group/all",
value: "id",
label: "name",
});
const selectedRowKeys = ref([]);
const context: any = {
groupDictRef,
selectedRowKeys,
};
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });

View File

@@ -48,24 +48,26 @@
</a-tabs>
<a-form-item>
<a-button type="primary" size="large" html-type="button" :loading="loading" class="login-button" @click="handleFinish">
{{ t("authentication.loginButton") }}
{{ queryBindCode ? t("authentication.bindButton") : t("authentication.loginButton") }}
</a-button>
<div v-if="!!settingStore.sysPublic.selfServicePasswordRetrievalEnabled" class="mt-2">
<router-link :to="{ name: 'forgotPassword' }">
{{ t("authentication.forgotPassword") }}
</router-link>
</div>
</a-form-item>
<div class="mt-2 flex justify-between items-center">
<div class="flex items-center gap-2">
<language-toggle class="text-blue-500"></language-toggle>
<router-link v-if="!!settingStore.sysPublic.selfServicePasswordRetrievalEnabled && !queryBindCode" :to="{ name: 'forgotPassword' }">
{{ t("authentication.forgotPassword") }}
</router-link>
</div>
<a-form-item class="user-login-other">
<div class="flex flex-between justify-between items-center">
<language-toggle class="color-blue"></language-toggle>
<router-link v-if="hasRegisterTypeEnabled()" class="register" :to="{ name: 'register' }">
<router-link v-if="hasRegisterTypeEnabled() && !queryBindCode" class="register" :to="{ name: 'register' }">
{{ t("authentication.registerLink") }}
</router-link>
</div>
</a-form-item>
<div v-if="!queryBindCode && settingStore.sysPublic.oauthEnabled && settingStore.isPlus" class="w-full">
<oauth-footer></oauth-footer>
</div>
</a-form>
<a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
<div class="mb-10 flex flex-center">请打开您的Authenticator APP获取动态验证码</div>
@@ -80,7 +82,7 @@
<loading-button type="primary" size="large" html-type="button" class="login-button" :click="handleTwoFactorSubmit">OTP验证登录</loading-button>
</a-form-item>
<a-form-item class="user-login-other">
<a-form-item class="mt-10">
<a class="register" @click="twoFactor.loginId = null"> 返回 </a>
</a-form-item>
</a-form>
@@ -96,12 +98,18 @@ import { useI18n } from "/@/locales";
import { LanguageToggle } from "/@/vben/layouts";
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
import { useRoute } from "vue-router";
import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
import * as oauthApi from "../oauth/api";
import { notification } from "ant-design-vue";
export default defineComponent({
name: "LoginPage",
components: { LanguageToggle, SmsCode, CaptchaInput },
components: { LanguageToggle, SmsCode, CaptchaInput, OauthFooter },
setup() {
const { t } = useI18n();
const route = useRoute();
const queryBindCode = ref(route.query.bindCode as string | undefined);
const urlLoginType = route.query.loginType as string | undefined;
const verifyCodeInputRef = ref();
const loading = ref(false);
@@ -160,6 +168,13 @@ export default defineComponent({
},
};
async function afterLoginSuccess() {
if (queryBindCode.value) {
await oauthApi.BindUser(queryBindCode.value);
notification.success({ message: "绑定第三方账号成功" });
}
}
const twoFactor = reactive({
loginId: "",
verifyCode: "",
@@ -167,6 +182,7 @@ export default defineComponent({
const handleTwoFactorSubmit = async () => {
await userStore.loginByTwoFactor(twoFactor);
afterLoginSuccess();
};
const handleFinish = async () => {
@@ -178,6 +194,7 @@ export default defineComponent({
// }
const loginType = formState.loginType;
await userStore.login(loginType, toRaw(formState));
afterLoginSuccess();
} catch (e: any) {
//@ts-ignore
if (e.code === 10020) {
@@ -233,6 +250,7 @@ export default defineComponent({
settingStore,
captchaInputRef,
captchaInputForSmsCode,
queryBindCode,
};
},
});

View File

@@ -0,0 +1,54 @@
import { request } from "/src/api/service";
const apiPrefix = "/oauth";
export async function OauthLogin(type: string, forType?: string, from?: string) {
return await request({
url: apiPrefix + `/login`,
method: "post",
data: {
type,
forType: forType || "login",
from: from || "web",
},
});
}
export async function OauthToken(type: string, validationCode: string) {
return await request({
url: apiPrefix + `/token`,
method: "post",
data: {
type,
validationCode,
},
});
}
export async function AutoRegister(type: string, code: string) {
return await request({
url: apiPrefix + `/autoRegister`,
method: "post",
data: {
validationCode: code,
type,
},
});
}
export async function BindUser(code: string) {
return await request({
url: apiPrefix + `/bind`,
method: "post",
data: {
validationCode: code,
},
});
}
export async function GetOauthProviders() {
return await request({
url: apiPrefix + "/providers",
method: "post",
});
}

View File

@@ -0,0 +1,127 @@
<template>
<div class="oauth-callback-page">
<div class="oauth-callback-content">
<div v-if="!bindRequired" class="oauth-callback-title">
<span v-if="!error">登录中...</span>
<span v-else>{{ error }}</span>
</div>
<div v-else class="oauth-callback-title mt-10">
<div>第三方{{ oauthType }}登录成功您还未绑定账号请选择</div>
<div class="mt-10">
<a-button class="w-full mt-10" type="primary" @click="goBindUser">绑定已有账号</a-button>
<a-button v-if="settingStore.sysPublic.registerEnabled" class="w-full mt-10" type="primary" @click="autoRegister">创建新账号</a-button>
</div>
<div class="w-full mt-10">
<router-link to="/login" class="w-full mt-10" type="primary">返回登录页</router-link>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted } from "vue";
import * as api from "./api";
import { useRoute, useRouter } from "vue-router";
import { useUserStore } from "/@/store/user";
import { notification } from "ant-design-vue";
import { useSettingStore } from "/@/store/settings";
const route = useRoute();
const router = useRouter();
const settingStore = useSettingStore();
const oauthType = route.params.type as string;
const validationCode = route.query.validationCode as string;
const forType = route.query.forType as string;
const error = ref(route.query.error as string);
const userStore = useUserStore();
const bindRequired = ref(false);
const bindCode = ref("");
async function handleOauthToken() {
//处理第三方登录回调
const res = await api.OauthToken(oauthType, validationCode);
if (res.token) {
//登录成功
userStore.onLoginSuccess(res);
//跳转到首页
router.replace("/");
return;
}
if (res.bindRequired) {
//需要绑定
bindRequired.value = true;
bindCode.value = res.validationCode;
}
}
onMounted(async () => {
if (error.value) {
return;
}
if (forType === "bind") {
//绑定第三方账号
await api.BindUser(validationCode);
notification.success({
message: "绑定成功",
});
//跳转到首页
router.replace("/certd/mine/user-profile");
return;
}
await handleOauthToken();
});
async function goBindUser() {
//绑定已有账号
router.replace({
path: "/login",
query: {
bindCode: bindCode.value,
},
});
}
async function autoRegister() {
//自动注册账号
const res = await api.AutoRegister(oauthType, bindCode.value);
//登录成功
userStore.onLoginSuccess(res);
//跳转到首页
router.replace("/");
}
</script>
<style lang="less">
.oauth-callback-page {
display: flex;
justify-content: center;
align-items: center;
gap: 16px;
width: 100%;
.oauth-callback-content {
display: flex;
justify-content: center;
align-items: center;
gap: 16px;
padding: 16px;
border-radius: 16px;
box-shadow: 0 0 16px rgba(0, 0, 0, 0.1);
width: 500px;
max-width: 90%;
margin: 0 auto;
margin-top: 50px;
margin-bottom: 100px;
min-height: 200px;
.oauth-callback-title {
font-size: 16px;
font-weight: 500;
}
}
}
</style>

View File

@@ -0,0 +1,88 @@
<template>
<div class="oauth-footer relative">
<div class="oauth-title">
<div class="oauth-title-text">其他方式登录</div>
</div>
<div class="flex justify-center items-center gap-4">
<template v-for="item in oauthProviderList" :key="item.type">
<div v-if="item.addonId" class="oauth-icon-button pointer" @click="goOauthLogin(item.name)">
<div><fs-icon :icon="item.icon" class="text-blue-600 text-40" /></div>
<div>{{ item.addonTitle || item.title }}</div>
</div>
</template>
</div>
</div>
</template>
<script setup lang="ts">
import { onMounted, ref } from "vue";
import * as api from "./api";
const oauthProviderList = ref([]);
onMounted(async () => {
oauthProviderList.value = await api.GetOauthProviders();
});
async function goOauthLogin(type: string) {
//获取第三方登录URL
const from = "web";
const res = await api.OauthLogin(type, from);
const loginUrl = res.loginUrl;
window.location.href = loginUrl;
}
</script>
<style lang="less">
.oauth-footer {
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 16px;
.oauth-title {
width: 100%;
font-size: 14px;
font-weight: 500;
color: #8c8c8c;
position: relative;
.oauth-title-text {
position: relative;
z-index: 1;
text-align: center;
&::after {
content: "";
position: absolute;
top: 50%;
left: 0;
width: 36%;
height: 0.5px;
background-color: #8c8c8c;
}
&::before {
content: "";
position: absolute;
top: 50%;
right: 0;
width: 36%;
height: 0.5px;
background-color: #8c8c8c;
}
}
}
.oauth-icon-button {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 8px;
padding: 8px 8px;
border-radius: 100px;
.fs-icon {
font-size: 36px;
color: #006be6 !important;
}
}
}
</style>

View File

@@ -93,6 +93,7 @@ export type PluginConfigBean = {
export type CertApplyPluginSysInput = {
googleCommonEabAccessId?: number;
zerosslCommonEabAccessId?: number;
litesslCommonEabAccessId?: number;
};
export type PluginSysSetting<T> = {
sysSetting: {

View File

@@ -26,6 +26,16 @@
</div>
</a-form-item>
<a-form-item label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
<access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonEabAccessId" type="eab" from="sys"></access-selector>
<div class="helper">
<div>设置公共litessl EAB授权给用户使用避免用户自己获取litessl EAB授权</div>
<div>
<a href="https://freessl.cn/automation/eab-manager">litessl EAB授权管理 </a>
</div>
</div>
</a-form-item>
<a-form-item :wrapper-col="{ offset: 8, span: 16 }">
<a-button :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
</a-form-item>

View File

@@ -111,3 +111,10 @@ export async function GetSmsTypeDefine(type: string) {
},
});
}
export async function GetOauthProviders() {
return await request({
url: "/oauth/providers",
method: "post",
});
}

View File

@@ -66,7 +66,7 @@ function onChange(value: string) {
<style lang="less">
.page-sys-settings {
.sys-settings-form {
width: 800px;
width: 900px;
max-width: 100%;
padding: 20px;
}

View File

@@ -56,6 +56,44 @@
</template>
</template>
<a-form-item :label="t('certd.sys.setting.enableOauth')" :name="['public', 'oauthEnabled']">
<div class="flex-o">
<a-switch v-model:checked="formState.public.oauthEnabled" :disabled="!settingsStore.isPlus" :title="t('certd.plusFeature')" />
<vip-button class="ml-5" mode="button"></vip-button>
</div>
</a-form-item>
<a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthProviders')" :name="['public', 'oauthProviders']">
<div class="flex flex-wrap">
<table class="w-full table-auto border-collapse border border-gray-400">
<thead>
<tr>
<th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.oauthType") }}</th>
<th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.oauthCallback") }}</th>
<th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.oauthConfig") }}</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, key) of oauthProviders" :key="key">
<td class="border border-gray-300 px-4 py-2">
<div class="flex items-center" :title="item.desc">
<fs-icon :icon="item.icon" class="mr-2 text-blue-600" />
{{ item.title }}
</div>
</td>
<td class="border border-gray-300 px-4 py-2 overflow-ellipsis" :title="t('certd.sys.setting.oauthCallbackHelper')">
<fs-copyable :model-value="buildCallbackUrl(item.name)">
{{ t("certd.sys.setting.oauthCallbackCopy") }}
</fs-copyable>
</td>
<td class="border border-gray-300 px-4 py-2">
<AddonSelector v-model:model-value="item.addonId" addon-type="oauth" from="sys" :type="item.name" :placeholder="t('certd.sys.setting.oauthProviderSelectorPlaceholder')" />
</td>
</tr>
</tbody>
</table>
</div>
</a-form-item>
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
<a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
</a-form-item>
@@ -64,14 +102,14 @@
</template>
<script setup lang="tsx">
import { reactive, ref, Ref } from "vue";
import { GetSmsTypeDefine, SysSettings } from "/@/views/sys/settings/api";
import * as api from "/@/views/sys/settings/api";
import { merge } from "lodash-es";
import { useSettingStore } from "/@/store/settings";
import { notification } from "ant-design-vue";
import { merge } from "lodash-es";
import { reactive, ref, Ref } from "vue";
import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
import { useSettingStore } from "/@/store/settings";
import * as api from "/@/views/sys/settings/api";
import { SysSettings } from "/@/views/sys/settings/api";
import { useI18n } from "/src/locales";
const { t } = useI18n();
defineOptions({
@@ -158,6 +196,26 @@ async function loadTypeDefine(type: string) {
smsTypeDefineInputs.value = inputs;
}
const oauthProviders = ref([]);
async function loadOauthProviders() {
oauthProviders.value = await api.GetOauthProviders();
}
function fillOauthProviders(form: any) {
const providers: any = {};
for (const item of oauthProviders.value) {
const type = item.name;
providers[type] = {
type: type,
title: item.title,
icon: item.icon,
addonId: item.addonId || null,
};
}
form.public.oauthProviders = providers;
return providers;
}
async function loadSysSettings() {
const data: any = await api.SysSettingsGet();
merge(formState, data);
@@ -172,6 +230,7 @@ async function loadSysSettings() {
if (!settingsStore.isComm) {
formState.public.smsLoginEnabled = false;
}
await loadOauthProviders();
}
const saveLoading = ref(false);
@@ -180,6 +239,7 @@ const settingsStore = useSettingStore();
const onFinish = async (form: any) => {
try {
saveLoading.value = true;
fillOauthProviders(form);
await api.SysSettingsSave(form);
await settingsStore.loadSysSettings();
notification.success({
@@ -189,8 +249,19 @@ const onFinish = async (form: any) => {
saveLoading.value = false;
}
};
function buildCallbackUrl(type: string) {
return `${window.location.origin}/api/oauth/callback/${type}`;
}
</script>
<style lang="less">
.sys-settings-site {
.sys-settings-register {
width: 1000px !important;
.addon-selector {
.inner {
justify-content: space-between;
}
}
}
</style>

View File

@@ -3,6 +3,40 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
### Bug Fixes
* 修复waf tls版本号小写 ([0adcc6a](https://github.com/certd/certd/commit/0adcc6a8d194469be0c26940ed4837fb34929b68))
### Performance Improvements
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
### Performance Improvements
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes

View File

@@ -0,0 +1,14 @@
CREATE TABLE `cd_oauth_bound`
(
`id` bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
`user_id` bigint NOT NULL,
`type` varchar(512) NOT NULL,
`open_id` varchar(512) NOT NULL,
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
);
CREATE INDEX `index_oauth_bound_user_id` ON `cd_oauth_bound` (`user_id`);
CREATE INDEX `index_oauth_bound_open_id` ON `cd_oauth_bound` (`open_id`);

View File

@@ -0,0 +1,14 @@
CREATE TABLE "cd_oauth_bound"
(
"id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
"user_id" bigint NOT NULL,
"type" varchar(512) NOT NULL,
"open_id" varchar(512) NOT NULL,
"create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
"update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
);
CREATE INDEX "index_oauth_bound_user_id" ON "cd_oauth_bound" ("user_id");
CREATE INDEX "index_oauth_bound_open_id" ON "cd_oauth_bound" ("open_id");

View File

@@ -0,0 +1,14 @@
CREATE TABLE "cd_oauth_bound"
(
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
"user_id" integer NOT NULL,
"type" varchar(512) NOT NULL,
"open_id" varchar(512) NOT NULL,
"create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
"update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
);
CREATE INDEX "index_oauth_bound_user_id" ON "cd_oauth_bound" ("user_id");
CREATE INDEX "index_oauth_bound_open_id" ON "cd_oauth_bound" ("open_id");

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/ui-server",
"version": "1.37.8",
"version": "1.37.12",
"description": "fast-server base midway",
"private": true,
"type": "module",
@@ -45,20 +45,20 @@
"@aws-sdk/client-cloudfront": "^3.699.0",
"@aws-sdk/client-iam": "^3.699.0",
"@aws-sdk/client-s3": "^3.705.0",
"@certd/acme-client": "^1.37.8",
"@certd/basic": "^1.37.8",
"@certd/commercial-core": "^1.37.8",
"@certd/acme-client": "^1.37.12",
"@certd/basic": "^1.37.12",
"@certd/commercial-core": "^1.37.12",
"@certd/cv4pve-api-javascript": "^8.4.2",
"@certd/jdcloud": "^1.37.8",
"@certd/lib-huawei": "^1.37.8",
"@certd/lib-k8s": "^1.37.8",
"@certd/lib-server": "^1.37.8",
"@certd/midway-flyway-js": "^1.37.8",
"@certd/pipeline": "^1.37.8",
"@certd/plugin-cert": "^1.37.8",
"@certd/plugin-lib": "^1.37.8",
"@certd/plugin-plus": "^1.37.8",
"@certd/plus-core": "^1.37.8",
"@certd/jdcloud": "^1.37.12",
"@certd/lib-huawei": "^1.37.12",
"@certd/lib-k8s": "^1.37.12",
"@certd/lib-server": "^1.37.12",
"@certd/midway-flyway-js": "^1.37.12",
"@certd/pipeline": "^1.37.12",
"@certd/plugin-cert": "^1.37.12",
"@certd/plugin-lib": "^1.37.12",
"@certd/plugin-plus": "^1.37.12",
"@certd/plus-core": "^1.37.12",
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
"@koa/cors": "^5.0.0",
@@ -106,6 +106,7 @@
"nanoid": "^5.0.7",
"node-forge": "^1.3.1",
"nodemailer": "^6.9.16",
"openid-client": "^6.8.1",
"otplib": "^12.0.1",
"pg": "^8.12.0",
"psl": "^1.9.0",

View File

@@ -8,7 +8,7 @@ import { LoginService } from "../../../modules/login/service/login-service.js";
*/
@Provide()
@Controller('/api')
export class LoginController extends BaseController {
export class ForgotPasswordController extends BaseController {
@Inject()
loginService: LoginService;
@Inject()

View File

@@ -0,0 +1,251 @@
import { addonRegistry, AddonService, BaseController, Constants, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
import { ALL, Body, Controller, Get, Inject, Param, Post, Provide, Query } from "@midwayjs/core";
import { AddonGetterService } from "../../../modules/pipeline/service/addon-getter-service.js";
import { IOauthProvider } from "../../../plugins/plugin-oauth/api.js";
import { LoginService } from "../../../modules/login/service/login-service.js";
import { CodeService } from "../../../modules/basic/service/code-service.js";
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
import { UserEntity } from "../../../modules/sys/authority/entity/user.js";
import { logger, simpleNanoId, utils } from "@certd/basic";
import { OauthBoundService } from "../../../modules/login/service/oauth-bound-service.js";
import { OauthBoundEntity } from "../../../modules/login/entity/oauth-bound.js";
import { checkPlus } from "@certd/plus-core";
/**
*/
@Provide()
@Controller('/api/oauth')
export class ConnectController extends BaseController {
@Inject()
addonGetterService: AddonGetterService;
@Inject()
sysSettingsService: SysSettingsService;
@Inject()
loginService: LoginService;
@Inject()
codeService: CodeService;
@Inject()
userService: UserService;
@Inject()
oauthBoundService: OauthBoundService;
@Inject()
addonService: AddonService;
private async getOauthProvider(type: string) {
const publicSettings = await this.sysSettingsService.getPublicSettings()
if (!publicSettings?.oauthEnabled) {
throw new Error("OAuth功能未启用");
}
const setting = publicSettings?.oauthProviders?.[type || ""]
if (!setting) {
throw new Error(`未配置该OAuth类型:${type}`);
}
const addon = await this.addonGetterService.getAddonById(setting.addonId, true, 0);
if (!addon) {
throw new Error("初始化OAuth插件失败");
}
return addon as IOauthProvider;
}
@Post('/login', { summary: Constants.per.guest })
public async login(@Body(ALL) body: { type: string, forType?:string ,from?:string }) {
const addon = await this.getOauthProvider(body.type);
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
const bindUrl = installInfo?.bindUrl || "";
//构造登录url
const redirectUrl = `${bindUrl}api/oauth/callback/${body.type}`;
const { loginUrl, ticketValue } = await addon.buildLoginUrl({ redirectUri: redirectUrl, forType: body.forType ,from: body.from || "web" });
const ticket = this.codeService.setValidationValue(ticketValue)
this.ctx.cookies.set("oauth_ticket", ticket, {
httpOnly: true,
// secure: true,
// sameSite: "strict",
})
return this.ok({ loginUrl, ticket });
}
@Get('/callback/:type', { summary: Constants.per.guest })
public async callback(@Param('type') type: string, @Query() query: Record<string, string>) {
checkPlus()
//处理登录回调
const addon = await this.getOauthProvider(type);
const request = this.ctx.request;
// const ticketValue = this.codeService.getValidationValue(ticket);
// if (!ticketValue) {
// throw new Error("登录ticket已过期");
// }
const ticket = this.ctx.cookies.get("oauth_ticket");
if (!ticket) {
throw new Error("ticket已过期");
}
const ticketValue = this.codeService.getValidationValue(ticket);
if (!ticketValue) {
throw new Error("ticketValue已过期");
}
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
const bindUrl = installInfo?.bindUrl || "";
const currentUrl = `${bindUrl}api/oauth/callback/${type}?${request.querystring}`
try {
const tokenRes = await addon.onCallback({
code: query.code,
state: query.state,
ticketValue,
currentURL: new URL(currentUrl)
});
const userInfo = tokenRes.userInfo;
const validationCode = await this.codeService.setValidationValue({
type,
userInfo,
});
const state = JSON.parse(utils.hash.base64Decode(query.state));
const redirectUrl = `${bindUrl}#/oauth/callback/${type}?validationCode=${validationCode}&forType=${state.forType}`;
this.ctx.redirect(redirectUrl);
} catch (err) {
logger.error(err);
this.ctx.redirect(`${bindUrl}#/oauth/callback/${type}?error=${err.error_description || err.message}`);
}
}
@Post('/token', { summary: Constants.per.guest })
public async token(@Body(ALL) body: { validationCode: string, type: string }) {
checkPlus()
const validationValue = await this.codeService.getValidationValue(body.validationCode);
if (!validationValue) {
throw new Error("校验码错误");
}
const type = validationValue.type;
if (type !== body.type) {
throw new Error("校验码错误");
}
const userInfo = validationValue.userInfo;
const openId = userInfo.openId;
const loginRes = await this.loginService.loginByOpenId({ openId, type });
if (loginRes == null) {
return this.ok({
bindRequired: true,
validationCode: body.validationCode,
});
}
//返回登录成功token
return this.ok(loginRes);
}
@Post('/autoRegister', { summary: Constants.per.guest })
public async autoRegister(@Body(ALL) body: { validationCode: string, type: string }) {
const validationValue = this.codeService.getValidationValue(body.validationCode);
if (!validationValue) {
throw new Error("第三方认证授权已过期");
}
const userInfo = validationValue.userInfo;
const oauthType = validationValue.type;
let newUser = new UserEntity()
newUser.username = `${oauthType}_${userInfo.nickName}_${simpleNanoId(6)}`;
newUser.avatar = userInfo.avatar;
newUser.nickName = userInfo.nickName || simpleNanoId(6);
newUser = await this.userService.register("username", newUser, async (txManager) => {
const oauthBound: OauthBoundEntity = new OauthBoundEntity()
oauthBound.userId = newUser.id;
oauthBound.type = oauthType;
oauthBound.openId = userInfo.openId;
await txManager.save(oauthBound);
});
const loginRes = await this.loginService.generateToken(newUser);
return this.ok(loginRes);
}
@Post('/bind', { summary: Constants.per.loginOnly })
public async bind(@Body(ALL) body: any) {
//需要已登录
const userId = this.getUserId();
const validationValue = this.codeService.getValidationValue(body.validationCode);
if (!validationValue) {
throw new Error("校验码错误");
}
const type = validationValue.type;
const userInfo = validationValue.userInfo;
const openId = userInfo.openId;
await this.oauthBoundService.bind({
userId,
type,
openId,
});
return this.ok(1);
}
@Post('/unbind', { summary: Constants.per.loginOnly })
public async unbind(@Body(ALL) body: any) {
//需要已登录
const userId = this.getUserId();
await this.oauthBoundService.unbind({
userId,
type: body.type,
});
return this.ok(1);
}
@Post('/bounds', { summary: Constants.per.loginOnly })
public async bounds(@Body(ALL) body: any) {
//需要已登录
const userId = this.getUserId();
const bounds = await this.oauthBoundService.find({
where :{
userId,
}
});
return this.ok(bounds);
}
@Post('/providers', { summary: Constants.per.guest })
public async providers() {
const defineList = addonRegistry.getDefineList("oauth");
const publicSetting = await this.sysSettingsService.getPublicSettings();
const oauthProviders = publicSetting.oauthProviders || {};
const list = [];
for (const item of defineList) {
const type = item.name
const conf = oauthProviders[type];
const provider:any = {
...item,
}
delete provider.input
if (conf && conf.addonId) {
const addonEntity = await this.addonService.info(conf.addonId);
if (addonEntity) {
provider.addonId = conf.addonId;
provider.addonTitle = addonEntity.name;
}
}
list.push(provider);
}
return this.ok(list);
}
}

View File

@@ -1,5 +1,6 @@
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
import {
addonRegistry,
CrudController,
SysPrivateSettings,
SysPublicSettings,
@@ -199,4 +200,10 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
await this.codeService.checkCaptcha(body)
return this.ok({});
}
@Post('/oauth/providers', { summary: 'sys:settings:view' })
async oauthProviders() {
const list = await addonRegistry.getDefineList("oauth");
return this.ok(list);
}
}

View File

@@ -1,5 +1,5 @@
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { cache, isDev, randomNumber } from '@certd/basic';
import { cache, isDev, randomNumber, simpleNanoId } from '@certd/basic';
import { SysSettingsService, SysSiteInfo } from '@certd/lib-server';
import { SmsServiceFactory } from '../sms/factory.js';
import { ISmsService } from '../sms/api.js';
@@ -188,4 +188,20 @@ export class CodeService {
`
);
}
buildValidationValueKey(code:string) {
return `validationValue:${code}`;
}
setValidationValue(value:any) {
const randomCode = simpleNanoId(12);
const key = this.buildValidationValueKey(randomCode);
cache.set(key, value, {
ttl: 5 * 60 * 1000, //5分钟
});
return randomCode;
}
getValidationValue(code:string) {
return cache.get(this.buildValidationValueKey(code));
}
}

View File

@@ -0,0 +1,22 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
@Entity('cd_oauth_bound')
export class OauthBoundEntity {
@PrimaryGeneratedColumn()
id: number;
@Column({ name: 'user_id', comment: '用户id' })
userId: number;
@Column({ name: 'type', comment: '第三方类型' })
type: string; // oidc, wechat, github, gitee , qq , alipay
@Column({ name: 'open_id', comment: '第三方openid' })
openId: string;
@Column({ name: 'create_time',comment: '创建时间', default: () => 'CURRENT_TIMESTAMP',})
createTime: Date;
@Column({ name: 'update_time', comment: '修改时间',default: () => 'CURRENT_TIMESTAMP',})
updateTime: Date;
}

View File

@@ -17,9 +17,9 @@ import { TwoFactorService } from "../../mine/service/two-factor-service.js";
import { UserSettingsService } from "../../mine/service/user-settings-service.js";
import { isPlus } from "@certd/plus-core";
import { AddonService } from "@certd/lib-server";
import { OauthBoundService } from "./oauth-bound-service.js";
/**
* 系统用户
*/
@Provide()
@Scope(ScopeEnum.Request, {allowDowngrade: true})
@@ -42,6 +42,8 @@ export class LoginService {
twoFactorService: TwoFactorService;
@Inject()
addonService: AddonService;
@Inject()
oauthBoundService: OauthBoundService;
checkIsBlocked(username: string) {
const blockDurationKey = `login_block_duration:${username}`;
@@ -204,6 +206,10 @@ export class LoginService {
* @param roleIds
*/
async generateToken(user: UserEntity) {
if (user.status === 0) {
throw new CommonException('用户已被禁用');
}
const roleIds = await this.roleService.getRoleIdsByUserId(user.id);
const tokenInfo = {
username: user.username,
@@ -224,4 +230,20 @@ export class LoginService {
expire,
};
}
async loginByOpenId(req: { openId: string, type:string }) {
const {openId, type} = req;
const oauthBound = await this.oauthBoundService.findOne({
where:{openId, type}
});
if (oauthBound == null) {
return null
}
const info = await this.userService.findOne({id: oauthBound.userId});
if (info == null) {
throw new CommonException('用户不存在');
}
return this.generateToken(info);
}
}

View File

@@ -0,0 +1,77 @@
import { BaseService, SysSettingsService } from "@certd/lib-server";
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
import { InjectEntityModel } from "@midwayjs/typeorm";
import { Repository } from "typeorm";
import { OauthBoundEntity } from "../entity/oauth-bound.js";
@Provide()
@Scope(ScopeEnum.Request, { allowDowngrade: true })
export class OauthBoundService extends BaseService<OauthBoundEntity> {
@InjectEntityModel(OauthBoundEntity)
repository: Repository<OauthBoundEntity>;
@Inject()
sysSettingsService: SysSettingsService;
//@ts-ignore
getRepository() {
return this.repository;
}
async unbind(req: { userId: any; type: any; }) {
const { userId, type } = req;
if (!userId || !type) {
throw new Error('参数错误');
}
await this.repository.delete({
userId,
type,
});
}
async bind(req: { userId: any; type: any; openId: any; }) {
const { userId, type, openId } = req;
if (!userId || !type || !openId) {
throw new Error('参数错误');
}
const exist = await this.repository.findOne({
where: {
openId,
type,
},
});
if (exist ) {
if(exist.userId === userId){
return;
}
throw new Error('该第三方账号已绑定其他用户');
}
const exist2 = await this.repository.findOne({
where: {
userId,
type,
},
});
if (exist2) {
//覆盖绑定
exist2.openId = openId;
await this.update({
id: exist2.id,
openId,
});
return;
}
//新增
await this.add({
userId,
type,
openId,
});
}
}

View File

@@ -0,0 +1,20 @@
import { SysSettingsService, SysInstallInfo } from "@certd/lib-server";
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
import { SiteInfo ,ISiteInfoGetter} from "@certd/plugin-lib";
@Provide("siteInfoGetter")
@Scope(ScopeEnum.Request, { allowDowngrade: true })
export class SiteInfoGetter implements ISiteInfoGetter{
@Inject()
sysSettingsService: SysSettingsService;
async getSiteInfo(): Promise<SiteInfo> {
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
return {
siteUrl: installInfo?.bindUrl || "",
}
}
}

View File

@@ -1,6 +1,6 @@
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { InjectEntityModel } from '@midwayjs/typeorm';
import {In, MoreThan, Not, Repository} from 'typeorm';
import {EntityManager, In, MoreThan, Not, Repository} from 'typeorm';
import { UserEntity } from '../entity/user.js';
import * as _ from 'lodash-es';
import { BaseService, CommonException, Constants, FileService, SysInstallInfo, SysSettingsService } from '@certd/lib-server';
@@ -171,7 +171,7 @@ export class UserService extends BaseService<UserEntity> {
return await this.roleService.getPermissionByRoleIds(roleIds);
}
async register(type: string, user: UserEntity) {
async register(type: string, user: UserEntity,withTx?:(tx: EntityManager)=>Promise<void>) {
if (!user.password) {
user.password = simpleNanoId();
}
@@ -225,8 +225,13 @@ export class UserService extends BaseService<UserEntity> {
await this.transaction(async txManager => {
newUser = await txManager.save(newUser);
user.id = newUser.id;
const userRole: UserRoleEntity = UserRoleEntity.of(newUser.id, Constants.role.defaultUser);
await txManager.save(userRole);
if(withTx) {
await withTx(txManager);
}
});
delete newUser.password;

Some files were not shown because too many files have changed in this diff Show More