fix certificate renewal periodicals to parse both Duration and Period #20056
Conversation
This file contains 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
todvora
reviewed
Aug 1, 2024
...de/src/main/java/org/graylog/datanode/bootstrap/preflight/DataNodeCertRenewalPeriodical.java
Outdated
Show resolved
Hide resolved
graylog2-server/src/main/java/org/graylog/security/certutil/CertRenewalServiceImpl.java
Outdated
Show resolved
Hide resolved
create & use typed method for parsed lifetime
todvora
approved these changes
Aug 6, 2024
| @@ -34,4 +40,26 @@ public static Mode create(String value) { | |||
| return Mode.valueOf(value.toUpperCase(Locale.ROOT)); | |||
| } | |||
| } | |||
|
|
|||
| public @NotNull Duration parsedCertificateLifetime() { | |||
There was a problem hiding this comment.
Should we also ignore this in json serialization?
There was a problem hiding this comment.
This is ignored in serialization since it isn't a getter method anyway, so no need for the annotation imho
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Certificate renewal periodicals were currently parsing Durations for calculating a 10% time buffer for renewal.
This did not work for TemporalAmounts stored as e.g.
PxMwhich can only be parsed usingjava.time.Period.This PR introduces the ThreeTen-Extra library which will also be needed for replacing org.joda.time in the near future.
The TemporalAmount is parsed by
PeriodDurationand for Durations, the 10% time buffer is applied. For Periods, a 23-hour buffer is applied in general as 1 day is the smallest unit a Period can represent./nocl
Motivation and Context
fixes errors during cert renewal checks
How Has This Been Tested?
added unit tests
Screenshots (if appropriate):
Types of changes
Checklist: