Github user bostko commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/519#discussion_r96633651
--- Diff:
rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java
---
@@ -0,0 +1,168 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.rest;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.core.BrooklynFeatureEnablement;
+import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.rest.filter.CorsImplSupplierFilter;
+import org.apache.brooklyn.util.http.HttpTool;
+import org.apache.brooklyn.util.http.HttpToolResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.testng.annotations.Test;
+
+import javax.ws.rs.core.HttpHeaders;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+
+import static
org.apache.brooklyn.rest.CsrfTokenFilterLauncherTest.assertOkayResponse;
+import static org.apache.cxf.rs.security.cors.CorsHeaderConstants.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+/**
+ * If brooklyn.experimental.feature.corsCxfFeature.allowedOrigins is not
supplied then allowedOrigins will be all domains.
+ */
+public class CorsFilterLauncherTest extends
BrooklynRestApiLauncherTestFixture {
+ @Test
+ public void testEnabledCorsSendsBasicAllowResponse() throws
IOException {
+
BrooklynFeatureEnablement.enable(BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY);
+ final String shouldAllowOrigin = "http://foo.bar.com";;
+ BrooklynRestApiLauncher apiLauncher = baseLauncher()
+ .withoutJsgui();
+ ManagementContext mgmt =
LocalManagementContextForTests.builder(true)
+ .useAdditionalProperties(ImmutableMap.<String, Object>of(
+
BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY, true,
+ CorsImplSupplierFilter.ALLOWED_ORIGINS.getName(),
ImmutableList.of(shouldAllowOrigin))
+ ).build();
+ apiLauncher.managementContext(mgmt);
+ useServerForTest(apiLauncher.start());
+
+ // preflight request
+ HttpClient client = client();
+ HttpToolResponse response = HttpTool.execAndConsume(client,
httpOptionsRequest("server/status", "GET", shouldAllowOrigin));
+ assertAcAllowOrigin(response, shouldAllowOrigin, "GET");
+ assertOkayResponse(response, "");
+
+ HttpUriRequest httpRequest = RequestBuilder.get(getBaseUriRest() +
"server/status")
+ .addHeader("Origin", shouldAllowOrigin)
+ .addHeader(HEADER_AC_REQUEST_METHOD, "GET")
+ .build();
+ response = HttpTool.execAndConsume(client, httpRequest);
+ assertAcAllowOrigin(response, shouldAllowOrigin, "GET", false);
+ assertOkayResponse(response, "MASTER");
+
+ // preflight request
+ response = HttpTool.execAndConsume(client,
httpOptionsRequest("script/groovy", "POST", shouldAllowOrigin));
+ assertAcAllowOrigin(response, shouldAllowOrigin, "POST");
+ assertOkayResponse(response, "");
+
+ response = HttpTool.httpPost(
+ client, URI.create(getBaseUriRest() + "script/groovy"),
+ ImmutableMap.<String,String>of(
+ "Origin", shouldAllowOrigin,
+ HttpHeaders.CONTENT_TYPE, "application/text"),
+ "return 0;".getBytes());
+ assertAcAllowOrigin(response, shouldAllowOrigin, "POST", false);
+ assertOkayResponse(response, "{\"result\":\"0\"}");
+
+ final String thirdPartyOrigin = "http://foo.bar1.com";;
+
+ // preflight request
+ response = HttpTool.execAndConsume(client,
httpOptionsRequest("server/status", "GET", thirdPartyOrigin));
+ assertAcNotAllowOrigin(response);
+ assertOkayResponse(response, "");
+
+ // preflight request
+ response = HttpTool.execAndConsume(client,
httpOptionsRequest("script/groovy", "POST", thirdPartyOrigin));
+ assertAcNotAllowOrigin(response);
+ assertOkayResponse(response, "");
+
+ response = HttpTool.httpPost(
+ client, URI.create(getBaseUriRest() + "script/groovy"),
+ ImmutableMap.<String,String>of(
+ "Origin", thirdPartyOrigin,
+ HttpHeaders.CONTENT_TYPE, "application/text"),
+ "return 0;".getBytes());
+ assertAcNotAllowOrigin(response);
+ assertOkayResponse(response, "{\"result\":\"0\"}");
+ }
+
+ @Test
+ public void testCorsIsDisabled() throws IOException {
+
BrooklynFeatureEnablement.disable(BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY);
+ final String shouldAllowOrigin = "http://foo.bar.com";;
+ BrooklynRestApiLauncher apiLauncher = baseLauncher()
+ .withoutJsgui();
+ ManagementContext mgmt =
LocalManagementContextForTests.builder(true)
+ .useAdditionalProperties(ImmutableMap.<String, Object>of(
+
BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY, false)
+ ).build();
+ apiLauncher.managementContext(mgmt);
+ useServerForTest(apiLauncher.start());
+
+ HttpClient client = client();
+ HttpToolResponse response = HttpTool.execAndConsume(client,
httpOptionsRequest("server/status", "GET", shouldAllowOrigin));
+ assertNull(response.getHeaderLists().get(HEADER_AC_ALLOW_ORIGIN),
"Access Control Header should not be available.");
+ assertOkayResponse(response, "");
+
+ response = HttpTool.execAndConsume(client,
httpOptionsRequest("script/groovy", shouldAllowOrigin, "POST"));
+ assertNull(response.getHeaderLists().get(HEADER_AC_ALLOW_ORIGIN),
"Access Control Header should not be available.");
+ assertOkayResponse(response, "");
--- End diff --
@geomacy that's right.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
