Merge branch '3.1'

apache · Oct 18, 2024 · a3fd1ed · a3fd1ed
2 parents be5e475 + 10e04d2
commit a3fd1ed
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java b/...java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
@@ -82,7 +82,7 @@ private byte[] createPassword(AuthenticationTokenIdentifier identifier,
       DelegationTokenConfig cfg) {
     long now = System.currentTimeMillis();
     identifier.setIssueDate(now);
-    identifier.setExpirationDate(calculateExpirationDate());
+    identifier.setExpirationDate(calculateExpirationDate(now));
     // Limit the lifetime if the user requests it
     if (cfg != null) {
       long requestedLifetime = cfg.getTokenLifetime(TimeUnit.MILLISECONDS);
@@ -104,8 +104,7 @@ private byte[] createPassword(AuthenticationTokenIdentifier identifier,
     return createPassword(identifier);
   }
 
-  private long calculateExpirationDate() {
-    long now = System.currentTimeMillis();
+  private long calculateExpirationDate(long now) {
     long expiration = now + tokenMaxLifetime;
     // Catch overflow
     if (expiration < now) {
@@ -123,11 +122,12 @@ protected byte[] createPassword(AuthenticationTokenIdentifier identifier) {
     identifier.setKeyId(secretKey.getKeyId());
     identifier.setInstanceId(instanceID);
 
+    long now = System.currentTimeMillis();
     if (!identifier.isSetIssueDate()) {
-      identifier.setIssueDate(System.currentTimeMillis());
+      identifier.setIssueDate(now);
     }
     if (!identifier.isSetExpirationDate()) {
-      identifier.setExpirationDate(calculateExpirationDate());
+      identifier.setExpirationDate(calculateExpirationDate(now));
     }
     return createPassword(identifier.getBytes(), secretKey.getKey());
   }