Skip to content

Commit 36fdf05

Browse files
feat: support apply ip Certificate (#11437)
1 parent 5794dbc commit 36fdf05

File tree

22 files changed

+231
-51
lines changed

22 files changed

+231
-51
lines changed

agent/app/dto/request/website_ssl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type WebsiteSSLCreate struct {
3131
Shell string `json:"shell"`
3232
PushNode bool `json:"pushNode"`
3333
Nodes string `json:"nodes"`
34+
IsIp bool `json:"isIp"`
3435
}
3536

3637
type WebsiteDNSReq struct {

agent/app/model/website_ssl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type WebsiteSSL struct {
4141
PushNode bool `json:"pushNode"`
4242
PrivateKeyPath string `json:"privateKeyPath"`
4343
CertPath string `json:"certPath"`
44+
IsIp bool `json:"isIp"`
4445

4546
AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
4647
DnsAccount WebsiteDnsAccount `json:"dnsAccount" gorm:"-:migration"`

agent/app/service/website_ssl.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ func (w WebsiteSSLService) Create(create request.WebsiteSSLCreate) (request.Webs
141141
SkipDNS: create.SkipDNS,
142142
DisableCNAME: create.DisableCNAME,
143143
ExecShell: create.ExecShell,
144+
IsIp: create.IsIp,
144145
}
145146
if create.ExecShell {
146147
websiteSSL.Shell = create.Shell
@@ -322,7 +323,11 @@ func (w WebsiteSSLService) ObtainSSL(apply request.WebsiteSSLApply) error {
322323
handleError(websiteSSL, err)
323324
return
324325
}
325-
resource, err = client.ObtainSSL(domains, privateKey)
326+
if websiteSSL.IsIp {
327+
resource, err = client.ObtainIPSSL(domains[0], privateKey)
328+
} else {
329+
resource, err = client.ObtainSSL(domains, privateKey)
330+
}
326331
if err != nil {
327332
handleError(websiteSSL, err)
328333
return

agent/cron/job/ssl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (ssl *ssl) Run() {
3131
}
3232
expireDate := s.ExpireDate.In(nyc)
3333
sub := expireDate.Sub(now)
34-
if sub.Hours() < 720 {
34+
if s.IsIp && sub.Hours() < 72 || !s.IsIp && sub.Hours() < 720 {
3535
global.LOG.Infof("Update the SSL certificate for the [%s] domain", s.PrimaryDomain)
3636
if s.Provider == constant.SelfSigned {
3737
caService := service.NewIWebsiteCAService()

agent/go.mod

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.24.9
44

55
require (
66
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
7-
github.com/aws/aws-sdk-go-v2 v1.40.0
8-
github.com/aws/aws-sdk-go-v2/config v1.32.2
9-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2
7+
github.com/aws/aws-sdk-go-v2 v1.41.0
8+
github.com/aws/aws-sdk-go-v2/config v1.32.5
9+
github.com/aws/aws-sdk-go-v2/credentials v1.19.5
1010
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.7
11-
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1
12-
github.com/aws/smithy-go v1.23.2
11+
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0
12+
github.com/aws/smithy-go v1.24.0
1313
github.com/compose-spec/compose-go/v2 v2.9.0
1414
github.com/creack/pty v1.1.24
1515
github.com/docker/compose/v2 v2.40.2
@@ -18,11 +18,11 @@ require (
1818
github.com/fsnotify/fsnotify v1.9.0
1919
github.com/gin-gonic/gin v1.10.0
2020
github.com/glebarez/sqlite v1.11.0
21-
github.com/go-acme/lego/v4 v4.29.0
21+
github.com/go-acme/lego/v4 v4.30.1
2222
github.com/go-gormigrate/gormigrate/v2 v2.1.2
2323
github.com/go-playground/validator/v10 v10.26.0
2424
github.com/go-redis/redis v6.15.9+incompatible
25-
github.com/go-resty/resty/v2 v2.16.5
25+
github.com/go-resty/resty/v2 v2.17.0
2626
github.com/go-sql-driver/mysql v1.8.1
2727
github.com/goh-chunlin/go-onedrive v1.1.1
2828
github.com/google/uuid v1.6.0
@@ -51,11 +51,11 @@ require (
5151
github.com/tencentyun/cos-go-sdk-v5 v0.7.54
5252
github.com/tomasen/fcgi_client v0.0.0-20180423082037-2bb3d819fd19
5353
github.com/upyun/go-sdk v2.1.0+incompatible
54-
golang.org/x/crypto v0.45.0
55-
golang.org/x/net v0.47.0
56-
golang.org/x/oauth2 v0.33.0
57-
golang.org/x/sys v0.38.0
58-
golang.org/x/text v0.31.0
54+
golang.org/x/crypto v0.46.0
55+
golang.org/x/net v0.48.0
56+
golang.org/x/oauth2 v0.34.0
57+
golang.org/x/sys v0.39.0
58+
golang.org/x/text v0.32.0
5959
google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38
6060
gopkg.in/ini.v1 v1.67.0
6161
gopkg.in/yaml.v3 v3.0.1
@@ -71,26 +71,26 @@ require (
7171
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect
7272
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.13 // indirect
7373
github.com/alibabacloud-go/debug v1.0.1 // indirect
74-
github.com/alibabacloud-go/tea v1.3.13 // indirect
74+
github.com/alibabacloud-go/tea v1.3.14 // indirect
7575
github.com/alibabacloud-go/tea-utils/v2 v2.0.7 // indirect
7676
github.com/aliyun/credentials-go v1.4.7 // indirect
7777
github.com/andybalholm/brotli v1.0.4 // indirect
78-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
79-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
80-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
81-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
78+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
79+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
80+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
81+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
8282
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
83-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
84-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
86-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
87-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
88-
github.com/aws/aws-sdk-go-v2/service/route53 v1.61.0 // indirect
89-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
90-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
92-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
93-
github.com/baidubce/bce-sdk-go v0.9.252 // indirect
83+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
88+
github.com/aws/aws-sdk-go-v2/service/route53 v1.62.0 // indirect
89+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
93+
github.com/baidubce/bce-sdk-go v0.9.254 // indirect
9494
github.com/bodgit/plumbing v1.2.0 // indirect
9595
github.com/bodgit/sevenzip v1.3.0 // indirect
9696
github.com/bodgit/windows v1.0.0 // indirect
@@ -129,7 +129,7 @@ require (
129129
github.com/gin-contrib/sse v0.1.0 // indirect
130130
github.com/glebarez/go-sqlite v1.22.0 // indirect
131131
github.com/go-acme/alidns-20150109/v4 v4.7.0 // indirect
132-
github.com/go-acme/esa-20240910/v2 v2.40.1 // indirect
132+
github.com/go-acme/esa-20240910/v2 v2.40.3 // indirect
133133
github.com/go-acme/tencentclouddnspod v1.1.25 // indirect
134134
github.com/go-ini/ini v1.67.0 // indirect
135135
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
@@ -152,9 +152,9 @@ require (
152152
github.com/h2non/filetype v1.1.1 // indirect
153153
github.com/hashicorp/errwrap v1.1.0 // indirect
154154
github.com/hashicorp/go-multierror v1.1.1 // indirect
155-
github.com/hashicorp/go-version v1.7.0 // indirect
155+
github.com/hashicorp/go-version v1.8.0 // indirect
156156
github.com/hashicorp/hcl v1.0.0 // indirect
157-
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.178 // indirect
157+
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.180 // indirect
158158
github.com/in-toto/in-toto-golang v0.9.0 // indirect
159159
github.com/inconshreveable/mousetrap v1.1.0 // indirect
160160
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -174,7 +174,7 @@ require (
174174
github.com/mattn/go-isatty v0.0.20 // indirect
175175
github.com/mattn/go-runewidth v0.0.16 // indirect
176176
github.com/mattn/go-shellwords v1.0.12 // indirect
177-
github.com/miekg/dns v1.1.68 // indirect
177+
github.com/miekg/dns v1.1.69 // indirect
178178
github.com/minio/md5-simd v1.1.2 // indirect
179179
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
180180
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -218,7 +218,7 @@ require (
218218
github.com/sourcegraph/conc v0.3.0 // indirect
219219
github.com/spf13/cast v1.7.0 // indirect
220220
github.com/spf13/pflag v1.0.10 // indirect
221-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3 // indirect
221+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.12 // indirect
222222
github.com/therootcompany/xz v1.0.1 // indirect
223223
github.com/tjfoc/gmsm v1.4.1 // indirect
224224
github.com/tklauser/go-sysconf v0.3.16 // indirect
@@ -231,36 +231,36 @@ require (
231231
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
232232
github.com/ugorji/go/codec v1.2.12 // indirect
233233
github.com/ulikunitz/xz v0.5.15 // indirect
234-
github.com/volcengine/volc-sdk-golang v1.0.229 // indirect
234+
github.com/volcengine/volc-sdk-golang v1.0.230 // indirect
235235
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
236236
github.com/yusufpapurcu/wmi v1.2.4 // indirect
237237
go.mongodb.org/mongo-driver v1.13.1 // indirect
238-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
238+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
239239
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
240240
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
241241
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
242-
go.opentelemetry.io/otel v1.37.0 // indirect
242+
go.opentelemetry.io/otel v1.38.0 // indirect
243243
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
244244
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
245245
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
246-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
247-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
248-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
249-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
246+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
247+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
248+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
249+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
250250
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
251251
go.uber.org/multierr v1.11.0 // indirect
252252
go.yaml.in/yaml/v3 v3.0.4 // indirect
253253
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
254254
golang.org/x/arch v0.8.0 // indirect
255255
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
256-
golang.org/x/mod v0.29.0 // indirect
257-
golang.org/x/sync v0.18.0 // indirect
256+
golang.org/x/mod v0.30.0 // indirect
257+
golang.org/x/sync v0.19.0 // indirect
258258
golang.org/x/time v0.14.0 // indirect
259-
golang.org/x/tools v0.38.0 // indirect
259+
golang.org/x/tools v0.39.0 // indirect
260260
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
261-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
262-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
263-
google.golang.org/grpc v1.76.0 // indirect
261+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
262+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
263+
google.golang.org/grpc v1.77.0 // indirect
264264
google.golang.org/protobuf v1.36.10 // indirect
265265
modernc.org/libc v1.66.1 // indirect
266266
modernc.org/mathutil v1.7.1 // indirect

0 commit comments

Comments
 (0)