From 13456bad3a708d7ea79f9b7435cc817e11181ebd Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Mon, 12 Jun 2023 15:59:15 -0400 Subject: [PATCH] Update date math with JSR310 types --- .../textsecuregcm/auth/TurnTokenGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnTokenGenerator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnTokenGenerator.java index 9e7b5d975..d2515cdf2 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnTokenGenerator.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnTokenGenerator.java @@ -18,10 +18,11 @@ import javax.crypto.spec.SecretKeySpec; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.time.Duration; +import java.time.Instant; import java.util.Base64; import java.util.List; import java.util.Optional; -import java.util.concurrent.TimeUnit; public class TurnTokenGenerator { @@ -38,7 +39,7 @@ public class TurnTokenGenerator { final byte[] key = dynamicConfiguration.getConfiguration().getTurnConfiguration().getSecret().getBytes(); final List urls = urls(e164); final Mac mac = Mac.getInstance(ALGORITHM); - final long validUntilSeconds = (System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)) / 1000; + final long validUntilSeconds = Instant.now().plus(Duration.ofDays(1)).getEpochSecond(); final long user = Util.ensureNonNegativeInt(new SecureRandom().nextInt()); final String userTime = validUntilSeconds + ":" + user;