You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/01/29 16:26:50 UTC
svn commit: r1562478 - in /cxf/trunk:
rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/
systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/
Author: coheigea
Date: Wed Jan 29 15:26:50 2014
New Revision: 1562478
URL: http://svn.apache.org/r1562478
Log:
Spelling correction
Modified:
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java Wed Jan 29 15:26:50 2014
@@ -104,8 +104,8 @@ public class AbstractXmlSigInHandler ext
&& !sigProps.getSignatureAlgo().equals(sInfo.getSignatureMethodURI())) {
throwFault("Signature Algorithm is not supported", null);
}
- if (sigProps.getSignatureC14Method() != null
- && !sigProps.getSignatureC14Method().equals(sInfo.getCanonicalizationMethodURI())) {
+ if (sigProps.getSignatureC14nMethod() != null
+ && !sigProps.getSignatureC14nMethod().equals(sInfo.getCanonicalizationMethodURI())) {
throwFault("Signature C14n Algorithm is not supported", null);
}
}
@@ -246,7 +246,7 @@ public class AbstractXmlSigInHandler ext
}
boolean c14TransformConfirmed = false;
- String c14TransformExpected = sigProps != null ? sigProps.getSignatureC14Transform() : null;
+ String c14TransformExpected = sigProps != null ? sigProps.getSignatureC14nTransform() : null;
boolean envelopedConfirmed = false;
for (int i = 0; i < transforms.getLength(); i++) {
try {
Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java Wed Jan 29 15:26:50 2014
@@ -21,8 +21,8 @@ package org.apache.cxf.rs.security.xml;
public class SignatureProperties {
private String signatureAlgo;
private String signatureDigestAlgo;
- private String signatureC14Method;
- private String signatureC14Transform;
+ private String signatureC14nMethod;
+ private String signatureC14nTransform;
private String signatureKeyIdType;
public void setSignatureAlgo(String signatureAlgo) {
@@ -37,17 +37,33 @@ public class SignatureProperties {
public String getSignatureDigestAlgo() {
return signatureDigestAlgo;
}
+ @Deprecated
public void setSignatureC14Method(String signatureC14Method) {
- this.signatureC14Method = signatureC14Method;
+ setSignatureC14nMethod(signatureC14Method);
}
+ public void setSignatureC14nMethod(String signatureC14nMethod) {
+ this.signatureC14nMethod = signatureC14nMethod;
+ }
+ @Deprecated
public String getSignatureC14Method() {
- return signatureC14Method;
+ return getSignatureC14nMethod();
+ }
+ public String getSignatureC14nMethod() {
+ return signatureC14nMethod;
}
+ @Deprecated
public void setSignatureC14Transform(String signatureC14Transform) {
- this.signatureC14Transform = signatureC14Transform;
+ setSignatureC14nTransform(signatureC14Transform);
}
+ public void setSignatureC14nTransform(String signatureC14nTransform) {
+ this.signatureC14nTransform = signatureC14nTransform;
+ }
+ @Deprecated
public String getSignatureC14Transform() {
- return signatureC14Transform;
+ return getSignatureC14nTransform();
+ }
+ public String getSignatureC14nTransform() {
+ return signatureC14nTransform;
}
public String getSignatureKeyIdType() {
return signatureKeyIdType;
Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java Wed Jan 29 15:26:50 2014
@@ -257,13 +257,13 @@ public class XmlSecInInterceptor impleme
throw new XMLSecurityException("empty", "The signature digest algorithm "
+ event.getAlgorithmURI() + " is not allowed");
} else if (XMLSecurityConstants.SigC14n.equals(event.getAlgorithmUsage())
- && sigProps.getSignatureC14Method() != null
- && !sigProps.getSignatureC14Method().equals(event.getAlgorithmURI())) {
+ && sigProps.getSignatureC14nMethod() != null
+ && !sigProps.getSignatureC14nMethod().equals(event.getAlgorithmURI())) {
throw new XMLSecurityException("empty", "The signature c14n algorithm "
+ event.getAlgorithmURI() + " is not allowed");
} else if (XMLSecurityConstants.SigTransform.equals(event.getAlgorithmUsage())
- && sigProps.getSignatureC14Transform() != null
- && !sigProps.getSignatureC14Transform().equals(event.getAlgorithmURI())) {
+ && sigProps.getSignatureC14nTransform() != null
+ && !sigProps.getSignatureC14nTransform().equals(event.getAlgorithmURI())) {
throw new XMLSecurityException("empty", "The signature transformation algorithm "
+ event.getAlgorithmURI() + " is not allowed");
}
Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java Wed Jan 29 15:26:50 2014
@@ -291,16 +291,16 @@ public class XmlSecOutInterceptor implem
}
String c14nMethod = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
- if (sigProps.getSignatureC14Method() != null) {
- c14nMethod = sigProps.getSignatureC14Method();
+ if (sigProps.getSignatureC14nMethod() != null) {
+ c14nMethod = sigProps.getSignatureC14nMethod();
}
properties.setSignatureCanonicalizationAlgorithm(c14nMethod);
properties.addAction(XMLSecurityConstants.SIGNATURE);
// Only enveloped supported for the moment.
String transform = "http://www.w3.org/2001/10/xml-exc-c14n#";
- if (sigProps.getSignatureC14Transform() != null) {
- transform = sigProps.getSignatureC14Transform();
+ if (sigProps.getSignatureC14nTransform() != null) {
+ transform = sigProps.getSignatureC14nTransform();
}
SecurePart securePart =
new SecurePart(elementsToSign.get(0), SecurePart.Modifier.Element,
Modified: cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml (original)
+++ cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml Wed Jan 29 15:26:50 2014
@@ -49,8 +49,8 @@ under the License.
<bean id="sigProps" class="org.apache.cxf.rs.security.xml.SignatureProperties">
<property name="signatureAlgo" value="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<property name="signatureDigestAlgo" value="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <property name="signatureC14Method" value="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- <property name="signatureC14Transform" value="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ <property name="signatureC14nMethod" value="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+ <property name="signatureC14nTransform" value="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</bean>
<bean id="encProps" class="org.apache.cxf.rs.security.xml.EncryptionProperties">
<property name="encryptionKeyTransportAlgo" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
Modified: cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml?rev=1562478&r1=1562477&r2=1562478&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml (original)
+++ cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml Wed Jan 29 15:26:50 2014
@@ -49,8 +49,8 @@ under the License.
<bean id="sigProps" class="org.apache.cxf.rs.security.xml.SignatureProperties">
<property name="signatureAlgo" value="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<property name="signatureDigestAlgo" value="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <property name="signatureC14Method" value="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- <property name="signatureC14Transform" value="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ <property name="signatureC14nMethod" value="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+ <property name="signatureC14nTransform" value="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</bean>
<bean id="encProps" class="org.apache.cxf.rs.security.xml.EncryptionProperties">
<property name="encryptionKeyTransportAlgo" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>