You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/06/05 14:03:36 UTC
git commit: Updating ModelEncryptionUtils to handle Client cert if
available
Repository: cxf
Updated Branches:
refs/heads/master 4008219f8 -> 2d0d60697
Updating ModelEncryptionUtils to handle Client cert if available
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d0d6069
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d0d6069
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d0d6069
Branch: refs/heads/master
Commit: 2d0d60697fdb96b7cac5402de3a8afe4bd3e33cf
Parents: 4008219
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Jun 5 13:03:18 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Jun 5 13:03:18 2014 +0100
----------------------------------------------------------------------
.../utils/crypto/ModelEncryptionSupport.java | 28 +++++++++++---------
1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d0d6069/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
index ba761e4..ce76c0a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
@@ -328,12 +328,13 @@ public final class ModelEncryptionSupport {
getStringPart(parts[3]), getStringPart(parts[4]));
c.setApplicationDescription(getStringPart(parts[5]));
c.setApplicationLogoUri(getStringPart(parts[6]));
- c.setAllowedGrantTypes(parseSimpleList(parts[7]));
- c.setRegisteredScopes(parseSimpleList(parts[8]));
- c.setRedirectUris(parseSimpleList(parts[9]));
- c.setRegisteredAudiences(parseSimpleList(parts[10]));
- c.setProperties(parseSimpleMap(parts[11]));
- c.setSubject(recreateUserSubject(parts[12]));
+ c.setApplicationLogoUri(getStringPart(parts[7]));
+ c.setAllowedGrantTypes(parseSimpleList(parts[8]));
+ c.setRegisteredScopes(parseSimpleList(parts[9]));
+ c.setRedirectUris(parseSimpleList(parts[10]));
+ c.setRegisteredAudiences(parseSimpleList(parts[11]));
+ c.setProperties(parseSimpleMap(parts[12]));
+ c.setSubject(recreateUserSubject(parts[13]));
return c;
}
private static String tokenizeClient(Client client) {
@@ -359,22 +360,25 @@ public final class ModelEncryptionSupport {
// 6: app logo URI
state.append(tokenizeString(client.getApplicationLogoUri()));
state.append(SEP);
- // 7: grants
+ // 7: app certificate
+ state.append(tokenizeString(client.getApplicationCertificate()));
+ state.append(SEP);
+ // 8: grants
state.append(client.getAllowedGrantTypes().toString());
state.append(SEP);
- // 8: redirect URIs
+ // 9: redirect URIs
state.append(client.getRedirectUris().toString());
state.append(SEP);
- // 9: registered scopes
+ // 10: registered scopes
state.append(client.getRegisteredScopes().toString());
state.append(SEP);
- // 10: registered audiences
+ // 11: registered audiences
state.append(client.getRegisteredAudiences().toString());
state.append(SEP);
- // 11: properties
+ // 12: properties
state.append(client.getProperties().toString());
state.append(SEP);
- // 12: subject
+ // 13: subject
tokenizeUserSubject(state, client.getSubject());
return state.toString();