HDDS-13781. Certificate expiry date should consider time zone daylight saving impact #9209
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adoroszlai
reviewed
Nov 7, 2025
Contributor
adoroszlai
left a comment
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @ChenSammi for the patch. LGTM, have some suggestion to simplify the logic a bit.
| } | ||
|
|
||
| private LocalDateTime expiryFor(LocalDateTime beginDate, NodeType role) { | ||
| private Duration getDuration(LocalDateTime beginDate, NodeType role) { |
Contributor
There was a problem hiding this comment.
nit: beginDate is no longer used, can be removed.
Comment on lines
254
to
258
| LocalDateTime beginDate, Duration duration, PKCS10CertificationRequest csr, NodeType role, String certSerialId | ||
| ) throws IOException, OperatorCreationException, CertificateException { | ||
|
|
||
| ZoneId zoneId = ZoneId.systemDefault(); | ||
| ZonedDateTime endDate = beginDate.atZone(zoneId).plus(duration); |
Contributor
There was a problem hiding this comment.
Since beginDate is no longer needed in the signAndStoreCertificate's caller, and it's always now(), we can simplify.
Suggested change
| LocalDateTime beginDate, Duration duration, PKCS10CertificationRequest csr, NodeType role, String certSerialId | |
| ) throws IOException, OperatorCreationException, CertificateException { | |
| ZoneId zoneId = ZoneId.systemDefault(); | |
| ZonedDateTime endDate = beginDate.atZone(zoneId).plus(duration); | |
| Duration duration, PKCS10CertificationRequest csr, NodeType role, String certSerialId | |
| ) throws IOException, OperatorCreationException, CertificateException { | |
| ZonedDateTime beginDate = ZonedDateTime.now(); | |
| ZonedDateTime endDate = beginDate.plus(duration); |
| xcert = approver.sign(config, | ||
| getPrivateKey(), | ||
| getCACertificate(), | ||
| Date.from(beginDate.atZone(ZoneId.systemDefault()).toInstant()), |
Contributor
There was a problem hiding this comment.
Suggested change
| Date.from(beginDate.atZone(ZoneId.systemDefault()).toInstant()), | |
| Date.from(beginDate.toInstant()), |
Comment on lines
489
to
496
| LocalDateTime beginDate = LocalDateTime.now(); | ||
| LocalDateTime endDate = | ||
| beginDate.plus(securityConfig.getMaxCertificateDuration()); | ||
| ZoneId zoneId = ZoneId.systemDefault(); | ||
| ZonedDateTime endDate = beginDate.atZone(zoneId).plus(securityConfig.getMaxCertificateDuration()); |
Contributor
There was a problem hiding this comment.
Similarly, here:
ZonedDateTime beginDate = ZonedDateTime.now();
ZonedDateTime endDate = beginDate.plus(securityConfig.getMaxCertificateDuration());
Contributor
There was a problem hiding this comment.
Thanks @ChenSammi for updating the patch. It seems this comment was missed.
(Note: LocalDateTime and ZoneId imports will be unused after this change.)
| .setSubject(this.subject) | ||
| .setScmID(this.scmID) | ||
| .setClusterID(this.clusterID) | ||
| .setBeginDate(beginDate) |
Contributor
There was a problem hiding this comment.
Suggested change
| .setBeginDate(beginDate) | |
| .setBeginDate(beginDate.toLocalDateTime()) |
Contributor
Author
|
@adoroszlai , thanks for the review. |
adoroszlai
reviewed
Nov 10, 2025
Comment on lines
38
to
39
| import java.time.LocalDateTime; | ||
| import java.time.ZoneId; |
Contributor
There was a problem hiding this comment.
Suggested change
| import java.time.LocalDateTime; | |
| import java.time.ZoneId; |
Comment on lines
494
to
495
| ZoneId zoneId = ZoneId.systemDefault(); | ||
| ZonedDateTime endDate = beginDate.atZone(zoneId).plus(securityConfig.getMaxCertificateDuration()); |
Contributor
There was a problem hiding this comment.
Suggested change
| ZoneId zoneId = ZoneId.systemDefault(); | |
| ZonedDateTime endDate = beginDate.atZone(zoneId).plus(securityConfig.getMaxCertificateDuration()); | |
| ZonedDateTime endDate = beginDate.plus(securityConfig.getMaxCertificateDuration()); |
| SecurityConfig securityConfig, KeyPair key) | ||
| throws IOException, SCMSecurityException { | ||
| Preconditions.checkNotNull(this.config); | ||
| LocalDateTime beginDate = LocalDateTime.now(); |
Contributor
There was a problem hiding this comment.
Suggested change
| LocalDateTime beginDate = LocalDateTime.now(); | |
| ZonedDateTime beginDate = ZonedDateTime.now(); |
adoroszlai
approved these changes
Nov 11, 2025
Contributor
adoroszlai
left a comment
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @ChenSammi for updating the patch to use ZonedDateTime.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
The current way of specify endDate( https://github.com/apache/ozone/blob/master/hadoop-hdds/framework/src/main/java/or[…]p/hdds/security/x509/certificate/authority/DefaultCAServer.java) works well on time zone which doesn’t have Daylight Saving, but it will cause the endDate one hour ahead or after the expected time, if the beginDate and endDate, one with Daylight Saving, while another without.
Refer to https://issues.apache.org/jira/browse/HDDS-13781 for more info.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-13781
How was this patch tested?
new unit tests