From ad3a22e5d453a0af2ec0b309555340c09d15e349 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 6 Mar 2013 15:24:46 -0500 Subject: [PATCH] changed client defaults for JOSE bits --- .../java/org/mitre/jose/JWEAlgorithmEmbed.java | 2 ++ .../org/mitre/jose/JWEEncryptionMethodEmbed.java | 2 ++ .../java/org/mitre/jose/JWSAlgorithmEmbed.java | 2 ++ .../mitre/oauth2/model/ClientDetailsEntity.java | 14 +++++++------- .../src/main/webapp/resources/template/client.html | 4 ++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java index e0e06e497..4081d515b 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java @@ -21,6 +21,8 @@ import com.nimbusds.jose.JWEAlgorithm; @Embeddable public class JWEAlgorithmEmbed { + public static final JWEAlgorithmEmbed NONE = getForAlgorithmName("none"); + private JWEAlgorithm algorithm; public JWEAlgorithmEmbed() { diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java index ba44bed31..bcd2f40b8 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java @@ -18,6 +18,8 @@ import com.nimbusds.jose.JWEAlgorithm; @Embeddable public class JWEEncryptionMethodEmbed { + public static final JWEEncryptionMethodEmbed NONE = getForAlgorithmName("none"); + private EncryptionMethod algorithm; public JWEEncryptionMethodEmbed() { diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java index f0ffa9255..e9aff0cc0 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java @@ -22,6 +22,8 @@ import com.nimbusds.jose.JWSAlgorithm; @Embeddable public class JWSAlgorithmEmbed { + public static final JWSAlgorithmEmbed NONE = getForAlgorithmName("none"); + private JWSAlgorithm algorithm; public JWSAlgorithmEmbed() { diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index d4b649a58..0f6eed0d2 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -89,15 +89,15 @@ public class ClientDetailsEntity implements ClientDetails { private String sectorIdentifierUri; // sector_identifier_uri private SubjectType subjectType; // subject_type - private JWSAlgorithmEmbed requestObjectSigningAlg; // request_object_signing_alg + private JWSAlgorithmEmbed requestObjectSigningAlg = JWSAlgorithmEmbed.NONE; // request_object_signing_alg - private JWSAlgorithmEmbed userInfoSignedResponseAlg; // user_info_signed_response_alg - private JWEAlgorithmEmbed userInfoEncryptedResponseAlg; // user_info_encrypted_response_alg - private JWEEncryptionMethodEmbed userInfoEncryptedResponseEnc; // user_info_encrypted_response_enc + private JWSAlgorithmEmbed userInfoSignedResponseAlg = JWSAlgorithmEmbed.NONE; // user_info_signed_response_alg + private JWEAlgorithmEmbed userInfoEncryptedResponseAlg = JWEAlgorithmEmbed.NONE; // user_info_encrypted_response_alg + private JWEEncryptionMethodEmbed userInfoEncryptedResponseEnc = JWEEncryptionMethodEmbed.NONE; // user_info_encrypted_response_enc - private JWSAlgorithmEmbed idTokenSignedResponseAlg; // id_token_signed_response_alg - private JWEAlgorithmEmbed idTokenEncryptedResponseAlg; // id_token_encrypted_response_alg - private JWEEncryptionMethodEmbed idTokenEncryptedResponseEnc; // id_token_encrypted_response_enc + private JWSAlgorithmEmbed idTokenSignedResponseAlg = JWSAlgorithmEmbed.NONE; // id_token_signed_response_alg + private JWEAlgorithmEmbed idTokenEncryptedResponseAlg = JWEAlgorithmEmbed.NONE; // id_token_encrypted_response_alg + private JWEEncryptionMethodEmbed idTokenEncryptedResponseEnc = JWEEncryptionMethodEmbed.NONE; // id_token_encrypted_response_enc private Integer defaultMaxAge; // default_max_age private Boolean requireAuthTime; // require_auth_time diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html index 3cf602251..594a1e5fa 100644 --- a/openid-connect-server/src/main/webapp/resources/template/client.html +++ b/openid-connect-server/src/main/webapp/resources/template/client.html @@ -491,6 +491,7 @@
+ @@ -540,6 +542,7 @@
+