🚧 Add refresh grant

This commit is contained in:
2026-04-12 13:57:56 +02:00
parent 308ec0c93a
commit 1aebd3b50c
10 changed files with 194 additions and 38 deletions
@@ -1,5 +1,10 @@
package dev.dinauer.oidcproxy.session;
import dev.dinauer.oidcproxy.JwtUtils;
import dev.dinauer.oidcproxy.callback.OidcClient;
import dev.dinauer.oidcproxy.callback.model.TokenResponse;
import dev.dinauer.oidcproxy.proxy.exception.TokenNotFoundException;
import io.quarkus.security.UnauthorizedException;
import io.smallrye.jwt.auth.principal.DefaultJWTParser;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -8,6 +13,7 @@ import org.eclipse.microprofile.jwt.JsonWebToken;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.Ref;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
@@ -25,16 +31,16 @@ public class SessionService
@Inject
RefreshTokenRepository refreshTokenRepository;
@Inject
OidcClient client;
@Transactional
public void create(String sessionId, ZonedDateTime sessionExpiresAt, String accessToken, String refreshToken)
public void create(String sessionHash, AccessToken accessToken, RefreshToken refreshToken)
{
String sessionHash = toHash(sessionId);
try
{
JsonWebToken token = new DefaultJWTParser().parseOnly(accessToken);
ZonedDateTime accessTokenExpiresAt = Instant.ofEpochSecond(token.getExpirationTime()).atZone(ZoneOffset.UTC);
accessTokenRepository.persist(new AccessTokenEntity().setId(sessionHash).setToken(encryptUtils.encrypt(accessToken)).setExpiresAt(accessTokenExpiresAt));
refreshTokenRepository.persist(new RefreshTokenEntity().setId(sessionHash).setToken(encryptUtils.encrypt(refreshToken)).setExpiresAt(sessionExpiresAt));
accessTokenRepository.persist(new AccessTokenEntity().setId(sessionHash).setToken(encryptUtils.encrypt(accessToken.getToken())).setExpiresAt(accessToken.getExpiresAt()));
refreshTokenRepository.persist(new RefreshTokenEntity().setId(sessionHash).setToken(encryptUtils.encrypt(refreshToken.getToken())).setExpiresAt(refreshToken.getExpiresAt()));
}
catch (Exception e)
{
@@ -42,15 +48,59 @@ public class SessionService
}
}
private String toHash(String sessionId)
@Transactional
public AccessToken provide(String sessionHash) throws TokenNotFoundException
{
try
AccessTokenEntity dbToken = accessTokenRepository.findById(sessionHash);
if (isValid(dbToken))
{
return Base64.getEncoder().encodeToString( MessageDigest.getInstance("SHA-256").digest(sessionId.getBytes()));
try
{
return new AccessToken(encryptUtils.decrypt(dbToken.getToken()), dbToken.getExpiresAt());
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
catch (NoSuchAlgorithmException e)
RefreshTokenEntity dbRefreshToken = refreshTokenRepository.findById(sessionHash);
if (dbRefreshToken != null)
{
throw new RuntimeException(e);
try
{
TokenResponse tokenResponse = client.refreshAccessToken(encryptUtils.decrypt(dbRefreshToken.getToken()));
renewAccessToken(sessionHash, new AccessToken(tokenResponse.accessToken()));
return new AccessToken(tokenResponse.accessToken());
}
catch (Exception e)
{
throw new TokenNotFoundException();
}
}
throw new TokenNotFoundException();
}
@Transactional
public void remove(String sessionHash)
{
accessTokenRepository.deleteById(sessionHash);
refreshTokenRepository.deleteById(sessionHash);
}
private boolean isValid(AccessTokenEntity token)
{
if (token != null)
{
return ZonedDateTime.now().isBefore(token.getExpiresAt());
}
return false;
}
private void renewAccessToken(String sessionHash, AccessToken token) throws Exception
{
accessTokenRepository.deleteById(sessionHash);
accessTokenRepository.persist(new AccessTokenEntity().setId(sessionHash).setToken(encryptUtils.encrypt(token.getToken())).setExpiresAt(token.getExpiresAt()));
}
}