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 2012/08/17 17:41:05 UTC
svn commit: r1374326 [3/5] - in /webservices/wss4j/trunk:
cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/
cxf-integration/src/test/resources/integration/ policy/
streaming-ws-security/src/test/java/org/apache/ws/security/stax/w...
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java Fri Aug 17 15:40:59 2012
@@ -26,11 +26,11 @@ import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.cache.ReplayCache;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.DOMCallbackLookup;
import org.apache.ws.security.message.CallbackLookup;
@@ -136,11 +136,11 @@ public class SignatureProcessor implemen
if (data.getWssConfig().isWsiBSPCompliant()) {
if (strElements.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY, "noSecurityTokenReference"
+ WSSecurityException.ErrorCode.INVALID_SECURITY, "noSecurityTokenReference"
);
} else if (strElements.size() > 1) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY, "badSecurityTokenReference"
+ WSSecurityException.ErrorCode.INVALID_SECURITY, "badSecurityTokenReference"
);
}
}
@@ -191,7 +191,7 @@ public class SignatureProcessor implemen
if ((certs == null || certs.length == 0 || certs[0] == null)
&& secretKey == null
&& publicKey == null) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
XMLSignature xmlSignature =
@@ -202,7 +202,7 @@ public class SignatureProcessor implemen
if (data.getWssConfig().isWsiBSPCompliant()
&& !WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(c14nMethod)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY, "badC14nAlgo"
+ WSSecurityException.ErrorCode.INVALID_SECURITY, "badC14nAlgo"
);
}
List<WSDataRef> dataRefs =
@@ -210,7 +210,7 @@ public class SignatureProcessor implemen
elem.getOwnerDocument(), xmlSignature.getSignedInfo(), data.getWssConfig(), wsDocInfo
);
if (dataRefs.size() == 0) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
int actionPerformed = WSConstants.SIGN;
@@ -245,7 +245,7 @@ public class SignatureProcessor implemen
Crypto crypto
) throws WSSecurityException {
if (crypto == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noSigCryptoFile");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noSigCryptoFile");
}
if (crypto.getDefaultX509Identifier() != null) {
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
@@ -253,7 +253,7 @@ public class SignatureProcessor implemen
return crypto.getX509Certificates(cryptoType);
} else {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY, "unsupportedKeyInfo"
+ WSSecurityException.ErrorCode.INVALID_SECURITY, "unsupportedKeyInfo"
);
}
}
@@ -268,7 +268,7 @@ public class SignatureProcessor implemen
//
keyValue = getKeyValue(keyInfoElement);
} catch (javax.xml.crypto.MarshalException ex) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK, null, null, ex);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK, null, null, ex);
}
if (keyValue != null) {
@@ -279,11 +279,11 @@ public class SignatureProcessor implemen
return keyValue.getPublicKey();
} catch (java.security.KeyException ex) {
LOG.error(ex.getMessage(), ex);
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK, null, null, ex);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK, null, null, ex);
}
} else {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY, "unsupportedKeyInfo"
+ WSSecurityException.ErrorCode.INVALID_SECURITY, "unsupportedKeyInfo"
);
}
}
@@ -405,10 +405,10 @@ public class SignatureProcessor implemen
throw ex;
} catch (Exception ex) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_CHECK, null, null, ex
);
}
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
/**
@@ -514,7 +514,7 @@ public class SignatureProcessor implemen
}
}
if (se == null) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
WSDataRef ref = new WSDataRef();
@@ -634,7 +634,7 @@ public class SignatureProcessor implemen
if (replayCache.contains(identifier)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY,
+ WSSecurityException.ErrorCode.INVALID_SECURITY,
"invalidTimestamp",
new Object[] {"A replay attack has been detected"}
);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/TimestampProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/TimestampProcessor.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/TimestampProcessor.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/TimestampProcessor.java Fri Aug 17 15:40:59 2012
@@ -24,7 +24,7 @@ import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.validate.Credential;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java Fri Aug 17 15:40:59 2012
@@ -25,9 +25,9 @@ import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.cache.ReplayCache;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.validate.Credential;
@@ -57,7 +57,7 @@ public class UsernameTokenProcessor impl
return java.util.Collections.singletonList(result);
} else if (foundElement != null) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN, "duplicateError"
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, "duplicateError"
);
}
}
@@ -138,7 +138,7 @@ public class UsernameTokenProcessor impl
if (replayCache != null && ut.getNonce() != null) {
if (replayCache.contains(ut.getNonce())) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY,
+ WSSecurityException.ErrorCode.INVALID_SECURITY,
"badUsernameToken",
new Object[] {"A replay attack has been detected"}
);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/X509Util.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/X509Util.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/X509Util.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/X509Util.java Fri Aug 17 15:40:59 2012
@@ -20,8 +20,8 @@
package org.apache.ws.security.processor;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -61,7 +61,7 @@ public final class X509Util {
symEncAlgo = tmpE.getAttribute("Algorithm");
if (symEncAlgo == null || "".equals(symEncAlgo)) {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_ALGORITHM, "noEncAlgo"
+ WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM, "noEncAlgo"
);
}
}
@@ -94,21 +94,22 @@ public final class X509Util {
keyName = builder.toString();
}
if (keyName == null || keyName.length() <= 0) {
- throw new WSSecurityException(WSSecurityException.INVALID_SECURITY, "noKeyname");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY, "noKeyname");
}
- WSPasswordCallback pwCb = new WSPasswordCallback(keyName, WSPasswordCallback.SECRET_KEY);
+ WSPasswordCallback pwCb =
+ new WSPasswordCallback(keyName, WSPasswordCallback.Usage.SECRET_KEY);
try {
cb.handle(new Callback[]{pwCb});
} catch (IOException e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[]{keyName},
e
);
} catch (UnsupportedCallbackException e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[]{keyName},
e
@@ -117,7 +118,7 @@ public final class X509Util {
byte[] decryptedData = pwCb.getKey();
if (decryptedData == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[]{keyName}
);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuer.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuer.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuer.java Fri Aug 17 15:40:59 2012
@@ -21,8 +21,8 @@ package org.apache.ws.security.saml;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.ext.AssertionWrapper;
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerFactory.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerFactory.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerFactory.java Fri Aug 17 15:40:59 2012
@@ -19,14 +19,14 @@
package org.apache.ws.security.saml;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.util.Loader;
-
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.util.Properties;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
+
/**
* CryptoFactory.
* <p/>
@@ -157,7 +157,7 @@ public abstract class SAMLIssuerFactory
URL url = Loader.getResource(propFilename);
if (url == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"resourceNotFound",
new Object[]{propFilename}
);
@@ -168,7 +168,7 @@ public abstract class SAMLIssuerFactory
LOG.debug("Cannot find resource: " + propFilename, e);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"resourceNotFound",
new Object[]{propFilename},
e
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java Fri Aug 17 15:40:59 2012
@@ -19,13 +19,12 @@
package org.apache.ws.security.saml;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.util.Loader;
import java.util.Properties;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLUtil.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLUtil.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLUtil.java Fri Aug 17 15:40:59 2012
@@ -21,11 +21,11 @@ package org.apache.ws.security.saml;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.ws.security.processor.EncryptedKeyProcessor;
@@ -108,7 +108,7 @@ public final class SAMLUtil {
if (token != null) {
if (!"Assertion".equals(token.getLocalName())) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity"
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"
);
}
return new AssertionWrapper(token);
@@ -121,7 +121,7 @@ public final class SAMLUtil {
if (token == null || !"Assertion".equals(token.getLocalName())) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity"
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"
);
}
Processor proc = request.getWssConfig().getProcessor(WSSecurityEngine.SAML_TOKEN);
@@ -170,11 +170,11 @@ public final class SAMLUtil {
) throws WSSecurityException {
if (cb != null) {
WSPasswordCallback pwcb =
- new WSPasswordCallback(id, WSPasswordCallback.SECRET_KEY);
+ new WSPasswordCallback(id, WSPasswordCallback.Usage.SECRET_KEY);
try {
cb.handle(new Callback[]{pwcb});
} catch (Exception e1) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noKey",
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noKey",
new Object[] { id }, e1);
}
return pwcb.getKey();
@@ -222,7 +222,7 @@ public final class SAMLUtil {
if (samlSubject == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLToken",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
new Object[] {"for Signature (no Subject)"}
);
}
@@ -263,7 +263,7 @@ public final class SAMLUtil {
org.opensaml.saml2.core.Subject samlSubject = assertion.getSubject();
if (samlSubject == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLToken",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
new Object[]{"for Signature (no Subject)"}
);
}
@@ -366,7 +366,7 @@ public final class SAMLUtil {
} else if (x509obj instanceof X509IssuerSerial) {
if (data.getSigCrypto() == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "noSigCryptoFile"
+ WSSecurityException.ErrorCode.FAILURE, "noSigCryptoFile"
);
}
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ISSUER_SERIAL);
@@ -377,7 +377,7 @@ public final class SAMLUtil {
certs = data.getSigCrypto().getX509Certificates(cryptoType);
if (certs == null || certs.length < 1) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
new Object[]{"cannot get certificate or key"}
);
}
@@ -388,7 +388,7 @@ public final class SAMLUtil {
}
} catch (Exception ex) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
new Object[]{"cannot get certificate or key"}, ex
);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java Fri Aug 17 15:40:59 2012
@@ -37,9 +37,9 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSignature;
@@ -107,7 +107,7 @@ public class WSSecSignatureSAML extends
* @param secHeader
* The Security header
* @return A signed SOAP envelope as <code>Document</code>
- * @throws org.apache.ws.security.WSSecurityException
+ * @throws WSSecurityException
*/
public Document build(
Document doc, Crypto uCrypto, AssertionWrapper assertion,
@@ -246,7 +246,7 @@ public class WSSecSignatureSAML extends
else {
if (userCrypto == null || !assertion.isSigned()) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity",
new Object[] { "for SAML Signature (Key Holder)" }
);
@@ -267,7 +267,7 @@ public class WSSecSignatureSAML extends
if ((certs == null || certs.length == 0 || certs[0] == null)
&& publicKey == null && secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noCertsFound",
new Object[] { "SAML signature" }
);
@@ -281,7 +281,7 @@ public class WSSecSignatureSAML extends
key = publicKey;
} else {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "unknownSignatureAlgorithm"
+ WSSecurityException.ErrorCode.FAILURE, "unknownSignatureAlgorithm"
);
}
@@ -293,7 +293,7 @@ public class WSSecSignatureSAML extends
sigAlgo = WSConstants.RSA;
} else {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"unknownSignatureAlgorithm",
new Object[] {
pubKeyAlgo
@@ -315,7 +315,7 @@ public class WSSecSignatureSAML extends
} catch (Exception ex) {
log.error("", ex);
throw new WSSecurityException(
- WSSecurityException.FAILED_SIGNATURE, "noXMLSig", null, ex
+ WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", null, ex
);
}
@@ -373,7 +373,7 @@ public class WSSecSignatureSAML extends
}
} catch (Exception ex) {
throw new WSSecurityException(
- WSSecurityException.FAILED_SIGNATURE, "noXMLSig", null, ex
+ WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", null, ex
);
}
@@ -413,7 +413,7 @@ public class WSSecSignatureSAML extends
default:
throw new WSSecurityException(
- WSSecurityException.FAILURE, "unsupportedKeyId", new Object[]{}
+ WSSecurityException.ErrorCode.FAILURE, "unsupportedKeyId", new Object[]{}
);
}
} else if (useDirectReferenceToAssertion) {
@@ -549,7 +549,7 @@ public class WSSecSignatureSAML extends
} catch (Exception ex) {
log.error(ex);
throw new WSSecurityException(
- WSSecurityException.FAILED_SIGNATURE, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_SIGNATURE, null, null, ex
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java Fri Aug 17 15:40:59 2012
@@ -20,9 +20,9 @@
package org.apache.ws.security.saml.ext;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.saml.SAMLKeyInfo;
import org.apache.ws.security.saml.SAMLUtil;
@@ -544,7 +544,7 @@ public class AssertionWrapper {
);
if (samlKeyInfo == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
new Object[]{"cannot get certificate or key"}
);
}
@@ -562,7 +562,7 @@ public class AssertionWrapper {
credential.setPublicKey(samlKeyInfo.getPublicKey());
} else {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
new Object[]{"cannot get certificate or key"}
);
}
@@ -679,11 +679,11 @@ public class AssertionWrapper {
return xmlSignature.getSignatureValue();
} catch (XMLSignatureException e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity", null, e
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", null, e
);
} catch (XMLSecurityException e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity", null, e
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", null, e
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java Fri Aug 17 15:40:59 2012
@@ -21,7 +21,7 @@ package org.apache.ws.security.saml.ext;
import javax.xml.namespace.QName;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.opensaml.xml.*;
import org.opensaml.xml.io.*;
import org.opensaml.xml.signature.Signature;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.saml.ext.builder;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.ext.OpenSAMLUtil;
import org.apache.ws.security.saml.ext.bean.ActionBean;
import org.apache.ws.security.saml.ext.bean.AttributeBean;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.saml.ext.builder;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.ext.bean.ActionBean;
import org.apache.ws.security.saml.ext.bean.AttributeBean;
import org.apache.ws.security.saml.ext.bean.AttributeStatementBean;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java Fri Aug 17 15:40:59 2012
@@ -27,7 +27,7 @@ import javax.security.auth.callback.Call
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.MessageProp;
@@ -73,7 +73,7 @@ public class SpnegoTokenContext {
LOG.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {ex.getMessage()},
ex
@@ -87,7 +87,7 @@ public class SpnegoTokenContext {
Set<Principal> clientPrincipals = clientSubject.getPrincipals();
if (clientPrincipals.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {"No Client principals found after login"}
);
@@ -99,7 +99,7 @@ public class SpnegoTokenContext {
token = (byte[])Subject.doAs(clientSubject, clientAction);
if (token == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "kerberosServiceTicketError"
+ WSSecurityException.ErrorCode.FAILURE, "kerberosServiceTicketError"
);
}
@@ -138,7 +138,7 @@ public class SpnegoTokenContext {
LOG.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {ex.getMessage()},
ex
@@ -155,7 +155,7 @@ public class SpnegoTokenContext {
Set<Principal> principals = subject.getPrincipals();
if (principals.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {"No Client principals found after login"}
);
@@ -211,7 +211,7 @@ public class SpnegoTokenContext {
LOG.debug("Error in cleaning up a GSS context", e);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE, "spnegoKeyError", null, e
+ WSSecurityException.ErrorCode.FAILURE, "spnegoKeyError", null, e
);
}
}
@@ -228,7 +228,7 @@ public class SpnegoTokenContext {
LOG.debug("Error in cleaning up a GSS context", e);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE, "spnegoKeyError", null, e
+ WSSecurityException.ErrorCode.FAILURE, "spnegoKeyError", null, e
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/BSPEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/BSPEnforcer.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/BSPEnforcer.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/BSPEnforcer.java Fri Aug 17 15:40:59 2012
@@ -20,7 +20,7 @@
package org.apache.ws.security.str;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.KerberosSecurity;
import org.apache.ws.security.message.token.PKIPathSecurity;
@@ -57,7 +57,7 @@ public final class BSPEnforcer {
|| ((token instanceof KerberosSecurity)
&& !WSConstants.WSS_GSS_KRB_V5_AP_REQ.equals(valueType))) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -68,7 +68,7 @@ public final class BSPEnforcer {
&& !SecurityTokenReference.THUMB_URI.equals(valueType)
&& !WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(valueType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -80,7 +80,7 @@ public final class BSPEnforcer {
String tokenType = secRef.getTokenType();
if (!PKIPathSecurity.PKI_TYPE.equals(tokenType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidTokenType",
new Object[]{tokenType}
);
@@ -101,7 +101,7 @@ public final class BSPEnforcer {
String valueType = secRef.getKeyIdentifierValueType();
if (!SecurityTokenReference.ENC_KEY_SHA1_URI.equals(valueType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -111,7 +111,7 @@ public final class BSPEnforcer {
String tokenType = secRef.getTokenType();
if (!WSConstants.WSS_ENC_KEY_VALUE_TYPE.equals(tokenType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidTokenType",
new Object[]{tokenType}
);
@@ -135,7 +135,7 @@ public final class BSPEnforcer {
if (assertion.getSaml1() != null
&& !WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(valueType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -143,7 +143,7 @@ public final class BSPEnforcer {
if (assertion.getSaml2() != null
&& !WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(valueType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -151,7 +151,7 @@ public final class BSPEnforcer {
String encoding = secRef.getKeyIdentifierEncodingType();
if (encoding != null && !"".equals(encoding)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"badEncodingType",
new Object[]{encoding}
);
@@ -162,14 +162,14 @@ public final class BSPEnforcer {
String tokenType = secRef.getTokenType();
if (assertion.getSaml1() != null && !WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidTokenType",
new Object[]{tokenType}
);
}
if (assertion.getSaml2() != null && !WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidTokenType",
new Object[]{tokenType}
);
@@ -180,7 +180,7 @@ public final class BSPEnforcer {
String valueType = secRef.getReference().getValueType();
if (valueType != null && !"".equals(valueType)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN,
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN,
"invalidValueType",
new Object[]{valueType}
);
@@ -200,7 +200,7 @@ public final class BSPEnforcer {
if (!secRef.containsReference()) {
// BSP does not permit using a KeyIdentifier to refer to a U/T
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId"
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId"
);
}
@@ -208,7 +208,7 @@ public final class BSPEnforcer {
if (!WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE.equals(valueType)) {
// BSP says the Reference must have a ValueType of UsernameToken
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY,
+ WSSecurityException.ErrorCode.INVALID_SECURITY,
"invalidValueType",
new Object[]{valueType}
);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java Fri Aug 17 15:40:59 2012
@@ -21,11 +21,11 @@ package org.apache.ws.security.str;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.SecurityTokenReference;
@@ -93,10 +93,10 @@ public class DerivedKeyTokenSTRParser im
} else if (secRef.containsReference()) {
// Now use the callback and get it
secretKey =
- getSecretKeyFromToken(uri, null, WSPasswordCallback.SECURITY_CONTEXT_TOKEN, data);
+ getSecretKeyFromToken(uri, null, WSPasswordCallback.Usage.SECURITY_CONTEXT_TOKEN, data);
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else if (secRef.containsKeyIdentifier()) {
@@ -105,7 +105,7 @@ public class DerivedKeyTokenSTRParser im
secretKey =
getSecretKeyFromToken(
secRef.getKeyIdentifierValue(), keyIdentifierValueType,
- WSPasswordCallback.SECRET_KEY, data
+ WSPasswordCallback.Usage.SECRET_KEY, data
);
if (secretKey == null) {
byte[] keyBytes = secRef.getSKIBytes();
@@ -123,7 +123,7 @@ public class DerivedKeyTokenSTRParser im
}
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else {
@@ -136,11 +136,11 @@ public class DerivedKeyTokenSTRParser im
secretKey =
this.getSecretKeyFromToken(
secRef.getKeyIdentifierValue(), keyIdentifierValueType,
- WSPasswordCallback.SECRET_KEY, data
+ WSPasswordCallback.Usage.SECRET_KEY, data
);
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else {
@@ -149,7 +149,7 @@ public class DerivedKeyTokenSTRParser im
}
} else {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId"
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId"
);
}
}
@@ -216,14 +216,14 @@ public class DerivedKeyTokenSTRParser im
private byte[] getSecretKeyFromToken(
String id,
String type,
- int identifier,
+ WSPasswordCallback.Usage identifier,
RequestData data
) throws WSSecurityException {
if (id.charAt(0) == '#') {
id = id.substring(1);
}
WSPasswordCallback pwcb =
- new WSPasswordCallback(id, null, type, identifier, data);
+ new WSPasswordCallback(id, null, type, identifier);
try {
Callback[] callbacks = new Callback[]{pwcb};
if (data.getCallbackHandler() != null) {
@@ -232,7 +232,7 @@ public class DerivedKeyTokenSTRParser im
}
} catch (Exception e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[] {id},
e
@@ -279,7 +279,7 @@ public class DerivedKeyTokenSTRParser im
secretKey = keyInfo.getSecret();
} else {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId"
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId"
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java Fri Aug 17 15:40:59 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.SecurityTokenReference;
@@ -135,9 +135,8 @@ public class EncryptedKeySTRParser imple
certs = new X509Certificate[]{token.getX509Certificate(crypto)};
} else {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_SECURITY_TOKEN,
- "unsupportedBinaryTokenType",
- null
+ WSSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN,
+ "unsupportedBinaryTokenType"
);
}
}
@@ -234,9 +233,8 @@ public class EncryptedKeySTRParser imple
certs = keyInfo.getCerts();
} else {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_SECURITY_TOKEN,
- "unsupportedBinaryTokenType",
- null
+ WSSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN,
+ "unsupportedBinaryTokenType"
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/STRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/STRParser.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/STRParser.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/STRParser.java Fri Aug 17 15:40:59 2012
@@ -20,7 +20,7 @@
package org.apache.ws.security.str;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java Fri Aug 17 15:40:59 2012
@@ -21,11 +21,11 @@ package org.apache.ws.security.str;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.DerivedKeyToken;
@@ -101,7 +101,7 @@ public class SecurityTokenRefSTRParser i
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else if (secRef.containsReference()) {
@@ -126,7 +126,7 @@ public class SecurityTokenRefSTRParser i
}
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else if (secRef.containsKeyIdentifier()) {
@@ -163,7 +163,7 @@ public class SecurityTokenRefSTRParser i
}
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
} else {
@@ -176,12 +176,12 @@ public class SecurityTokenRefSTRParser i
);
if (secretKey == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "unsupportedKeyId", new Object[] {uri}
);
}
}
} else {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK, "noReference");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK, "noReference");
}
}
@@ -253,7 +253,7 @@ public class SecurityTokenRefSTRParser i
id = id.substring(1);
}
WSPasswordCallback pwcb =
- new WSPasswordCallback(id, null, type, WSPasswordCallback.SECRET_KEY, data);
+ new WSPasswordCallback(id, null, type, WSPasswordCallback.Usage.SECRET_KEY);
try {
Callback[] callbacks = new Callback[]{pwcb};
if (data.getCallbackHandler() != null) {
@@ -262,7 +262,7 @@ public class SecurityTokenRefSTRParser i
}
} catch (Exception e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[] {id},
e
@@ -289,7 +289,7 @@ public class SecurityTokenRefSTRParser i
SAMLUtil.getCredentialFromSubject(assertion, data, wsDocInfo, bspCompliant);
if (samlKi == null) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "invalidSAMLToken", new Object[] {"No Secret Key"}
+ WSSecurityException.ErrorCode.FAILED_CHECK, "invalidSAMLToken", new Object[] {"No Secret Key"}
);
}
return samlKi.getSecret();
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java Fri Aug 17 15:40:59 2012
@@ -24,11 +24,11 @@ import org.apache.ws.security.SAMLTokenP
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDerivedKeyTokenPrincipal;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.DerivedKeyToken;
@@ -220,7 +220,7 @@ public class SignatureSTRParser implemen
}
} else {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY,
+ WSSecurityException.ErrorCode.INVALID_SECURITY,
"unsupportedKeyInfo",
new Object[]{strElement.toString()}
);
@@ -319,7 +319,7 @@ public class SignatureSTRParser implemen
id = id.substring(1);
}
WSPasswordCallback pwcb =
- new WSPasswordCallback(id, null, type, WSPasswordCallback.SECRET_KEY, data);
+ new WSPasswordCallback(id, null, type, WSPasswordCallback.Usage.SECRET_KEY);
try {
Callback[] callbacks = new Callback[]{pwcb};
if (data.getCallbackHandler() != null) {
@@ -328,7 +328,7 @@ public class SignatureSTRParser implemen
}
} catch (Exception e) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"noPassword",
new Object[] {id},
e
@@ -438,7 +438,7 @@ public class SignatureSTRParser implemen
}
} catch (CertificateEncodingException ex) {
throw new WSSecurityException(
- WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, "encodeError",
+ WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE, "encodeError",
null, ex
);
}
@@ -529,7 +529,7 @@ public class SignatureSTRParser implemen
SAMLKeyInfo keyInfo = assertion.getSubjectKeyInfo();
if (keyInfo == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity"
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"
);
}
X509Certificate[] foundCerts = keyInfo.getCerts();
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/transform/STRTransformUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/transform/STRTransformUtil.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/transform/STRTransformUtil.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/transform/STRTransformUtil.java Fri Aug 17 15:40:59 2012
@@ -24,7 +24,7 @@ import java.security.cert.X509Certificat
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDocInfo;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.ws.security.message.token.X509Security;
import org.apache.ws.security.util.Base64;
@@ -79,7 +79,7 @@ public final class STRTransformUtil {
X509Certificate[] certs =
secRef.getX509IssuerSerial(wsDocInfo.getCrypto());
if (certs == null || certs.length == 0 || certs[0] == null) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
return createBSTX509(doc, certs[0], secRef.getElement());
}
@@ -98,7 +98,7 @@ public final class STRTransformUtil {
} else {
X509Certificate[] certs = secRef.getKeyIdentifier(wsDocInfo.getCrypto());
if (certs == null || certs.length == 0 || certs[0] == null) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
return createBSTX509(doc, certs[0], secRef.getElement());
}
@@ -113,7 +113,7 @@ public final class STRTransformUtil {
data = cert.getEncoded();
} catch (CertificateEncodingException e) {
throw new WSSecurityException(
- WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, "encodeError", null, e
+ WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE, "encodeError", null, e
);
}
String prefix = WSSecurityUtil.getPrefixNS(WSConstants.WSSE_NS, secRefE);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Base64.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Base64.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Base64.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Base64.java Fri Aug 17 15:40:59 2012
@@ -17,7 +17,7 @@
package org.apache.ws.security.util;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
/**
* This class provides encode/decode for RFC 2045 Base64 as defined by RFC 2045,
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java Fri Aug 17 15:40:59 2012
@@ -26,8 +26,8 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.CallbackLookup;
import org.apache.xml.security.algorithms.JCEMapper;
@@ -131,7 +131,7 @@ public final class WSSecurityUtil {
"Two or more security headers have the same actor name: " + actor
);
}
- throw new WSSecurityException(WSSecurityException.INVALID_SECURITY);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
}
foundSecurityHeader = elem;
}
@@ -803,7 +803,7 @@ public final class WSSecurityUtil {
return Cipher.getInstance(keyAlgorithm);
} catch (NoSuchPaddingException ex) {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
+ WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
new Object[] { "No such padding: " + cipherAlgo }, ex
);
} catch (NoSuchAlgorithmException ex) {
@@ -814,13 +814,13 @@ public final class WSSecurityUtil {
return Cipher.getInstance("RSA/ECB/OAEPWithSHA1AndMGF1Padding");
} catch (Exception e) {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
+ WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
new Object[] { "No such algorithm: " + cipherAlgo }, e
);
}
} else {
throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
+ WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM, "unsupportedKeyTransp",
new Object[] { "No such algorithm: " + cipherAlgo }, ex
);
}
@@ -1027,9 +1027,7 @@ public final class WSSecurityUtil {
} else if (WSConstants.HMAC_MD5.equals(algorithm)) {
return 16;
} else {
- throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_ALGORITHM, null, null, null
- );
+ throw new WSSecurityException(WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM);
}
}
@@ -1115,7 +1113,7 @@ public final class WSSecurityUtil {
}
if (!found) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK,
+ WSSecurityException.ErrorCode.FAILED_CHECK,
"requiredElementNotProtected",
new Object[] {requiredPart}
);
@@ -1167,7 +1165,7 @@ public final class WSSecurityUtil {
}
if (!found) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK,
+ WSSecurityException.ErrorCode.FAILED_CHECK,
"requiredElementNotSigned",
new Object[] {requiredIDs[i]}
);
@@ -1309,7 +1307,7 @@ public final class WSSecurityUtil {
if (cur.getNodeType() == Node.ELEMENT_NODE) {
if (WSConstants.SIG_LN.equals(cur.getLocalName())
&& WSConstants.SIG_NS.equals(cur.getNamespaceURI())) {
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK,
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK,
"requiredElementNotSigned", new Object[] {elem});
} else if (isLinkedBySignatureRefs((Element)cur, signatureRefIDs)) {
return;
@@ -1319,7 +1317,7 @@ public final class WSSecurityUtil {
}
}
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "requiredElementNotSigned", new Object[] {elem});
+ WSSecurityException.ErrorCode.FAILED_CHECK, "requiredElementNotSigned", new Object[] {elem});
}
private static boolean isLinkedBySignatureRefs(Element elem, Set<String> allIDs) {
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/JAASUsernameTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/JAASUsernameTokenValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/JAASUsernameTokenValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/JAASUsernameTokenValidator.java Fri Aug 17 15:40:59 2012
@@ -25,7 +25,7 @@ import javax.security.auth.login.LoginEx
import org.apache.ws.security.NamePasswordCallbackHandler;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.UsernameToken;
@@ -66,7 +66,7 @@ public class JAASUsernameTokenValidator
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null || credential.getUsernametoken() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
String user = null;
@@ -83,19 +83,19 @@ public class JAASUsernameTokenValidator
if (usernameToken.isHashed()) {
log.warn("Authentication failed as hashed username token not supported");
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
password = usernameToken.getPassword();
if (!WSConstants.PASSWORD_TEXT.equals(pwType)) {
log.warn("Password type " + pwType + " not supported");
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
if (!(user != null && user.length() > 0 && password != null && password.length() > 0)) {
log.warn("User or password empty");
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
try {
@@ -107,7 +107,7 @@ public class JAASUsernameTokenValidator
} catch (LoginException ex) {
log.info("Authentication failed", ex);
throw new WSSecurityException(
- WSSecurityException.FAILED_AUTHENTICATION, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, null, null, ex
);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java Fri Aug 17 15:40:59 2012
@@ -27,7 +27,7 @@ import javax.security.auth.callback.Call
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.KerberosSecurity;
@@ -140,7 +140,7 @@ public class KerberosTokenValidator impl
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null || credential.getBinarySecurityToken() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
BinarySecurity binarySecurity = credential.getBinarySecurityToken();
@@ -173,7 +173,7 @@ public class KerberosTokenValidator impl
log.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {ex.getMessage()},
ex
@@ -192,7 +192,7 @@ public class KerberosTokenValidator impl
Set<Principal> principals = subject.getPrincipals();
if (principals.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {"No Client principals found after login"}
);
@@ -205,7 +205,7 @@ public class KerberosTokenValidator impl
Principal principal = (Principal)Subject.doAs(subject, action);
if (principal == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "kerberosTicketValidationError"
+ WSSecurityException.ErrorCode.FAILURE, "kerberosTicketValidationError"
);
}
credential.setPrincipal(principal);
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/NoOpValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/NoOpValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/NoOpValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/NoOpValidator.java Fri Aug 17 15:40:59 2012
@@ -20,7 +20,7 @@
package org.apache.ws.security.validate;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java Fri Aug 17 15:40:59 2012
@@ -21,7 +21,7 @@ package org.apache.ws.security.validate;
import java.util.List;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.saml.SAMLKeyInfo;
import org.apache.ws.security.saml.ext.AssertionWrapper;
@@ -67,7 +67,7 @@ public class SamlAssertionValidator exte
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null || credential.getAssertion() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
AssertionWrapper assertion = credential.getAssertion();
@@ -80,12 +80,12 @@ public class SamlAssertionValidator exte
if (OpenSAMLUtil.isMethodHolderOfKey(confirmMethod)) {
if (assertion.getSubjectKeyInfo() == null) {
LOG.debug("There is no Subject KeyInfo to match the holder-of-key subject conf method");
- throw new WSSecurityException(WSSecurityException.FAILURE, "noKeyInSAMLToken");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noKeyInSAMLToken");
}
// The assertion must have been signed for HOK
if (!assertion.isSigned()) {
LOG.debug("A holder-of-key assertion must be signed");
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
}
@@ -142,13 +142,13 @@ public class SamlAssertionValidator exte
currentTime = currentTime.plusSeconds(futureTTL);
if (validFrom.isAfter(currentTime)) {
LOG.debug("SAML Token condition (Not Before) not met");
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
}
if (validTill != null && validTill.isBeforeNow()) {
LOG.debug("SAML Token condition (Not On Or After) not met");
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
}
@@ -167,7 +167,7 @@ public class SamlAssertionValidator exte
} catch (ValidationException e) {
LOG.debug("Saml Validation error: " + e.getMessage(), e);
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity", null, e
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", null, e
);
}
} else if (assertion.getSaml2() != null) {
@@ -181,7 +181,7 @@ public class SamlAssertionValidator exte
} catch (ValidationException e) {
LOG.debug("Saml Validation error: " + e.getMessage(), e);
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLsecurity", null, e
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", null, e
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SignatureTrustValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SignatureTrustValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SignatureTrustValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SignatureTrustValidator.java Fri Aug 17 15:40:59 2012
@@ -28,9 +28,9 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
/**
@@ -55,13 +55,13 @@ public class SignatureTrustValidator imp
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
X509Certificate[] certs = credential.getCertificates();
PublicKey publicKey = credential.getPublicKey();
Crypto crypto = getCrypto(data);
if (crypto == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noSigCryptoFile");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noSigCryptoFile");
}
if (certs != null && certs.length > 0) {
@@ -83,7 +83,7 @@ public class SignatureTrustValidator imp
return credential;
}
}
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
@@ -104,11 +104,11 @@ public class SignatureTrustValidator imp
}
} catch (CertificateExpiredException e) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "invalidCert", null, e
+ WSSecurityException.ErrorCode.FAILED_CHECK, "invalidCert", null, e
);
} catch (CertificateNotYetValidException e) {
throw new WSSecurityException(
- WSSecurityException.FAILED_CHECK, "invalidCert", null, e
+ WSSecurityException.ErrorCode.FAILED_CHECK, "invalidCert", null, e
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/TimestampValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/TimestampValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/TimestampValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/TimestampValidator.java Fri Aug 17 15:40:59 2012
@@ -21,7 +21,7 @@ package org.apache.ws.security.validate;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.Timestamp;
@@ -40,7 +40,7 @@ public class TimestampValidator implemen
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null || credential.getTimestamp() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
if (data.getWssConfig() == null) {
throw new WSSecurityException("WSSConfig cannot be null");
@@ -60,7 +60,7 @@ public class TimestampValidator implemen
if ((timeStampStrict && timeStamp.isExpired())
|| !timeStamp.verifyCreated(timeStampTTL, futureTimeToLive)) {
throw new WSSecurityException(
- WSSecurityException.MESSAGE_EXPIRED,
+ WSSecurityException.ErrorCode.MESSAGE_EXPIRED,
"invalidTimestamp",
new Object[] {"The security semantics of the message have expired"}
);