fix(#516): revert check origin test

Author: oliemansm

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLConfiguration.java

@@ -36,7 +36,6 @@ public class GraphQLConfiguration {
   private final ContextSetting contextSetting;
   private final GraphQLResponseCacheManager responseCacheManager;
   @Getter private final Executor asyncExecutor;
-  @Getter private final List<String> allowedOrigins;
   private HttpRequestHandler requestHandler;
 
   private GraphQLConfiguration(
@@ -50,11 +49,9 @@ private GraphQLConfiguration(
       ContextSetting contextSetting,
       Supplier<BatchInputPreProcessor> batchInputPreProcessor,
       GraphQLResponseCacheManager responseCacheManager,
-      Executor asyncExecutor,
-      List<String> allowedOrigins) {
+      Executor asyncExecutor) {
     this.invocationInputFactory = invocationInputFactory;
     this.asyncExecutor = asyncExecutor;
-    this.allowedOrigins = allowedOrigins;
     this.graphQLInvoker = graphQLInvoker != null ? graphQLInvoker : queryInvoker.toGraphQLInvoker();
     this.objectMapper = objectMapper;
     this.listeners = listeners;
@@ -151,7 +148,6 @@ public static class Builder {
     private int asyncMaxPoolSize = 200;
     private Executor asyncExecutor;
     private AsyncTaskDecorator asyncTaskDecorator;
-    private List<String> allowedOrigins = new ArrayList<>();
 
     private Builder(GraphQLInvocationInputFactory.Builder invocationInputFactoryBuilder) {
       this.invocationInputFactoryBuilder = invocationInputFactoryBuilder;
@@ -253,13 +249,6 @@ public Builder with(AsyncTaskDecorator asyncTaskDecorator) {
       return this;
     }
 
-    public Builder allowedOrigins(List<String> allowedOrigins) {
-      if (allowedOrigins != null) {
-        this.allowedOrigins.addAll(allowedOrigins);
-      }
-      return this;
-    }
-
     private Executor getAsyncExecutor() {
       if (asyncExecutor != null) {
         return asyncExecutor;
@@ -290,8 +279,7 @@ public GraphQLConfiguration build() {
           contextSetting,
           batchInputPreProcessorSupplier,
           responseCacheManager,
-          getAsyncTaskExecutor(),
-          allowedOrigins);
+          getAsyncTaskExecutor());
     }
   }
 }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java

@@ -1,7 +1,6 @@
 package graphql.kickstart.servlet;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 
@@ -66,7 +65,6 @@ public class GraphQLWebsocketServlet extends Endpoint {
   private final AtomicBoolean isShuttingDown = new AtomicBoolean(false);
   private final AtomicBoolean isShutDown = new AtomicBoolean(false);
   private final Object cacheLock = new Object();
-  private final List<String> allowedOrigins;
 
   public GraphQLWebsocketServlet(GraphQLConfiguration configuration) {
     this(configuration, null);
@@ -79,23 +77,21 @@ public GraphQLWebsocketServlet(
         configuration.getGraphQLInvoker(),
         configuration.getInvocationInputFactory(),
         configuration.getObjectMapper(),
-        connectionListeners,
-        configuration.getAllowedOrigins());
+        connectionListeners);
   }
 
   public GraphQLWebsocketServlet(
       GraphQLInvoker graphQLInvoker,
       GraphQLSubscriptionInvocationInputFactory invocationInputFactory,
       GraphQLObjectMapper graphQLObjectMapper) {
-    this(graphQLInvoker, invocationInputFactory, graphQLObjectMapper, null, emptyList());
+    this(graphQLInvoker, invocationInputFactory, graphQLObjectMapper, null);
   }
 
   public GraphQLWebsocketServlet(
       GraphQLInvoker graphQLInvoker,
       GraphQLSubscriptionInvocationInputFactory invocationInputFactory,
       GraphQLObjectMapper graphQLObjectMapper,
-      Collection<SubscriptionConnectionListener> connectionListeners,
-      List<String> allowedOrigins) {
+      Collection<SubscriptionConnectionListener> connectionListeners) {
     List<ApolloSubscriptionConnectionListener> listeners = new ArrayList<>();
     if (connectionListeners != null) {
       connectionListeners.stream()
@@ -118,7 +114,6 @@ public GraphQLWebsocketServlet(
                 Stream.of(fallbackSubscriptionProtocolFactory))
             .map(SubscriptionProtocolFactory::getProtocol)
             .collect(toList());
-    this.allowedOrigins = allowedOrigins;
   }
 
   public GraphQLWebsocketServlet(
@@ -134,8 +129,6 @@ public GraphQLWebsocketServlet(
                 Stream.of(fallbackSubscriptionProtocolFactory))
             .map(SubscriptionProtocolFactory::getProtocol)
             .collect(toList());
-
-    this.allowedOrigins = emptyList();
   }
 
   @Override
@@ -206,26 +199,6 @@ private void closeUnexpectedly(Session session, Throwable t) {
     }
   }
 
-  public boolean checkOrigin(String originHeaderValue) {
-    if (originHeaderValue == null || originHeaderValue.isBlank()) {
-      return allowedOrigins.isEmpty();
-    }
-    String originToCheck = trimTrailingSlash(originHeaderValue);
-    if (!allowedOrigins.isEmpty()) {
-      if (allowedOrigins.contains("*")) {
-        return true;
-      }
-      return allowedOrigins.stream()
-          .map(this::trimTrailingSlash)
-          .anyMatch(originToCheck::equalsIgnoreCase);
-    }
-    return true;
-  }
-
-  private String trimTrailingSlash(String origin) {
-    return (origin.endsWith("/") ? origin.substring(0, origin.length() - 1) : origin);
-  }
-
   public void modifyHandshake(
       ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
     sec.getUserProperties().put(HANDSHAKE_REQUEST_KEY, request);