github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor string cache store usage

pull/146/head
johnniang 2019-04-29 01:34:00 +08:00
parent b0cb31ad48
commit 6e8ef4b35a
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/run/halo/app/security/filter/AdminAuthenticationFilter.java
View File

@ -15,7 +15,6 @@ import run.halo.app.security.context.SecurityContextHolder;
import run.halo.app.security.context.SecurityContextImpl; import run.halo.app.security.context.SecurityContextImpl;
import run.halo.app.security.support.UserDetail; import run.halo.app.security.support.UserDetail;
import run.halo.app.service.UserService; import run.halo.app.service.UserService;
import run.halo.app.utils.JsonUtils;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -84,15 +83,14 @@ public class AdminAuthenticationFilter extends AbstractAuthenticationFilter {
if (StringUtils.isNotBlank(token)) { if (StringUtils.isNotBlank(token)) {
// Valid the token // Valid the token
// TODO Add key prefix Optional<UserDetail> optionalUserDetail = cacheStore.getAny(token, UserDetail.class);
Optional<String> userDetailOptional = cacheStore.get(token);
if (!userDetailOptional.isPresent()) { if (!optionalUserDetail.isPresent()) {
getFailureHandler().onFailure(request, response, new AuthenticationException("The token has been expired or not exist").setErrorData(token)); getFailureHandler().onFailure(request, response, new AuthenticationException("The token has been expired or not exist").setErrorData(token));
return; return;
} }
UserDetail userDetail = JsonUtils.jsonToObject(userDetailOptional.get(), UserDetail.class); UserDetail userDetail = optionalUserDetail.get();
// Set security // Set security
SecurityContextHolder.setContext(new SecurityContextImpl(new AuthenticationImpl(userDetail))); SecurityContextHolder.setContext(new SecurityContextImpl(new AuthenticationImpl(userDetail)));

10
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

@ -36,7 +36,6 @@ import run.halo.app.service.support.HaloMediaType;
import run.halo.app.utils.FileUtils; import run.halo.app.utils.FileUtils;
import run.halo.app.utils.FilenameUtils; import run.halo.app.utils.FilenameUtils;
import run.halo.app.utils.HaloUtils; import run.halo.app.utils.HaloUtils;
import run.halo.app.utils.JsonUtils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
@ -122,12 +121,13 @@ public class ThemeServiceImpl implements ThemeService {
@Override @Override
public Set<ThemeProperty> getThemes() { public Set<ThemeProperty> getThemes() {
Optional<String> themeCacheString = cacheStore.get(THEMES_CACHE_KEY);
Optional<ThemeProperty[]> themePropertiesOptional = cacheStore.getAny(THEMES_CACHE_KEY, ThemeProperty[].class);
try { try {
if (themeCacheString.isPresent()) { if (themePropertiesOptional.isPresent()) {
// Convert to theme properties // Convert to theme properties
ThemeProperty[] themeProperties = JsonUtils.jsonToObject(themeCacheString.get(), ThemeProperty[].class); ThemeProperty[] themeProperties = themePropertiesOptional.get();
return new HashSet<>(Arrays.asList(themeProperties)); return new HashSet<>(Arrays.asList(themeProperties));
} }
@ -142,7 +142,7 @@ public class ThemeServiceImpl implements ThemeService {
Set<ThemeProperty> themes = themePaths.stream().map(this::getProperty).collect(Collectors.toSet()); Set<ThemeProperty> themes = themePaths.stream().map(this::getProperty).collect(Collectors.toSet());
// Cache the themes // Cache the themes
cacheStore.put(THEMES_CACHE_KEY, JsonUtils.objectToJson(themes)); cacheStore.putAny(THEMES_CACHE_KEY, themes);
return themes; return themes;
} catch (IOException e) { } catch (IOException e) {

4
src/main/java/run/halo/app/service/impl/UserServiceImpl.java
View File

@ -128,7 +128,7 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
if (!BCrypt.checkpw(password, user.getPassword())) { if (!BCrypt.checkpw(password, user.getPassword())) {
// If the password is mismatch // If the password is mismatch
// Add login failure count // Add login failure count
Integer loginFailureCount = stringCacheStore.get(LOGIN_FAILURE_COUNT_KEY).map(Integer::valueOf).orElse(0); Integer loginFailureCount = stringCacheStore.getAny(LOGIN_FAILURE_COUNT_KEY, Integer.class).orElse(0);
if (loginFailureCount >= MAX_LOGIN_TRY - 1) { if (loginFailureCount >= MAX_LOGIN_TRY - 1) {
// Set expiration // Set expiration
@ -139,7 +139,7 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
loginFailureCount++; loginFailureCount++;
stringCacheStore.put(LOGIN_FAILURE_COUNT_KEY, loginFailureCount.toString(), LOCK_MINUTES, TimeUnit.MINUTES); stringCacheStore.putAny(LOGIN_FAILURE_COUNT_KEY, loginFailureCount, LOCK_MINUTES, TimeUnit.MINUTES);
int remainder = MAX_LOGIN_TRY - loginFailureCount; int remainder = MAX_LOGIN_TRY - loginFailureCount;