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

Return access control allow origin with origin where belongs to client

pull/137/head
johnniang 2019-03-29 01:34:33 +08:00
parent ac15c7ae48
commit e973bf2200
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cc/ryanc/halo/filter/CorsFilter.java
View File

@ -21,7 +21,7 @@ public class CorsFilter extends OncePerRequestFilter {
protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
// Set customized header
httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "*");
httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, httpServletRequest.getHeader(HttpHeaders.ORIGIN));
httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "*");
httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTION");
httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");

3
src/main/java/cc/ryanc/halo/security/handler/DefaultAuthenticationFailureHandler.java
View File

@ -35,6 +35,7 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur
@Override
public void onFailure(HttpServletRequest request, HttpServletResponse response, HaloException exception) throws IOException, ServletException {
log.warn("Handle unsuccessful authentication, ip: [{}]", ServletUtil.getClientIP(request));
log.error("Authentication failure", exception);
BaseResponse<Object> errorDetail = new BaseResponse<>();
@ -46,8 +47,6 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur
errorDetail.setDevMessage(ExceptionUtils.getStackTrace(exception));
}
log.debug("Response error: [{}]", errorDetail);
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.setStatus(exception.getStatus().value());
response.getWriter().write(objectMapper.writeValueAsString(errorDetail));