[jbossws-commits] JBossWS SVN: r17679 - in stack/native/tags/jbossws-native-3.1.2.SP15: modules/core and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 14 18:17:07 EDT 2013
Author: klape
Date: 2013-06-14 18:17:07 -0400 (Fri, 14 Jun 2013)
New Revision: 17679
Modified:
stack/native/tags/jbossws-native-3.1.2.SP15/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml
Log:
Sorry, I accidentally committed things to the tag. reverting here
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/core:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -76,8 +76,6 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityDispatcher.class);
-
- private static boolean VERBOSE_EXCEPTION_REPORTING = Boolean.getBoolean("org.jboss.ws.native.security.verbose_exception_reporting");
public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException
{
@@ -90,7 +88,7 @@
if (secHeaderElement == null)
{
if (hasRequirements(config, fault))
- throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."), true);
+ throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."));
}
try
@@ -265,18 +263,8 @@
private CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
}
-
- private CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
- {
- if (verbose) {
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
- } else {
- QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
- return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
- }
- }
private List<RequireOperation> buildRequireOperations(Config operationConfig, boolean fault)
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -32,10 +32,8 @@
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.Util;
-import org.jboss.ws.extensions.security.exception.FailedCheckException;
import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
-import org.jboss.ws.extensions.security.operation.EncryptionOperation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -130,16 +128,7 @@
}
catch (XMLSecurityException e)
{
- try
- {
- this.secretKey = EncryptionOperation.generateSecretKey(alg);
- }
- catch (Exception ex)
- {
- WSSecurityException exception = new FailedCheckException(e);
- exception.setInternal(true);
- throw exception;
- }
+ throw new WSSecurityException("Could not parse encrypted key: " + e.getMessage(), e);
}
this.document = element.getOwnerDocument();
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -32,7 +32,7 @@
{
public static final QName faultCode = new QName(Constants.WSSE_NS, "FailedCheck", Constants.WSSE_PREFIX);
- public static final String faultString = "The signature or decryption was invalid.";
+ public static final String faultString = "The signature or decryption was invlaid.";
public FailedCheckException()
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -72,9 +72,4 @@
{
return faultString;
}
-
- public void setInternal(boolean internal)
- {
- this.internal = internal;
- }
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -107,7 +107,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException(e);
+ throw new FailedCheckException("Decryption was invalid.");
}
catch (Exception e)
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -75,7 +75,6 @@
}
private static HashMap<String, Algorithm> algorithms;
- private static HashMap<String, String> algorithmsID;
private static final String DEFAULT_ALGORITHM = "aes-128";
@@ -89,12 +88,6 @@
algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
-
- algorithmsID = new HashMap<String, String>(4);
- algorithmsID.put(XMLCipher.AES_128, "aes-128");
- algorithmsID.put(XMLCipher.AES_192, "aes-192");
- algorithmsID.put(XMLCipher.AES_256, "aes-256");
- algorithmsID.put(XMLCipher.TRIPLEDES, "tripledes");
}
public EncryptionOperation(List<Target> targets, String alias, String algorithm, String wrap, String tokenRefType, String securityDomainAliasLabel)
@@ -137,7 +130,7 @@
}
}
- private static SecretKey getSecretKey(String algorithm) throws WSSecurityException
+ public SecretKey getSecretKey(String algorithm) throws WSSecurityException
{
Algorithm alg = algorithms.get(algorithm);
@@ -153,11 +146,6 @@
}
}
- public static SecretKey generateSecretKey(String alg) throws WSSecurityException
- {
- return getSecretKey(algorithmsID.get(alg));
- }
-
public void process(Document message, SecurityHeader header, SecurityStore store) throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -459,18 +459,13 @@
serviceMetaData.setWsdlLocation(wsdlFile.toURL());
}
-
private File computeTempWsdlFile(ServiceMetaData serviceMetaData, File dir, String wsdlName) throws IOException
{
File wsdlFile = null;
try
{
- //JBPAPP-10625 - Use both namespaceURI and deploymentName to create a unique file name for each endpoint.
- String namespaceURI = serviceMetaData.getServiceName().getNamespaceURI();
- String deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName();
- byte[] uniqueName = (namespaceURI+deploymentName).getBytes("UTF-8");
-
- String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(uniqueName));
+ byte[] deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName().getBytes("UTF-8");
+ String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(deploymentName));
wsdlFile = new File(dir + File.separator + wsdlName + "_" + deploymentNameHash + ".wsdl");
}
catch(NoSuchAlgorithmException ex)
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -33,6 +33,7 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.security.exception.FailedAuthenticationException;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -49,8 +50,10 @@
private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1999";
- private static final String FAULT_CODE = "jboss-wsse:GenericError";
+ private static final String FAULT_CODE = "wsse:FailedAuthentication";
+ private static final String FAULT_STRING = FailedAuthenticationException.faultString;
+
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war");
@@ -108,6 +111,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault String", FAULT_STRING, faultString);
}
}
@@ -144,6 +149,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
@@ -166,6 +173,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml 2013-06-14 22:17:07 UTC (rev 17679)
@@ -74,7 +74,7 @@
<woodstox.version>3.2.9</woodstox.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <xalan.version>2.7.1-patch-04</xalan.version>
+ <xalan.version>2.7.1-patch-05</xalan.version>
<xerces.version>2.9.1</xerces.version>
</properties>
More information about the jbossws-commits
mailing list