Adding OAuth authorization grant tests # Conflicts: # systests/rs-security/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3257af6d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3257af6d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3257af6d Branch: refs/heads/3.0.x-fixes Commit: 3257af6daf254d7ba19344bfa7ef9f517454cbd5 Parents: 6453dec Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Dec 8 13:08:25 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Dec 8 15:38:05 2015 +0000 ---------------------------------------------------------------------- systests/rs-security/pom.xml | 4 +- .../oauth2/grants/AuthorizationGrantTest.java | 318 +++++++++++++++++++ .../security/oauth2/grants/BasicAuthFilter.java | 117 +++++++ .../oauth2/grants/BookServerOAuth2Grants.java | 48 +++ .../oauth2/grants/CallbackHandlerImpl.java | 52 +++ .../grants/CallbackHandlerLoginHandler.java | 83 +++++ .../oauth2/grants/OAuthDataProviderImpl.java | 101 ++++++ .../jaxrs/security/oauth2/grants/client.xml | 38 +++ .../security/oauth2/grants/grants-server.xml | 122 +++++++ 9 files changed, 882 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/pom.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index b17040d..8c252bb 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -40,6 +40,7 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> +<<<<<<< HEAD <artifactId>jetty-server</artifactId> </dependency> <dependency> @@ -49,6 +50,8 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> +======= +>>>>>>> 6106f46... Adding OAuth authorization grant tests <artifactId>jetty-webapp</artifactId> </dependency> <dependency> @@ -201,7 +204,6 @@ <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.1</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java new file mode 100644 index 0000000..f42c709 --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java @@ -0,0 +1,318 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.ws.rs.core.Form; +import javax.ws.rs.core.Response; + +import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.cxf.jaxrs.provider.json.JSONProvider; +import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken; +import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData; +import org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider; +import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.junit.BeforeClass; + +/** + * Some tests for various authorization grants. + */ +public class AuthorizationGrantTest extends AbstractBusClientServerTestBase { + public static final String PORT = BookServerOAuth2Grants.PORT; + + @BeforeClass + public static void startServers() throws Exception { + assertTrue("server did not launch correctly", + launchServer(BookServerOAuth2Grants.class, true)); + } + + @org.junit.Test + public void testAuthorizationCodeGrant() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "alice", "security", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + // Get Authorization Code + String code = getAuthorizationCode(client); + assertNotNull(code); + + // Now get the access token + client = WebClient.create(address, setupProviders(), "consumer-id", "this-is-a-secret", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + ClientAccessToken accessToken = getAccessTokenWithAuthorizationCode(client, code); + assertNotNull(accessToken.getTokenKey()); + } + + @org.junit.Test + public void testAuthorizationCodeGrantRefresh() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "alice", "security", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + // Get Authorization Code + String code = getAuthorizationCode(client); + assertNotNull(code); + + // Now get the access token + client = WebClient.create(address, setupProviders(), "consumer-id", "this-is-a-secret", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + ClientAccessToken accessToken = getAccessTokenWithAuthorizationCode(client, code); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + + // Refresh the access token + client.type("application/x-www-form-urlencoded").accept("application/json"); + + Form form = new Form(); + form.param("grant_type", "refresh_token"); + form.param("refresh_token", accessToken.getRefreshToken()); + form.param("client_id", "consumer-id"); + Response response = client.post(form); + + accessToken = response.readEntity(ClientAccessToken.class); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + } + + @org.junit.Test + public void testAuthorizationCodeGrantRefreshWithScope() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "alice", "security", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + // Get Authorization Code + String code = getAuthorizationCode(client, "read_balance"); + assertNotNull(code); + + // Now get the access token + client = WebClient.create(address, setupProviders(), "consumer-id", "this-is-a-secret", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + ClientAccessToken accessToken = getAccessTokenWithAuthorizationCode(client, code); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + + // Refresh the access token + client.type("application/x-www-form-urlencoded").accept("application/json"); + + Form form = new Form(); + form.param("grant_type", "refresh_token"); + form.param("refresh_token", accessToken.getRefreshToken()); + form.param("client_id", "consumer-id"); + form.param("scope", "read_balance"); + Response response = client.post(form); + + accessToken = response.readEntity(ClientAccessToken.class); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + } + + @org.junit.Test + public void testAuthorizationCodeGrantWithScope() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "alice", "security", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + // Get Authorization Code + String code = getAuthorizationCode(client, "read_balance"); + assertNotNull(code); + + // Now get the access token + client = WebClient.create(address, setupProviders(), "consumer-id", "this-is-a-secret", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + ClientAccessToken accessToken = getAccessTokenWithAuthorizationCode(client, code); + assertNotNull(accessToken.getTokenKey()); + } + + @org.junit.Test + public void testImplicitGrant() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "alice", "security", busFile.toString()); + // Save the Cookie for the second request... + WebClient.getConfig(client).getRequestContext().put( + org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE); + + // Get Access Token + client.type("application/json").accept("application/json"); + client.query("client_id", "consumer-id"); + client.query("redirect_uri", "http://www.blah.apache.org";); + client.query("response_type", "token"); + client.path("authorize-implicit/"); + Response response = client.get(); + + OAuthAuthorizationData authzData = response.readEntity(OAuthAuthorizationData.class); + + // Now call "decision" to get the access token + client.path("decision"); + client.type("application/x-www-form-urlencoded"); + + Form form = new Form(); + form.param("session_authenticity_token", authzData.getAuthenticityToken()); + form.param("client_id", authzData.getClientId()); + form.param("redirect_uri", authzData.getRedirectUri()); + form.param("oauthDecision", "allow"); + + response = client.post(form); + + String location = response.getHeaderString("Location"); + String accessToken = location.substring(location.indexOf("access_token=") + "access_token=".length()); + accessToken = accessToken.substring(0, accessToken.indexOf('&')); + assertNotNull(accessToken); + } + + @org.junit.Test + public void testPasswordsCredentialsGrant() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "consumer-id", + "this-is-a-secret", busFile.toString()); + + // Get Access Token + client.type("application/x-www-form-urlencoded").accept("application/json"); + client.path("token"); + + Form form = new Form(); + form.param("grant_type", "password"); + form.param("username", "alice"); + form.param("password", "security"); + Response response = client.post(form); + + ClientAccessToken accessToken = response.readEntity(ClientAccessToken.class); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + } + + @org.junit.Test + public void testClientCredentialsGrant() throws Exception { + URL busFile = AuthorizationGrantTest.class.getResource("client.xml"); + + String address = "https://localhost:"; + PORT + "/services/"; + WebClient client = WebClient.create(address, setupProviders(), "consumer-id", + "this-is-a-secret", busFile.toString()); + + // Get Access Token + client.type("application/x-www-form-urlencoded").accept("application/json"); + client.path("token"); + + Form form = new Form(); + form.param("grant_type", "client_credentials"); + Response response = client.post(form); + + ClientAccessToken accessToken = response.readEntity(ClientAccessToken.class); + assertNotNull(accessToken.getTokenKey()); + assertNotNull(accessToken.getRefreshToken()); + } + + private String getAuthorizationCode(WebClient client) { + return getAuthorizationCode(client, null); + } + + private String getAuthorizationCode(WebClient client, String scope) { + // Make initial authorization request + client.type("application/json").accept("application/json"); + client.query("client_id", "consumer-id"); + client.query("redirect_uri", "http://www.blah.apache.org";); + client.query("response_type", "code"); + if (scope != null) { + client.query("scope", scope); + } + client.path("authorize/"); + Response response = client.get(); + + OAuthAuthorizationData authzData = response.readEntity(OAuthAuthorizationData.class); + + // Now call "decision" to get the authorization code grant + client.path("decision"); + client.type("application/x-www-form-urlencoded"); + + Form form = new Form(); + form.param("session_authenticity_token", authzData.getAuthenticityToken()); + form.param("client_id", authzData.getClientId()); + form.param("redirect_uri", authzData.getRedirectUri()); + if (authzData.getProposedScope() != null) { + form.param("scope", authzData.getProposedScope()); + } + form.param("oauthDecision", "allow"); + + response = client.post(form); + String location = response.getHeaderString("Location"); + return location.substring(location.indexOf("code=") + "code=".length()); + } + + private ClientAccessToken getAccessTokenWithAuthorizationCode(WebClient client, String code) { + client.type("application/x-www-form-urlencoded").accept("application/json"); + client.path("token"); + + Form form = new Form(); + form.param("grant_type", "authorization_code"); + form.param("code", code); + form.param("client_id", "consumer-id"); + Response response = client.post(form); + + return response.readEntity(ClientAccessToken.class); + } + + private List<Object> setupProviders() { + List<Object> providers = new ArrayList<Object>(); + JSONProvider<OAuthAuthorizationData> jsonP = new JSONProvider<OAuthAuthorizationData>(); + jsonP.setNamespaceMap(Collections.singletonMap("http://org.apache.cxf.rs.security.oauth";, + "ns2")); + providers.add(jsonP); + OAuthJSONProvider oauthProvider = new OAuthJSONProvider(); + providers.add(oauthProvider); + + return providers; + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BasicAuthFilter.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BasicAuthFilter.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BasicAuthFilter.java new file mode 100644 index 0000000..db8fe4f --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BasicAuthFilter.java @@ -0,0 +1,117 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import java.io.IOException; +import java.security.Principal; + +import javax.security.auth.callback.CallbackHandler; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.core.Response; + +import org.w3c.dom.Document; + +import org.apache.cxf.configuration.security.AuthorizationPolicy; +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.jaxrs.utils.ExceptionUtils; +import org.apache.cxf.jaxrs.utils.JAXRSUtils; +import org.apache.cxf.message.Message; +import org.apache.cxf.security.SecurityContext; +import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.dom.validate.UsernameTokenValidator; + +/** + * A simple filter to validate a Basic Auth username/password via a CallbackHandler + */ +public class BasicAuthFilter implements ContainerRequestFilter { + + private CallbackHandler callbackHandler; + + public void filter(ContainerRequestContext requestContext) throws IOException { + Message message = JAXRSUtils.getCurrentMessage(); + AuthorizationPolicy policy = message.get(AuthorizationPolicy.class); + + if (policy == null || policy.getUserName() == null || policy.getPassword() == null) { + requestContext.abortWith( + Response.status(401).header("WWW-Authenticate", "Basic realm=\"IdP\"").build()); + } + + try { + UsernameToken token = convertPolicyToToken(policy); + Credential credential = new Credential(); + credential.setUsernametoken(token); + + RequestData data = new RequestData(); + data.setMsgContext(message); + data.setCallbackHandler(callbackHandler); + UsernameTokenValidator validator = new UsernameTokenValidator(); + credential = validator.validate(credential, data); + + // Create a Principal/SecurityContext + Principal p = null; + if (credential != null && credential.getPrincipal() != null) { + p = credential.getPrincipal(); + } else { + p = new WSUsernameTokenPrincipalImpl(policy.getUserName(), false); + ((WSUsernameTokenPrincipalImpl)p).setPassword(policy.getPassword()); + } + message.put(SecurityContext.class, createSecurityContext(p)); + } catch (Exception ex) { + throw ExceptionUtils.toInternalServerErrorException(ex, null); + } + } + + protected UsernameToken convertPolicyToToken(AuthorizationPolicy policy) + throws Exception { + + Document doc = DOMUtils.createDocument(); + UsernameToken token = new UsernameToken(false, doc, + WSConstants.PASSWORD_TEXT); + token.setName(policy.getUserName()); + token.setPassword(policy.getPassword()); + return token; + } + + protected SecurityContext createSecurityContext(final Principal p) { + return new SecurityContext() { + + public Principal getUserPrincipal() { + return p; + } + + public boolean isUserInRole(String arg0) { + return false; + } + }; + } + + public CallbackHandler getCallbackHandler() { + return callbackHandler; + } + + public void setCallbackHandler(CallbackHandler callbackHandler) { + this.callbackHandler = callbackHandler; + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Grants.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Grants.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Grants.java new file mode 100644 index 0000000..7ae175f --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Grants.java @@ -0,0 +1,48 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import java.net.URL; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.TestUtil; + +public class BookServerOAuth2Grants extends AbstractBusTestServerBase { + public static final String PORT = TestUtil.getPortNumber("jaxrs-oauth2-grants"); + private static final URL SERVER_CONFIG_FILE = + BookServerOAuth2Grants.class.getResource("grants-server.xml"); + + protected void run() { + SpringBusFactory bf = new SpringBusFactory(); + Bus springBus = bf.createBus(SERVER_CONFIG_FILE); + BusFactory.setDefaultBus(springBus); + setBus(springBus); + + try { + new BookServerOAuth2Grants(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerImpl.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerImpl.java new file mode 100644 index 0000000..12c8658 --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerImpl.java @@ -0,0 +1,52 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import java.io.IOException; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; + +import org.apache.wss4j.common.ext.WSPasswordCallback; + +public class CallbackHandlerImpl implements CallbackHandler { + + public void handle(Callback[] callbacks) throws IOException, + UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + if (callbacks[i] instanceof WSPasswordCallback) { // CXF + WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; + if ("alice".equals(pc.getIdentifier())) { + pc.setPassword("security"); + break; + } else if ("bob".equals(pc.getIdentifier())) { + pc.setPassword("security"); + break; + } else if ("consumer-id".equals(pc.getIdentifier())) { + pc.setPassword("this-is-a-secret"); + break; + } else if ("service".equals(pc.getIdentifier())) { + pc.setPassword("service-pass"); + break; + } + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java new file mode 100644 index 0000000..0442d68 --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java @@ -0,0 +1,83 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import javax.security.auth.callback.CallbackHandler; + +import org.w3c.dom.Document; + +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.jaxrs.utils.ExceptionUtils; +import org.apache.cxf.phase.PhaseInterceptorChain; +import org.apache.cxf.rs.security.oauth2.common.UserSubject; +import org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerLoginHandler; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.dom.validate.UsernameTokenValidator; + +/** + * A simple ResourceOwnerLoginHandler implementation that delegates the username/password to a CallbackHandler + */ +public class CallbackHandlerLoginHandler implements ResourceOwnerLoginHandler { + + private CallbackHandler callbackHandler; + + static { + WSSConfig.init(); + } + + @Override + public UserSubject createSubject(String user, String pass) { + Document doc = DOMUtils.createDocument(); + UsernameToken token = new UsernameToken(false, doc, + WSConstants.PASSWORD_TEXT); + token.setName(user); + token.setPassword(pass); + + Credential credential = new Credential(); + credential.setUsernametoken(token); + + RequestData data = new RequestData(); + data.setMsgContext(PhaseInterceptorChain.getCurrentMessage()); + data.setCallbackHandler(callbackHandler); + UsernameTokenValidator validator = new UsernameTokenValidator(); + + try { + credential = validator.validate(credential, data); + + UserSubject subject = new UserSubject(); + subject.setLogin(user); + return subject; + } catch (Exception ex) { + throw ExceptionUtils.toInternalServerErrorException(ex, null); + } + } + + public CallbackHandler getCallbackHandler() { + return callbackHandler; + } + + public void setCallbackHandler(CallbackHandler callbackHandler) { + this.callbackHandler = callbackHandler; + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/OAuthDataProviderImpl.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/OAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/OAuthDataProviderImpl.java new file mode 100644 index 0000000..0ae9708 --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/OAuthDataProviderImpl.java @@ -0,0 +1,101 @@ +/** + * 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.cxf.systest.jaxrs.security.oauth2.grants; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.cxf.rs.security.oauth2.common.Client; +import org.apache.cxf.rs.security.oauth2.common.OAuthPermission; +import org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider; +import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException; + +/** + * Extend the DefaultEHCacheCodeDataProvider to allow refreshing of tokens + */ +public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider { + + public OAuthDataProviderImpl() { + Client client = new Client("consumer-id", "this-is-a-secret", true); + client.setRedirectUris(Collections.singletonList("http://www.blah.apache.org";)); + + client.getAllowedGrantTypes().add("authorization_code"); + client.getAllowedGrantTypes().add("refresh_token"); + client.getAllowedGrantTypes().add("implicit"); + client.getAllowedGrantTypes().add("password"); + client.getAllowedGrantTypes().add("client_credentials"); + client.getAllowedGrantTypes().add("urn:ietf:params:oauth:grant-type:saml2-bearer"); + client.getAllowedGrantTypes().add("urn:ietf:params:oauth:grant-type:jwt-bearer"); + + client.getRegisteredScopes().add("read_balance"); + client.getRegisteredScopes().add("create_balance"); + client.getRegisteredScopes().add("read_data"); + + this.setClient(client); + } + + @Override + protected boolean isRefreshTokenSupported(List<String> theScopes) { + return true; + } + + @Override + public List<OAuthPermission> convertScopeToPermissions(Client client, List<String> requestedScopes) { + if (requestedScopes.isEmpty()) { + return Collections.emptyList(); + } + + List<OAuthPermission> permissions = new ArrayList<>(); + for (String requestedScope : requestedScopes) { + if ("read_balance".equals(requestedScope)) { + OAuthPermission permission = new OAuthPermission(); + permission.setHttpVerbs(Collections.singletonList("GET")); + List<String> uris = new ArrayList<>(); + String partnerAddress = "/partners/balance/*"; + uris.add(partnerAddress); + permission.setUris(uris); + + permissions.add(permission); + } else if ("create_balance".equals(requestedScope)) { + OAuthPermission permission = new OAuthPermission(); + permission.setHttpVerbs(Collections.singletonList("POST")); + List<String> uris = new ArrayList<>(); + String partnerAddress = "/partners/balance/*"; + uris.add(partnerAddress); + permission.setUris(uris); + + permissions.add(permission); + } else if ("read_data".equals(requestedScope)) { + OAuthPermission permission = new OAuthPermission(); + permission.setHttpVerbs(Collections.singletonList("GET")); + List<String> uris = new ArrayList<>(); + String partnerAddress = "/partners/data/*"; + uris.add(partnerAddress); + permission.setUris(uris); + + permissions.add(permission); + } else { + throw new OAuthServiceException("invalid_scope"); + } + } + + return permissions; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml new file mode 100644 index 0000000..13eaea1 --- /dev/null +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli cy.xsd"> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + <cxf:bus> + <cxf:features> + <cxf:logging/> + </cxf:features> + </cxf:bus> + <http:conduit name="https://localhost.*";> + <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> + <http:tlsClientParameters disableCNCheck="true"> + <sec:keyManagers keyPassword="password"> + <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + </sec:keyManagers> + <sec:trustManagers> + <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + </sec:trustManagers> + </http:tlsClientParameters> + </http:conduit> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/3257af6d/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml new file mode 100644 index 0000000..74a8fcd --- /dev/null +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:http="http://cxf.apache.org/transports/http/configuration"; + xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; + xmlns:sec="http://cxf.apache.org/configuration/security"; + xmlns:cxf="http://cxf.apache.org/core"; + xmlns:jaxrs="http://cxf.apache.org/jaxrs"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd";> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + <cxf:bus> + <cxf:features> + <cxf:logging/> + </cxf:features> + <cxf:properties> + <entry key="org.apache.cxf.jaxrs.bus.providers" value-ref="busProviders"/> + </cxf:properties> + </cxf:bus> + <!-- providers --> + <util:list id="busProviders"> + <ref bean="oauthJson"/> + </util:list> + <bean id="oauthJson" class="org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider"/> + + <httpj:engine-factory id="tls-config"> + <httpj:engine port="${testutil.ports.jaxrs-oauth2-grants}"> + <httpj:tlsServerParameters> + <sec:keyManagers keyPassword="password"> + <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + </sec:keyManagers> + <sec:trustManagers> + <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + </sec:trustManagers> + <sec:clientAuthentication want="true" required="true"/> + </httpj:tlsServerParameters> + <httpj:sessionSupport>true</httpj:sessionSupport> + </httpj:engine> + </httpj:engine-factory> + + <bean id="oauthProvider" class="org.apache.cxf.systest.jaxrs.security.oauth2.grants.OAuthDataProviderImpl" /> + + <bean id="authorizationService" class="org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService"> + <property name="dataProvider" ref="oauthProvider"/> + </bean> + + <bean id="implicitService" class="org.apache.cxf.rs.security.oauth2.services.ImplicitGrantService"> + <property name="dataProvider" ref="oauthProvider"/> + </bean> + + <bean id="refreshGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.refresh.RefreshTokenGrantHandler"> + <property name="dataProvider" ref="oauthProvider"/> + </bean> + + <bean id="callbackHandlerLoginHandler" class="org.apache.cxf.systest.jaxrs.security.oauth2.grants.CallbackHandlerLoginHandler"> + <property name="callbackHandler" ref="callbackHandler"/> + </bean> + + <bean id="passwordGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerGrantHandler"> + <property name="dataProvider" ref="oauthProvider"/> + <property name="loginHandler" ref="callbackHandlerLoginHandler"/> + </bean> + + <bean id="clientCredsGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.clientcred.ClientCredentialsGrantHandler"> + <property name="dataProvider" ref="oauthProvider"/> + </bean> + + <bean id="tokenService" class="org.apache.cxf.rs.security.oauth2.services.AccessTokenService"> + <property name="dataProvider" ref="oauthProvider"/> + <property name="grantHandlers"> + <list> + <ref bean="refreshGrantHandler"/> + <ref bean="passwordGrantHandler"/> + <ref bean="clientCredsGrantHandler"/> + </list> + </property> + </bean> + + <bean id="callbackHandler" class="org.apache.cxf.systest.jaxrs.security.oauth2.grants.CallbackHandlerImpl"/> + <bean id="basicAuthFilter" class="org.apache.cxf.systest.jaxrs.security.oauth2.grants.BasicAuthFilter"> + <property name="callbackHandler" ref="callbackHandler"/> + </bean> + + <jaxrs:server + depends-on="tls-config" + address="https://localhost:${testutil.ports.jaxrs-oauth2-grants}/services";> + <jaxrs:serviceBeans> + <ref bean="authorizationService"/> + <ref bean="implicitService"/> + <ref bean="tokenService"/> + </jaxrs:serviceBeans> + <jaxrs:providers> + <ref bean="basicAuthFilter"/> + </jaxrs:providers> + </jaxrs:server> + + +</beans>
