diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java index 4c811506..55148b8a 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java @@ -23,15 +23,13 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.oltu.oauth2.as.validator.RefreshTokenValidator; import org.apache.oltu.oauth2.as.validator.AuthorizationCodeValidator; import org.apache.oltu.oauth2.as.validator.ClientCredentialValidator; import org.apache.oltu.oauth2.as.validator.PasswordValidator; -import org.apache.oltu.oauth2.as.validator.RefreshTokenValidator; -import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.message.types.GrantType; -import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.apache.oltu.oauth2.common.validators.OAuthValidator; diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthUnauthenticatedTokenRequest.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthUnauthenticatedTokenRequest.java index 0e70af85..036066f8 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthUnauthenticatedTokenRequest.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthUnauthenticatedTokenRequest.java @@ -19,15 +19,12 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.oltu.oauth2.as.validator.PasswordValidator; -import org.apache.oltu.oauth2.as.validator.UnauthenticatedAuthorizationCodeValidator; import org.apache.oltu.oauth2.as.validator.UnauthenticatedPasswordValidator; import org.apache.oltu.oauth2.as.validator.UnauthenticatedRefreshTokenValidator; -import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.as.validator.UnauthenticatedAuthorizationCodeValidator; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.message.types.GrantType; -import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.apache.oltu.oauth2.common.validators.OAuthValidator; /** diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java index 3ddc8164..4a532769 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java @@ -23,10 +23,10 @@ import junit.framework.Assert; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl; import org.junit.Test; import org.apache.oltu.oauth2.as.issuer.MD5Generator; import org.apache.oltu.oauth2.as.issuer.OAuthIssuer; -import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl; /** * diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java index 8453455c..27327b12 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java @@ -27,9 +27,9 @@ import junit.framework.Assert; import org.apache.commons.codec.binary.Base64; -import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest; import org.apache.oltu.oauth2.as.request.OAuthRequest; import org.apache.oltu.oauth2.as.request.OAuthTokenRequest; +import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java index 3f189fdc..a6b1a599 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java @@ -21,11 +21,10 @@ package org.apache.oltu.oauth2.as; +import org.apache.oltu.oauth2.as.issuer.UUIDValueGenerator; import org.junit.Assert; import org.junit.Test; -import org.apache.oltu.oauth2.as.issuer.UUIDValueGenerator; - /** * * diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java index e0a8d20e..899c4b56 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.oltu.oauth2.as.response.OAuthASResponse; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java index f67ad859..e22dc3de 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.oltu.oauth2.as.validator.TokenValidator; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.junit.Assert; diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 99a7e853..54221e98 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -22,6 +22,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.parent 1.0.1-SNAPSHOT + ../pom.xml org.apache.oltu.oauth2.common diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java index f32d0970..e8922732 100644 --- a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java @@ -29,7 +29,8 @@ public enum ResponseType { CODE("code"), - TOKEN("token"); + TOKEN("token"), + ID_TOKEN("id_token"); private String code; diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidatorMixer.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidatorMixer.java new file mode 100644 index 00000000..95a904ba --- /dev/null +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidatorMixer.java @@ -0,0 +1,71 @@ +package org.apache.oltu.oauth2.common.validators; + +import java.util.ArrayList; +import java.util.Collection; +import javax.servlet.http.HttpServletRequest; + +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; + + +public class OAuthValidatorMixer implements OAuthValidator { + + + private final Collection> valids; + + public OAuthValidatorMixer(Collection>> valids) throws OAuthSystemException { + this.valids=transform(valids); + } + + private Collection> transform(Collection>> valids) throws OAuthSystemException { + Collection> newList=new ArrayList>(); + for(Class> classez:valids){ + newList.add(OAuthUtils.instantiateClass(classez)); + } + return newList; + } + + public void validateMethod(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateMethod(request); + } + } + + public void validateContentType(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateContentType(request); + } + } + + public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateRequiredParameters(request); + } + } + + public void validateOptionalParameters(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateOptionalParameters(request); + } + } + + public void validateNotAllowedParameters(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateNotAllowedParameters(request); + } + } + + public void validateClientAuthenticationCredentials(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.validateClientAuthenticationCredentials(request); + } + } + + public void performAllValidations(HttpServletRequest request) throws OAuthProblemException { + for(OAuthValidator validator:valids){ + validator.performAllValidations(request); + } + } +} diff --git a/openid-connect/authzserver/pom.xml b/openid-connect/authzserver/pom.xml new file mode 100644 index 00000000..050005c6 --- /dev/null +++ b/openid-connect/authzserver/pom.xml @@ -0,0 +1,94 @@ + + + + 4.0.0 + + + org.apache.oltu.openidconnect + org.apache.oltu.openidconnect.parent + 1-SNAPSHOT + + + org.apache.oltu.openidconnect.authzserver + bundle + + Apache Oltu - Open IdConnect - Authorization Server + + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.common + 1.0.1-SNAPSHOT + + + + org.json + json + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + test + + + + org.apache.cxf + cxf-testutils + ${cxf.version} + test + + + + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + release-assembly + package + + single + + + + ${basedir}/src/main/assembly/bin.xml + + + + + + + + + diff --git a/openid-connect/authzserver/src/main/assembly/LICENSE-with-deps b/openid-connect/authzserver/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/openid-connect/authzserver/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed 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. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/openid-connect/authzserver/src/main/assembly/NOTICE-with-deps b/openid-connect/authzserver/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/openid-connect/authzserver/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/openid-connect/authzserver/src/main/assembly/bin.xml b/openid-connect/authzserver/src/main/assembly/bin.xml new file mode 100644 index 00000000..b38bf6c1 --- /dev/null +++ b/openid-connect/authzserver/src/main/assembly/bin.xml @@ -0,0 +1,51 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + + + + true + /lib + + + + diff --git a/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/request/OpenIdConnectAuthzRequest.java b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/request/OpenIdConnectAuthzRequest.java new file mode 100644 index 00000000..ec157f03 --- /dev/null +++ b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/request/OpenIdConnectAuthzRequest.java @@ -0,0 +1,111 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * 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.oltu.openidconnect.as.request; + +import java.util.ArrayList; +import java.util.Collection; +import javax.servlet.http.HttpServletRequest; + +import org.apache.oltu.oauth2.as.request.OAuthRequest; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.ResponseType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.common.validators.OAuthValidatorMixer; +import org.apache.oltu.oauth2.as.validator.CodeValidator; +import org.apache.oltu.oauth2.as.validator.TokenValidator; +import org.apache.oltu.openidconnect.common.OpenIdConnect; + +/** + * + * + * + */ +public class OpenIdConnectAuthzRequest extends OAuthRequest { + + public OpenIdConnectAuthzRequest(HttpServletRequest request) throws OAuthSystemException, OAuthProblemException { + super(request); + } + + @Override + protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException { + //end user authorization validators + validators.put(ResponseType.CODE.toString(), CodeValidator.class); + validators.put(ResponseType.TOKEN.toString(), TokenValidator.class); + validators.put(ResponseType.ID_TOKEN.toString(), TokenValidator.class); + final String requestTypeValue = getParam(OAuth.OAUTH_RESPONSE_TYPE); + final String[]splitedRequestTypeValue=requestTypeValue.split(" "); + + if (OAuthUtils.isEmpty(requestTypeValue)||splitedRequestTypeValue.length==0) { + throw OAuthUtils.handleOAuthProblemException("Missing response_type parameter value"); + } + Collection>> valids=new ArrayList>>(); + for(int i=0;i> clazz = validators.get(splitedRequestTypeValue[i]); + if (clazz == null) { + throw OAuthUtils.handleOAuthProblemException("Invalid response_type parameter value"); + } + valids.add(clazz); + } + return merge(valids); + + } + + /** + * Mix validator in one + * @param valids + * @return + */ + private OAuthValidator merge(Collection>> valids) throws OAuthSystemException { + return new OAuthValidatorMixer(valids); + } + + public String getState() { + return getParam(OAuth.OAUTH_STATE); + } + + public String[] getResponseType() { + return getParam(OAuth.OAUTH_RESPONSE_TYPE).split(" "); + } + + public String getNonce() { + return getParam(OpenIdConnect.OPENIDCONNECT_NONE); + } + public String getDisplay() { + return getParam(OpenIdConnect.OPENIDCONNECT_DISPLAY); + } + public String getPrompt() { + return getParam(OpenIdConnect.OPENIDCONNECT_PROMPT); + } + public String getMacAge() { + return getParam(OpenIdConnect.OPENIDCONNECT_MAX_AGE); + } + public String getUiLocales() {return getParam(OpenIdConnect.OPENIDCONNECT_UI_LOCALES);} + public String getIdTokenHint() {return getParam(OpenIdConnect.OPENIDCONNECT_ID_TOKEN_HINT);} + public String getLoginHint() {return getParam(OpenIdConnect.OPENIDCONNECT_LOGIN_HINT);} + public String getAcrValues() {return getParam(OpenIdConnect.OPENIDCONNECT_ACR_VALUES);} + + + +} diff --git a/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/response/OpenIdConnectASResponse.java b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/response/OpenIdConnectASResponse.java new file mode 100644 index 00000000..c957ea31 --- /dev/null +++ b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/as/response/OpenIdConnectASResponse.java @@ -0,0 +1,122 @@ +package org.apache.oltu.openidconnect.as.response; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.openidconnect.common.OpenIdConnect; + + +public class OpenIdConnectASResponse extends OAuthResponse { + protected OpenIdConnectASResponse(String uri, int responseStatus) { + super(uri, responseStatus); + } + + + public static OpenIdConnectAuthorizationResponseBuilder authorizationResponse(HttpServletRequest request,int code) { + return new OpenIdConnectAuthorizationResponseBuilder(request,code); + } + + public static OpenIdConnectTokenResponseBuilder tokenResponse(int code) { + return new OpenIdConnectTokenResponseBuilder(code); + } + + public static class OpenIdConnectAuthorizationResponseBuilder extends OAuthResponseBuilder { + + public OpenIdConnectAuthorizationResponseBuilder(HttpServletRequest request,int responseCode) { + super(responseCode); + //AMBER-45 + String state=request.getParameter(OAuth.OAUTH_STATE); + if (state!=null){ + this.setState(state); + } + } + + OpenIdConnectAuthorizationResponseBuilder setState(String state) { + this.parameters.put(OAuth.OAUTH_STATE, state); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setCode(String code) { + this.parameters.put(OAuth.OAUTH_CODE, code); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setAccessToken(String token) { + this.parameters.put(OAuth.OAUTH_ACCESS_TOKEN, token); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setTokenType(String tokenType) { + this.parameters.put(OAuth.OAUTH_TOKEN_TYPE, tokenType); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setExpiresIn(String expiresIn) { + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn == null ? null : Long.valueOf(expiresIn)); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setExpiresIn(Long expiresIn) { + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setIdToken(String idtoken) { + this.parameters.put(OpenIdConnect.OPENIDCONNECT_ID_TOKEN, idtoken); + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder location(String location) { + this.location = location; + return this; + } + + public OpenIdConnectAuthorizationResponseBuilder setParam(String key, String value) { + this.parameters.put(key, value); + return this; + } + } + + + public static class OpenIdConnectTokenResponseBuilder extends OAuthResponseBuilder { + + public OpenIdConnectTokenResponseBuilder(int responseCode) { + super(responseCode); + } + + public OpenIdConnectTokenResponseBuilder setAccessToken(String token) { + this.parameters.put(OAuth.OAUTH_ACCESS_TOKEN, token); + return this; + } + + public OpenIdConnectTokenResponseBuilder setExpiresIn(String expiresIn) { + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn == null ? null : Long.valueOf(expiresIn)); + return this; + } + + public OpenIdConnectTokenResponseBuilder setRefreshToken(String refreshToken) { + this.parameters.put(OAuth.OAUTH_REFRESH_TOKEN, refreshToken); + return this; + } + + public OpenIdConnectTokenResponseBuilder setTokenType(String tokenType) { + this.parameters.put(OAuth.OAUTH_TOKEN_TYPE, tokenType); + return this; + } + public OpenIdConnectTokenResponseBuilder setIdToken(String idtoken) { + this.parameters.put(OpenIdConnect.OPENIDCONNECT_ID_TOKEN, idtoken); + return this; + } + + public OpenIdConnectTokenResponseBuilder setParam(String key, String value) { + this.parameters.put(key, value); + return this; + } + + public OpenIdConnectTokenResponseBuilder location(String location) { + this.location = location; + return this; + } + } +} diff --git a/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/OpenIdConnect.java b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/OpenIdConnect.java new file mode 100644 index 00000000..282a7a00 --- /dev/null +++ b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/OpenIdConnect.java @@ -0,0 +1,14 @@ +package org.apache.oltu.openidconnect.common; + + +public class OpenIdConnect { + public static final String OPENIDCONNECT_NONE = "none"; + public static final String OPENIDCONNECT_DISPLAY = "display"; + public static final String OPENIDCONNECT_PROMPT = "prompt"; + public static final String OPENIDCONNECT_MAX_AGE = "max_age"; + public static final String OPENIDCONNECT_UI_LOCALES = "ui_locales"; + public static final String OPENIDCONNECT_ID_TOKEN_HINT = "id_token_hint"; + public static final String OPENIDCONNECT_LOGIN_HINT = "login_hint"; + public static final String OPENIDCONNECT_ACR_VALUES = "acr_values"; + public static final String OPENIDCONNECT_ID_TOKEN = "id_token"; +} diff --git a/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/token/OpenIdConnectToken.java b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/token/OpenIdConnectToken.java new file mode 100644 index 00000000..4369c1c3 --- /dev/null +++ b/openid-connect/authzserver/src/main/java/org/apache/oltu/openidconnect/common/token/OpenIdConnectToken.java @@ -0,0 +1,18 @@ +package org.apache.oltu.openidconnect.common.token; + +import org.apache.oltu.oauth2.common.token.OAuthToken; + + +public interface OpenIdConnectToken { + + String getiss(); + String getSub(); + String getAud(); + long getExp(); + long getIat(); + long getAuth_time(); + String getNonce(); + String getAcr(); + String getAmr(); + String getAzp(); +} diff --git a/openid-connect/common/pom.xml b/openid-connect/common/pom.xml index 5c959d07..db37d305 100644 --- a/openid-connect/common/pom.xml +++ b/openid-connect/common/pom.xml @@ -22,6 +22,7 @@ org.apache.oltu.openidconnect org.apache.oltu.openidconnect.parent 1-SNAPSHOT + ../pom.xml org.apache.oltu.openidconnect.common diff --git a/openid-connect/pom.xml b/openid-connect/pom.xml index a7a0bcb8..c7fb4e77 100644 --- a/openid-connect/pom.xml +++ b/openid-connect/pom.xml @@ -17,6 +17,18 @@ --> 4.0.0 + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.authzserver + 1.0.0 + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.common + 1.0.0 + + org.apache.oltu @@ -58,12 +70,30 @@ + + 2.2.10 + common client + authzserver + + + + org.json + json + 20140107 + + + commons-codec + commons-codec + 1.9 + + + site diff --git a/parent/pom.xml b/parent/pom.xml index 11aacc8c..dcf4e1b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -27,7 +27,7 @@ org.apache.oltu org.apache.oltu.parent - 4-SNAPSHOT + 3-SNAPSHOT pom Apache Oltu - Parent