Skip to content

Commit 38ee12f

Browse files
committed
feat: add EAB supports for ACME user register #1255
1 parent e510ae7 commit 38ee12f

File tree

24 files changed

+3775
-2599
lines changed

24 files changed

+3775
-2599
lines changed

.air.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tmp_dir = "tmp"
77

88
[build]
99
# Just plain old shell command. You could use `make` as well.
10-
cmd = "CGO_ENABLED=1 go build -trimpath -tags=jsoniter,unembed -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'\" -v -o ./tmp/main ."
10+
cmd = "CGO_ENABLED=1 go build -tags=jsoniter,unembed -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'\" -v -o ./tmp/main ."
1111
# Binary file yields from `cmd`.
1212
bin = "tmp/main"
1313
# Customize binary.

api/certificate/acme_user.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ func CreateAcmeUser(c *gin.Context) {
2929
"ca_dir": "omitempty",
3030
"proxy": "omitempty",
3131
"register_on_startup": "omitempty",
32+
"eab_key_id": "omitempty",
33+
"eab_hmac_key": "omitempty",
3234
}).BeforeExecuteHook(func(ctx *cosy.Ctx[model.AcmeUser]) {
3335
if ctx.Model.CADir == "" {
3436
ctx.Model.CADir = settings.CertSettings.GetCADir()
@@ -48,6 +50,8 @@ func ModifyAcmeUser(c *gin.Context) {
4850
"ca_dir": "omitempty",
4951
"proxy": "omitempty",
5052
"register_on_startup": "omitempty",
53+
"eab_key_id": "omitempty",
54+
"eab_hmac_key": "omitempty",
5155
}).BeforeExecuteHook(func(ctx *cosy.Ctx[model.AcmeUser]) {
5256
if ctx.Model.CADir == "" {
5357
ctx.Model.CADir = settings.CertSettings.GetCADir()

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@fingerprintjs/fingerprintjs": "^4.6.2",
1919
"@formkit/auto-animate": "^0.8.2",
2020
"@simplewebauthn/browser": "^13.1.2",
21-
"@uozi-admin/curd": "^4.5.12",
21+
"@uozi-admin/curd": "^4.6.0",
2222
"@uozi-admin/request": "^2.8.4",
2323
"@vue/reactivity": "^3.5.18",
2424
"@vue/shared": "^3.5.18",

app/pnpm-lock.yaml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/api/acme_user.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ export interface AcmeUser extends ModelBase {
66
email: string
77
ca_dir: string
88
registration: { body?: { status: string } }
9+
eab_key_id?: string
10+
eab_hmac_key?: string
911
}
1012

1113
const baseUrl = '/acme_users'

app/src/language/ar/app.po

Lines changed: 219 additions & 168 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)