zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed OAuth2 JDBCTokenStore cache

Browse source
This commit is contained in:
anhefti 2022-01-05 15:29:49 +01:00
parent 69d4485ff1
commit c0c58763bf
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/CachableJdbcTokenStore.java
View file

@ -50,10 +50,6 @@ public class CachableJdbcTokenStore implements TokenStore {
} }
@Override @Override
@Cacheable(
cacheNames = CACHE_NAME,
key = "#token",
unless = "#result == null")
public OAuth2Authentication readAuthentication(final OAuth2AccessToken token) { public OAuth2Authentication readAuthentication(final OAuth2AccessToken token) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Read authentication from persistent and cache if available"); log.debug("Read authentication from persistent and cache if available");
@ -68,6 +64,10 @@ public class CachableJdbcTokenStore implements TokenStore {
} }
@Override @Override
@Cacheable(
cacheNames = CACHE_NAME,
key = "#tokenValue",
unless = "#result == null")
public OAuth2AccessToken readAccessToken(final String tokenValue) { public OAuth2AccessToken readAccessToken(final String tokenValue) {
return this.jdbcTokenStore.readAccessToken(tokenValue); return this.jdbcTokenStore.readAccessToken(tokenValue);
} }
@ -75,7 +75,7 @@ public class CachableJdbcTokenStore implements TokenStore {
@Override @Override
@CacheEvict( @CacheEvict(
cacheNames = CACHE_NAME, cacheNames = CACHE_NAME,
key = "#token") key = "#token.getValue()")
public void removeAccessToken(final OAuth2AccessToken token) { public void removeAccessToken(final OAuth2AccessToken token) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Evict token from cache and remove it also from persistent store"); log.debug("Evict token from cache and remove it also from persistent store");

6
src/main/resources/config/ehcache.xml
View file

@ -61,10 +61,10 @@
</cache> </cache>
<cache alias="ACCESS_TOKEN_STORE_CACHE"> <cache alias="ACCESS_TOKEN_STORE_CACHE">
<key-type>org.springframework.security.oauth2.common.OAuth2AccessToken</key-type> <key-type>java.lang.String</key-type>
<value-type>org.springframework.security.oauth2.provider.OAuth2Authentication</value-type> <value-type>org.springframework.security.oauth2.common.OAuth2AccessToken</value-type>
<expiry> <expiry>
<ttl unit="hours">24</ttl> <ttl unit="hours">1</ttl>
</expiry> </expiry>
<resources> <resources>
<heap unit="entries">100</heap> <heap unit="entries">100</heap>