feat(jans-auth-server): Token Status List support

jans-auth-server/server/src/main/java/io/jans/as/server/service/cluster/TokenPoolManager.java

@@ -35,6 +35,9 @@ public class TokenPoolManager {
 	@Inject
 	private ConfigurationFactory configurationFactory;
 
+	@Inject
+	private TokenPoolService tokenPoolService;
+
 	@Inject
 	private Event<TimerEvent> timerEvent;
 
@@ -49,8 +52,8 @@ public void init() {
 	public void initTimer() {
 		log.debug("Initializing Policy Download Service Timer");
 
-		final int delay = 10;
-		final int interval = 10;
+		final int delay = 30;
+		final int interval = 30;
 
 		timerEvent.fire(new TimerEvent(new TimerSchedule(delay, interval), new TokenPoolUpdateEvent(),
 				Scheduled.Literal.INSTANCE));
@@ -78,7 +81,7 @@ public void reloadPoliciesTimerEvent(@Observes @Scheduled TokenPoolUpdateEvent t
 	private void updateTokenPools() {
 		Integer nodeId = configurationFactory.getNodeId();
 
-		// TODO: Update TokenPools in DB associated with this node
+		// TODO: Revoked tokens updates?
 
 	}
 

jans-auth-server/server/src/main/java/io/jans/as/server/service/cluster/TokenPoolService.java

@@ -32,6 +32,8 @@
  */
 @ApplicationScoped
 public class TokenPoolService {
+
+	public static long DELAY_AFTER_EXPIRATION = 3 * 60 * 1000; // 3 hours
 
 	@Inject
 	private Logger log;
@@ -128,10 +130,10 @@ public TokenPool getTokenPoolByIndex(int index) {
 	 *
 	 * @return list of TokenPools
 	 */
-	public List<TokenPool> getClusterNodeTokenPools(Integer clusterNodeId) {
+	public List<TokenPool> getClusterNodeTokenPools(Integer nodeId) {
 		String tokenPoolsBaseDn = staticConfiguration.getBaseDn().getNodes();
 
-		return setIndexes(entryManager.findEntries(tokenPoolsBaseDn, TokenPool.class, Filter.createEqualityFilter("jansNodeId", clusterNodeId)));
+		return setIndexes(entryManager.findEntries(tokenPoolsBaseDn, TokenPool.class, Filter.createEqualityFilter("jansNodeId", nodeId)));
 	}
 
 	public List<String> getTokenPoolsDns(List<Integer> nodeIds) {
@@ -146,10 +148,26 @@ public List<String> getTokenPoolsDns(List<Integer> nodeIds) {
 
 		return tokenPoolsDns;
 	}
-
+
+	/**
+	 * returns a list of expired TokenPools
+	 *
+	 * @return list of TokenPools
+	 */
+	public List<TokenPool> getTokenPoolsExpired() {
+		String tokenPoolsBaseDn = staticConfiguration.getBaseDn().getNodes();
+
+		Date expirationDate = new Date(System.currentTimeMillis() + DELAY_AFTER_EXPIRATION);
+
+		Filter filter = Filter.createORFilter(Filter.createEqualityFilter("tokenStatus", TokenPoolStatus.FREE),
+				Filter.createGreaterOrEqualFilter("expirationDate", entryManager.encodeTime(tokenPoolsBaseDn, expirationDate)));
+
+		return setIndexes(entryManager.findEntries(tokenPoolsBaseDn, TokenPool.class, filter));
+	}
+
 	public TokenPool allocate(Integer nodeId) {
-		// Try to use existing entry
-		List<TokenPool> tokenPools = getTokenPools(TokenPoolStatus.FREE);
+		// Try to use existing expired entry
+		List<TokenPool> tokenPools = getTokenPoolsExpired();
 
 		for (TokenPool tokenPool : tokenPools) {
 			// Attempt to set random value in lockKey
@@ -163,7 +181,7 @@ public TokenPool allocate(Integer nodeId) {
 				// Load token after update
 				TokenPool lockedTokenPool = getTokenPoolByDn(tokenPool.getDn());
 
-				// if lock is ours reset entry and return it
+				// If lock is ours reset entry and return it
 				if (lockKey.equals(lockedTokenPool.getLockKey())) {
 					reset(tokenPool, nodeId);
 					return tokenPool;