Skip to content

Commit

Permalink
Add CXF CrossOriginResourceSharing filter
Browse files Browse the repository at this point in the history
  • Loading branch information
bostko committed Jan 17, 2017
1 parent 2bdbf14 commit 7462f7e
Show file tree
Hide file tree
Showing 10 changed files with 335 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,37 @@ public class BrooklynFeatureEnablement {
/** whether feeds are automatically registered when set on entities, so that they are persisted */
public static final String FEATURE_FEED_REGISTRATION_PROPERTY = FEATURE_PROPERTY_PREFIX+".feedRegistration";

/**
* We strongly discourage enabling CORS!
* Using CORS expose you at great security risk!
* If you are thinking about using CORS on Apache Brooklyn side then probably that's the wrong solution to your problem.
* We recommend using middleware for delegating API requests from third party web applications.
* Apache Brooklyn API requests should be exposed to third party web apps with great attention and complete testing.
* The right fix is to change your calling structure; architecturally, the browser shouldn't be calling the Apache Brooklyn APIs directly.
* A web app should be interacting solely with the Apache Brooklyn server.
* If there is a need to get information from Apache Brooklyn APIs then,
* it could either simply proxy the request or could do the request on the client's behalf and potentially further processing on the results before finally getting back to the client.
*
* If brooklyn.experimental.feature.corsCxfFeature.allowedOrigins is not supplied then allowedOrigins will be on all domains.
*
* Currently there is no fine per API request control it is rather applied to the entire server.
* Even if you have per API request control and apply CORS to groups of pages/resources,
* then you have to think about how to configure the values that get added to the CORS header,
* as you really don't want to use a "*" wildcard.
* Also you have to think about what the user interface is to capture this config, and maybe issues around how to persist it, upgrade etc.
*
* It is best when web app communicates just with its own server, not with multiple servers.
* It's the Apache Brooklyn server that should be the single point of contact to moderate and control access to the information from the AMP API, which should never be independently exposed to a web UI.
* This sort of architecture can give you additional headaches behind proxies, with firewalls, etc.
* For another thing, CORS can be used and can be secure enough up to a point if implemented right (and that's not a trivial 'if'),
* but it is still an additional attack vector that can be exploited by mitm attacks etc.
* In short, the proposed architecture and use of CORS is more complex, less secure,
* and more difficult to manage than the alternative of web client ---> Apache Brooklyn Server ----> fan out to backend servers + Apache Brooklyn API + etc.
*
* Notes by Geoff Macartney.
*/
public static final String FEATURE_CORS_CXF_PROPERTY = FEATURE_PROPERTY_PREFIX + ".corsCxfFeature";

public static final String FEATURE_CATALOG_PERSISTENCE_PROPERTY = FEATURE_PROPERTY_PREFIX+".catalogPersistence";

/** whether the default standby mode is {@link HighAvailabilityMode#HOT_STANDBY} or falling back to the traditional
Expand Down
1 change: 1 addition & 0 deletions karaf/features/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
<feature>brooklyn-camp-base</feature>

<feature>cxf-jaxrs</feature>
<bundle dependency="true">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle>

<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import javax.annotation.Nullable;
import javax.security.auth.spi.LoginModule;

import com.google.common.collect.ImmutableList;
import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.rest.NopSecurityHandler;
import org.apache.brooklyn.api.location.PortRange;
import org.apache.brooklyn.api.mgmt.ManagementContext;
Expand All @@ -52,6 +54,7 @@
import org.apache.brooklyn.rest.RestApiSetup;
import org.apache.brooklyn.rest.filter.CsrfTokenFilter;
import org.apache.brooklyn.rest.filter.EntitlementContextFilter;
import org.apache.brooklyn.rest.filter.CorsImplSupplierFilter;
import org.apache.brooklyn.rest.filter.HaHotCheckResourceFilter;
import org.apache.brooklyn.rest.filter.LoggingFilter;
import org.apache.brooklyn.rest.filter.NoCacheFilter;
Expand Down Expand Up @@ -80,6 +83,7 @@
import org.apache.brooklyn.util.text.Identifiers;
import org.apache.brooklyn.util.text.Strings;
import org.apache.brooklyn.util.web.ContextHandlerCollectionHotSwappable;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.jaas.JAASLoginService;
import org.eclipse.jetty.server.Connector;
Expand All @@ -99,6 +103,8 @@
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;

import static org.apache.brooklyn.rest.filter.CorsImplSupplierFilter.ALLOWED_ORIGINS;

/**
* Starts the web-app running, connected to the given management context
*/
Expand Down Expand Up @@ -455,14 +461,21 @@ public synchronized void start() throws Exception {
}

private WebAppContext deployRestApi(WebAppContext context) {
RestApiSetup.installRest(context,
ImmutableList.Builder<Object> providersListBuilder = ImmutableList.builder();
providersListBuilder.add(
new ManagementContextProvider(),
new ShutdownHandlerProvider(shutdownHandler),
new RequestTaggingRsFilter(),
new NoCacheFilter(),
new HaHotCheckResourceFilter(),
new EntitlementContextFilter(),
new CsrfTokenFilter());
if (BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY)) {
providersListBuilder.add(new CorsImplSupplierFilter(managementContext));
}

RestApiSetup.installRest(context,
providersListBuilder.build().toArray());
RestApiSetup.installServletFilters(context,
RequestTaggingFilter.class,
LoggingFilter.class);
Expand Down
5 changes: 5 additions & 0 deletions rest/rest-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
</dependency>

<dependency>
<groupId>org.apache.brooklyn</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
* 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.filter;

import com.google.common.reflect.TypeToken;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.util.JavaGroovyEquivalents;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.ext.Provider;
import java.util.Collections;
import java.util.List;

/**
* We strongly discourage enabling CORS!
* Using CORS expose you at great security risk!
* If you are thinking about using CORS on Apache Brooklyn side then probably that's the wrong solution to your problem.
* We recommend using middleware for delegating API requests from third party web applications.
* Apache Brooklyn API requests should be exposed to third party web apps with great attention and complete testing.
* The right fix is to change your calling structure; architecturally, the browser shouldn't be calling the Apache Brooklyn APIs directly.
* A web app should be interacting solely with the Apache Brooklyn server.
* If there is a need to get information from Apache Brooklyn APIs then,
* it could either simply proxy the request or could do the request on the client's behalf and potentially further processing on the results before finally getting back to the client.
*
* If brooklyn.experimental.feature.corsCxfFeature.allowedOrigins is not supplied then allowedOrigins will be on all domains.
*
* Currently there is no fine per API request control it is rather applied to the entire server.
* Even if you have per API request control and apply CORS to groups of pages/resources,
* then you have to think about how to configure the values that get added to the CORS header,
* as you really don't want to use a "*" wildcard.
* Also you have to think about what the user interface is to capture this config, and maybe issues around how to persist it, upgrade etc.
*
* It is best when web app communicates just with its own server, not with multiple servers.
* It's the Apache Brooklyn server that should be the single point of contact to moderate and control access to the information from the AMP API, which should never be independently exposed to a web UI.
* This sort of architecture can give you additional headaches behind proxies, with firewalls, etc.
* For another thing, CORS can be used and can be secure enough up to a point if implemented right (and that's not a trivial 'if'),
* but it is still an additional attack vector that can be exploited by mitm attacks etc.
* In short, the proposed architecture and use of CORS is more complex, less secure,
* and more difficult to manage than the alternative of web client ---> Apache Brooklyn Server ----> fan out to backend servers + Apache Brooklyn API + etc.
*
* Notes by Geoff Macartney.
*/
@Provider
public class CorsImplSupplierFilter extends CrossOriginResourceSharingFilter {
public static final ConfigKey<List<String>> ALLOWED_ORIGINS = ConfigKeys.newConfigKey(new TypeToken<List<String>>() {}, BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY + ".allowedOrigins");
private static final Logger LOGGER = LoggerFactory.getLogger(CorsImplSupplierFilter.class);

private static final boolean brooklynFeatureEnabled = BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY);
static {
if (brooklynFeatureEnabled) {
LOGGER.warn("CORS brooklyn feature enabled.");
}
}

public CorsImplSupplierFilter(@Nullable ManagementContext managementContext) {
setFindResourceMethod(false);
if (managementContext != null) {
setAllowOrigins(JavaGroovyEquivalents.<List<String>>elvis(managementContext.getConfig().getConfig(ALLOWED_ORIGINS), Collections.<String>emptyList()));
}
}

@Override
public void filter(ContainerRequestContext requestContext) {
if (brooklynFeatureEnabled) {
super.filter(requestContext);
}
}

@Override
public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
if (brooklynFeatureEnabled) {
super.filter(requestContext, responseContext);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Response toResponse(Throwable throwable1) {
Exceptions.collapse(throwable1));
} else {
LOG.debug("REST request running as {} threw: {}", Entitlements.getEntitlementContext(),
Exceptions.collapse(throwable1));
Exceptions.collapse(throwable1));
}
if (LOG.isTraceEnabled()) {
LOG.trace("Full details of "+Entitlements.getEntitlementContext()+" "+throwable1, throwable1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ limitations under the License.
<bean class="org.apache.brooklyn.rest.util.ShutdownHandlerProvider">
<argument ref="shutdownHandler" />
</bean>
<bean class="org.apache.brooklyn.rest.filter.CorsImplSupplierFilter" >
<argument ref="localManagementContext" />
</bean>
</jaxrs:providers>

<jaxrs:properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.brooklyn.rest;

import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.brooklyn.rest.filter.CorsImplSupplierFilter.ALLOWED_ORIGINS;

import java.io.File;
import java.io.FilenameFilter;
Expand All @@ -31,11 +32,13 @@
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract;
import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer;
import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.core.server.BrooklynServerConfig;
import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.filter.CorsImplSupplierFilter;
import org.apache.brooklyn.rest.filter.CsrfTokenFilter;
import org.apache.brooklyn.rest.filter.EntitlementContextFilter;
import org.apache.brooklyn.rest.filter.HaHotCheckResourceFilter;
Expand All @@ -56,6 +59,7 @@
import org.apache.brooklyn.util.net.Networking;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.text.WildcardGlobs;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
import org.eclipse.jetty.jaas.JAASLoginService;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
Expand Down Expand Up @@ -232,14 +236,21 @@ private WebAppContext servletContextHandler(ManagementContext managementContext)
context.setAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT, managementContext);

installWar(context);
RestApiSetup.installRest(context,
ImmutableList.Builder<Object> providersListBuilder = ImmutableList.builder();
providersListBuilder.add(
new ManagementContextProvider(),
new ShutdownHandlerProvider(shutdownListener),
new RequestTaggingRsFilter(),
new NoCacheFilter(),
new HaHotCheckResourceFilter(),
new EntitlementContextFilter(),
new CsrfTokenFilter());
if (BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_CORS_CXF_PROPERTY)) {
providersListBuilder.add(new CorsImplSupplierFilter(managementContext));
}
RestApiSetup.installRest(context,
providersListBuilder.build().toArray());

RestApiSetup.installServletFilters(context, this.filters);

context.setContextPath("/");
Expand Down

0 comments on commit 7462f7e

Please sign in to comment.