SONAR-16565 handle token expiration at the authentication level

2 files changed, 19 insertions, 0 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDto.java
index bcd9572efee..d749aa7b184 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDto.java
@@ -148,4 +148,8 @@ public class UserTokenDto {
     this.projectUuid = projectUuid;
     return this;
   }
+
+  public boolean isExpired() {
+    return (this.expirationDate != null && this.getExpirationDate() < System.currentTimeMillis());
+  }
 }
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDtoTest.java
index 6da9f5b6d02..eca56374bd5 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDtoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDtoTest.java
@@ -19,9 +19,12 @@
  */
 package org.sonar.db.user;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import org.junit.Test;
 
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class UserTokenDtoTest {
@@ -32,4 +35,16 @@ public class UserTokenDtoTest {
       .isInstanceOf(IllegalStateException.class)
       .hasMessage("Token hash length (256) is longer than the maximum authorized (255)");
   }
+
+  @Test
+  public void token_isExpired_is_properly_calculated() {
+    UserTokenDto tokenWithNoExpirationDate =  new UserTokenDto();
+    UserTokenDto expiredToken =  new UserTokenDto().setExpirationDate(0L);
+    UserTokenDto nonExpiredToken =  new UserTokenDto().setExpirationDate(ZonedDateTime.now(ZoneId.systemDefault()).plusDays(10).toInstant().toEpochMilli());
+
+    assertThat(tokenWithNoExpirationDate.isExpired()).isFalse();
+    assertThat(expiredToken.isExpired()).isTrue();
+    assertThat(nonExpiredToken.isExpired()).isFalse();
+  }
+
 }