You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by si...@apache.org on 2013/09/18 09:30:51 UTC
svn commit: r1524313 - in /oltu/trunk/openid-connect/client/src:
main/java/org/apache/oltu/openidconnect/
main/java/org/apache/oltu/openidconnect/client/response/
test/java/org/apache/oltu/openidconnect/client/response/
Author: simonetripodi
Date: Wed Sep 18 07:30:51 2013
New Revision: 1524313
URL: http://svn.apache.org/r1524313
Log:
trivial: code format
Modified:
oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/OpenIdConnect.java
oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponse.java
oltu/trunk/openid-connect/client/src/test/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponseTest.java
Modified: oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/OpenIdConnect.java
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/OpenIdConnect.java?rev=1524313&r1=1524312&r2=1524313&view=diff
==============================================================================
--- oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/OpenIdConnect.java (original)
+++ oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/OpenIdConnect.java Wed Sep 18 07:30:51 2013
@@ -19,8 +19,9 @@ package org.apache.oltu.openidconnect;
/**
* Class containing all the basic constants of the OpenId
* connect specification
- *
*/
public class OpenIdConnect {
- public static final String ID_TOKEN= "id_token";
+
+ public static final String ID_TOKEN= "id_token";
+
}
Modified: oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponse.java
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponse.java?rev=1524313&r1=1524312&r2=1524313&view=diff
==============================================================================
--- oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponse.java (original)
+++ oltu/trunk/openid-connect/client/src/main/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponse.java Wed Sep 18 07:30:51 2013
@@ -28,36 +28,35 @@ import org.apache.oltu.openidconnect.Ope
*/
public class OpenIdConnectResponse extends OAuthJSONAccessTokenResponse {
- private JWT idToken;
+ private JWT idToken;
- @Override
- protected void init(String body, String contentType, int responseCode)
- throws OAuthProblemException {
- super.init(body, contentType, responseCode);
- idToken = new JWTReader().read(getParam(OpenIdConnect.ID_TOKEN));
- }
+ @Override
+ protected void init(String body, String contentType, int responseCode)
+ throws OAuthProblemException {
+ super.init(body, contentType, responseCode);
+ idToken = new JWTReader().read(getParam(OpenIdConnect.ID_TOKEN));
+ }
- public final JWT getIdToken() {
- return idToken;
- }
+ public final JWT getIdToken() {
+ return idToken;
+ }
- /**
- * ID Token Validation as per OpenID Connect
- * Basic Client Profile 1.0 draft 22 Section 2.4
- *
- *
- * @param issuer
- * @param audience
- * @return
- */
- public boolean checkId(String issuer, String audience) {
- if (idToken.getClaimsSet().getIssuer().equals(issuer)
- && idToken.getClaimsSet().getAudience().equals(audience)
- && idToken.getClaimsSet().getExpirationTime() < System
- .currentTimeMillis()) {
- return true;
- }
- return false;
- }
+ /**
+ * ID Token Validation as per OpenID Connect
+ * Basic Client Profile 1.0 draft 22 Section 2.4
+ *
+ * @param issuer
+ * @param audience
+ * @return
+ */
+ public boolean checkId(String issuer, String audience) {
+ if (idToken.getClaimsSet().getIssuer().equals(issuer)
+ && idToken.getClaimsSet().getAudience().equals(audience)
+ && idToken.getClaimsSet().getExpirationTime() < System
+ .currentTimeMillis()) {
+ return true;
+ }
+ return false;
+ }
}
Modified: oltu/trunk/openid-connect/client/src/test/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponseTest.java
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/client/src/test/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponseTest.java?rev=1524313&r1=1524312&r2=1524313&view=diff
==============================================================================
--- oltu/trunk/openid-connect/client/src/test/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponseTest.java (original)
+++ oltu/trunk/openid-connect/client/src/test/java/org/apache/oltu/openidconnect/client/response/OpenIdConnectResponseTest.java Wed Sep 18 07:30:51 2013
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.oltu.openidconnect.client.response;
+
import junitx.util.PrivateAccessor;
import org.apache.oltu.oauth2.jwt.JWT;
@@ -23,16 +24,18 @@ import org.junit.Assert;
import org.junit.Test;
public class OpenIdConnectResponseTest extends Assert{
- private final String JWT = "eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlMWRhMGIzNTY3YmQyNjVhMjUwOThmYmNjMmIwOWYyMTM0NWIzYTIifQ.eyJpc3MiOiJhY2NvdW50cy5nb29nbGUuY29tIiwiaWQiOiIxMDY0MjI0NTMwODI0Nzk5OTg0MjkiLCJzdWIiOiIxMDY0MjI0NTMwODI0Nzk5OTg0MjkiLCJ2ZXJpZmllZF9lbWFpbCI6InRydWUiLCJlbWFpbF92ZXJpZmllZCI6InRydWUiLCJhdWQiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJjaWQiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhenAiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJlbWFpbCI6ImFudG9uaW8uc2Fuc29AZ21haWwuY29tIiwidG9rZW5faGFzaCI6IkwySTc3Z2lCTGswUlNzMHpRMVN2Q0EiLCJhdF9oYXNoIjoiTDJJNzdnaUJMazBSU3MwelExU3ZDQSIsImlhdCI6MTM2NjcyNjMxNywiZXhwIjoxMzY2NzMwMjE3fQ.XWYi5Zj1YWAMGIml_ftoAwmvW1Y7oeybLCpzQrJVuWJpS8L8Vd2TL-RTIOEVG03VA7e0_-_frNuw7MxUgVEgh8G-Nnbk_baJ6k_3w5c1SKFamFiHHDoKLFhrt1Y8JKSuGwE02V-px4Cn0dRAQAc1IN5CU6wqCrYK0p-fv_fvy28";
- @Test
- public void testCheckId() throws NoSuchFieldException{
- JWT idToken = new JWTReader().read(JWT);
- OpenIdConnectResponse openIdConnectResponse= new OpenIdConnectResponse();
- PrivateAccessor.setField(openIdConnectResponse, "idToken", idToken);
-
- assertTrue(openIdConnectResponse.checkId("accounts.google.com", "788732372078.apps.googleusercontent.com"));
- assertFalse(openIdConnectResponse.checkId("wrongaccounts.google.com", "788732372078.apps.googleusercontent.com"));
- assertFalse(openIdConnectResponse.checkId("wrongaccounts.google.com", "notexists788732372078.apps.googleusercontent.com"));
- }
+ private final String JWT = "eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlMWRhMGIzNTY3YmQyNjVhMjUwOThmYmNjMmIwOWYyMTM0NWIzYTIifQ.eyJpc3MiOiJhY2NvdW50cy5nb29nbGUuY29tIiwiaWQiOiIxMDY0MjI0NTMwODI0Nzk5OTg0MjkiLCJzdWIiOiIxMDY0MjI0NTMwODI0Nzk5OTg0MjkiLCJ2ZXJpZmllZF9lbWFpbCI6InRydWUiLCJlbWFpbF92ZXJpZmllZCI6InRydWUiLCJhdWQiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJjaWQiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhenAiOiI3ODg3MzIzNzIwNzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJlbWFpbCI6ImFudG9uaW8uc2Fuc29AZ21haWwuY29tIiwidG9rZW5faGFzaCI6IkwySTc3Z2lCTGswUlNzMHpRMVN2Q0EiLCJhdF9oYXNoIjoiTDJJNzdnaUJMazBSU3MwelExU3ZDQSIsImlhdCI6MTM2NjcyNjMxNywiZXhwIjoxMzY2NzMwMjE3fQ.XWYi5Zj1YWAMGIml_ftoAwmvW1Y7oeybLCpzQrJVuWJpS8L8Vd2TL-RTIOEVG03VA7e0_-_frNuw7MxUgVEgh8G-Nnbk_baJ6k_3w5c1SKFamFiHHDoKLFhrt1Y8JKSuGwE02V-px4Cn0dRAQAc1IN5CU6wqCrYK0p-fv_fvy28";
+
+ @Test
+ public void testCheckId() throws NoSuchFieldException{
+ JWT idToken = new JWTReader().read(JWT);
+ OpenIdConnectResponse openIdConnectResponse= new OpenIdConnectResponse();
+ PrivateAccessor.setField(openIdConnectResponse, "idToken", idToken);
+
+ assertTrue(openIdConnectResponse.checkId("accounts.google.com", "788732372078.apps.googleusercontent.com"));
+ assertFalse(openIdConnectResponse.checkId("wrongaccounts.google.com", "788732372078.apps.googleusercontent.com"));
+ assertFalse(openIdConnectResponse.checkId("wrongaccounts.google.com", "notexists788732372078.apps.googleusercontent.com"));
+ }
+
}