fix(provider): fix incorrect certificate validity parsing for some deployment providers running in non-Asia/Shanghai timezones

This commit is contained in:
Fu Diwei
2026-08-28 16:12:46 +08:00
parent 73cfe1d583
commit ea066014a1
8 changed files with 12 additions and 12 deletions

View File

@@ -89,8 +89,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo
// 对比证书有效期
newCertNotBefore := certX509.NotBefore
newCertNotAfter := certX509.NotAfter
oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.CertStartTime)
oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.CertStopTime)
oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.CertStartTime)
oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.CertStopTime)
if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -88,7 +88,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo
for _, certItem := range *listLoadbalanceCertificationResp.Body.Content {
// 对比证书有效期
newCertNotAfter := certX509.NotAfter
oldCertNotAfter, _ := time.Parse(time.DateTime, lo.FromPtr(certItem.ExpirationTime))
oldCertNotAfter, _ := time.ParseInLocation(time.DateTime, lo.FromPtr(certItem.ExpirationTime), time.FixedZone("CST", 8*60*60))
if !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -165,8 +165,8 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string)
// 对比证书有效期
newCertNotBefore := certX509.NotBefore
newCertNotAfter := certX509.NotAfter
oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.IssueTime)
oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.ExpireTime)
oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.IssueTime)
oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.ExpireTime)
if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -105,7 +105,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo
// 对比证书有效期
newCertNotAfter := certX509.NotAfter
oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.NotAfter)
oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.NotAfter)
if !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -113,8 +113,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo
// 对比证书有效期
newCertNotBefore := certX509.NotBefore
newCertNotAfter := certX509.NotAfter
oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.StartTime)
oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.EndTime)
oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.StartTime)
oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.EndTime)
if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -113,8 +113,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo
// 对比证书有效期
newCertNotBefore := certX509.NotBefore
newCertNotAfter := certX509.NotAfter
oldCertNotBefore, _ := time.Parse("2006-01-02T15:04:05Z", certItem.StartTime)
oldCertNotAfter, _ := time.Parse("2006-01-02T15:04:05Z", certItem.EndTime)
oldCertNotBefore, _ := time.Parse(time.RFC3339, certItem.StartTime)
oldCertNotAfter, _ := time.Parse(time.RFC3339, certItem.EndTime)
if !newCertNotBefore.Equal(oldCertNotBefore) || !newCertNotAfter.Equal(oldCertNotAfter) {
continue
}

View File

@@ -235,7 +235,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
continue
}
certExpireTime, _ := time.Parse("2006-01-02T15:04:05Z", lo.FromPtr(certInfo.ExpireTime))
certExpireTime, _ := time.Parse(time.RFC3339, lo.FromPtr(certInfo.ExpireTime))
if certExpireTime.Before(time.Now()) {
continue
}

View File

@@ -268,7 +268,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
continue
}
certExpireTime, _ := time.Parse("2006-01-02T15:04:05Z", lo.FromPtr(certInfo.ExpireTime))
certExpireTime, _ := time.Parse(time.RFC3339, lo.FromPtr(certInfo.ExpireTime))
if certExpireTime.Before(time.Now()) {
continue
}