You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/04/07 07:18:41 UTC
svn commit: r1585388 - in
/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken:
X509IssuerSerialTokenImpl.java X509SKISecurityTokenImpl.java
X509SecurityTokenImpl.java X509ThumbprintSHA1SecurityTokenImpl.java
Author: coheigea
Date: Mon Apr 7 05:18:41 2014
New Revision: 1585388
URL: http://svn.apache.org/r1585388
Log:
Only return the first certificate for certain tokens
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SKISecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509ThumbprintSHA1SecurityTokenImpl.java
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java?rev=1585388&r1=1585387&r2=1585388&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java Mon Apr 7 05:18:41 2014
@@ -59,9 +59,10 @@ public class X509IssuerSerialTokenImpl e
);
X509Certificate[] certs = getCrypto().getX509Certificates(cryptoType);
setX509Certificates(certs);
- if (certs == null) {
+ if (certs == null || certs.length == 0) {
throw new WSSecurityException(WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE);
}
+ super.setX509Certificates(new X509Certificate[]{certs[0]});
return this.alias = getCrypto().getX509Identifier(certs[0]);
}
return this.alias;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SKISecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SKISecurityTokenImpl.java?rev=1585388&r1=1585387&r2=1585388&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SKISecurityTokenImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SKISecurityTokenImpl.java Mon Apr 7 05:18:41 2014
@@ -49,9 +49,10 @@ public class X509SKISecurityTokenImpl ex
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.SKI_BYTES);
cryptoType.setBytes(binaryContent);
X509Certificate[] certs = getCrypto().getX509Certificates(cryptoType);
- if (certs == null) {
+ if (certs == null || certs.length == 0) {
throw new WSSecurityException(WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE);
}
+ super.setX509Certificates(new X509Certificate[]{certs[0]});
this.alias = getCrypto().getX509Identifier(certs[0]);
}
return this.alias;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java?rev=1585388&r1=1585387&r2=1585388&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java Mon Apr 7 05:18:41 2014
@@ -97,7 +97,7 @@ public abstract class X509SecurityTokenI
public X509Certificate[] getX509Certificates() throws XMLSecurityException {
if (super.getX509Certificates() == null) {
String alias = getAlias();
- if (alias != null) {
+ if (super.getX509Certificates() == null && alias != null) {
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias(alias);
setX509Certificates(getCrypto().getX509Certificates(cryptoType));
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509ThumbprintSHA1SecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509ThumbprintSHA1SecurityTokenImpl.java?rev=1585388&r1=1585387&r2=1585388&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509ThumbprintSHA1SecurityTokenImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509ThumbprintSHA1SecurityTokenImpl.java Mon Apr 7 05:18:41 2014
@@ -49,9 +49,10 @@ public class X509ThumbprintSHA1SecurityT
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.THUMBPRINT_SHA1);
cryptoType.setBytes(binaryContent);
X509Certificate[] certs = getCrypto().getX509Certificates(cryptoType);
- if (certs == null) {
+ if (certs == null || certs.length == 0) {
throw new WSSecurityException(WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE);
}
+ super.setX509Certificates(new X509Certificate[]{certs[0]});
this.alias = getCrypto().getX509Identifier(certs[0]);
}
return this.alias;