AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-16 11:52:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Properly calculate if certificate expires in 30 minutes or not.

Browse Source
This commit is contained in:
Eugene Bujak 2019-02-13 11:08:44 +03:00 committed by Eugene Bujak
parent 28df187012
commit bdec98f18e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
control.go
View File

@ -1167,7 +1167,8 @@ func validateCertificates(data tlsConfig) (tlsConfig, error) {
// update status // update status
if mainCert != nil { if mainCert != nil {
data.StatusCertificate = fmt.Sprintf("Certificate expires on %s", mainCert.NotAfter) //, valid for hostname %s", mainCert.NotAfter, mainCert.Subject.CommonName) notAfter := mainCert.NotAfter
data.StatusCertificate = fmt.Sprintf("Certificate expires on %s", notAfter) //, valid for hostname %s", mainCert.NotAfter, mainCert.Subject.CommonName)
if len(mainCert.DNSNames) == 1 { if len(mainCert.DNSNames) == 1 {
data.StatusCertificate += fmt.Sprintf(", valid for hostname %s", mainCert.DNSNames[0]) data.StatusCertificate += fmt.Sprintf(", valid for hostname %s", mainCert.DNSNames[0])
} else if len(mainCert.DNSNames) > 1 { } else if len(mainCert.DNSNames) > 1 {
@ -1176,8 +1177,8 @@ func validateCertificates(data tlsConfig) (tlsConfig, error) {
// issue a warning if certificate is about to expire // issue a warning if certificate is about to expire
now := time.Now() now := time.Now()
if mainCert.NotAfter.AddDate(0, 0, -30).After(now) { if now.AddDate(0, 0, 30).After(notAfter) {
timeLeft := time.Until(mainCert.NotAfter) timeLeft := notAfter.Sub(now)
if timeLeft > 0 { if timeLeft > 0 {
data.Warning = fmt.Sprintf("Your certificate expires in %.0f days, we recommend you update it soon", timeLeft.Hours()/24) data.Warning = fmt.Sprintf("Your certificate expires in %.0f days, we recommend you update it soon", timeLeft.Hours()/24)
} else { } else {