Extract String to Set transformation.
This commit is contained in:
@ -2,10 +2,10 @@ package ch.psi.daq.queryrest.filter;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import javax.annotation.PostConstruct;
|
||||||
import javax.servlet.FilterChain;
|
import javax.servlet.FilterChain;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
@ -24,17 +24,18 @@ public class CorsFilter extends OncePerRequestFilter {
|
|||||||
@Value("${queryrest.cors.forceallheaders}")
|
@Value("${queryrest.cors.forceallheaders}")
|
||||||
private boolean forceAllHeaders;
|
private boolean forceAllHeaders;
|
||||||
|
|
||||||
|
private Set<String> allowedOrigins;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void afterPropertiesSet(){
|
||||||
|
allowedOrigins = Arrays.stream(configuredOrigins.split(","))
|
||||||
|
.map(s -> s.trim())
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
|
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
|
|
||||||
Set<String> allowedOrigins = new HashSet<String>(Arrays.asList(configuredOrigins.split(","))
|
|
||||||
.stream()
|
|
||||||
.map(s -> {
|
|
||||||
return s.trim(); })
|
|
||||||
.collect(Collectors.toList()));
|
|
||||||
|
|
||||||
String originHeader = request.getHeader("Origin");
|
String originHeader = request.getHeader("Origin");
|
||||||
if (forceAllHeaders) {
|
if (forceAllHeaders) {
|
||||||
// include headers no matter what - good for development
|
// include headers no matter what - good for development
|
||||||
|
Reference in New Issue
Block a user