You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2015/12/15 18:13:22 UTC
svn commit: r1720201 [10/24] - in /santuario/xml-security-java/trunk:
samples/javax/xml/crypto/dsig/samples/
samples/org/apache/xml/security/samples/
samples/org/apache/xml/security/samples/algorithms/
samples/org/apache/xml/security/samples/canonicali...
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java Tue Dec 15 17:13:17 2015
@@ -37,11 +37,11 @@ import org.w3c.dom.Text;
*/
public abstract class ElementProxy {
- protected static final org.slf4j.Logger log =
+ protected static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ElementProxy.class);
/**
- * What XML element does this ElementProxy instance wrap?
+ * What XML element does this ElementProxy instance wrap?
*/
private Element wrappedElement = null;
@@ -50,7 +50,7 @@ public abstract class ElementProxy {
/** Field doc */
private Document wrappedDoc = null;
-
+
/** Field prefixMappings */
private static Map<String, String> prefixMappings = new ConcurrentHashMap<String, String>();
@@ -58,7 +58,7 @@ public abstract class ElementProxy {
* Constructor ElementProxy
*
*/
- public ElementProxy() {
+ public ElementProxy() {
}
/**
@@ -72,9 +72,9 @@ public abstract class ElementProxy {
}
this.wrappedDoc = doc;
- this.wrappedElement = createElementForFamilyLocal(this.getBaseNamespace(), this.getBaseLocalName());
+ this.wrappedElement = createElementForFamilyLocal(this.getBaseNamespace(), this.getBaseLocalName());
}
-
+
/**
* Constructor ElementProxy
*
@@ -96,7 +96,7 @@ public abstract class ElementProxy {
this.guaranteeThatElementInCorrectSpace();
}
-
+
/**
* Returns the namespace of the Elements of the sub-class.
*
@@ -110,8 +110,8 @@ public abstract class ElementProxy {
* @return the localname of the Elements of the sub-class.
*/
public abstract String getBaseLocalName();
-
-
+
+
protected Element createElementForFamilyLocal(
String namespace, String localName
) {
@@ -129,7 +129,7 @@ public abstract class ElementProxy {
result = doc.createElementNS(namespace, prefix + ":" + localName);
result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix, namespace);
}
- }
+ }
return result;
}
@@ -248,9 +248,9 @@ public abstract class ElementProxy {
String actualLocalName = getElement().getLocalName();
String actualNamespaceUri = getElement().getNamespaceURI();
- if(!expectedNamespaceUri.equals(actualNamespaceUri)
- && !expectedLocalName.equals(actualLocalName)) {
- Object exArgs[] = { actualNamespaceUri + ":" + actualLocalName,
+ if(!expectedNamespaceUri.equals(actualNamespaceUri)
+ && !expectedLocalName.equals(actualLocalName)) {
+ Object exArgs[] = { actualNamespaceUri + ":" + actualLocalName,
expectedNamespaceUri + ":" + expectedLocalName};
throw new XMLSecurityException("xml.WrongElement", exArgs);
}
@@ -315,7 +315,7 @@ public abstract class ElementProxy {
*/
public void addBase64Text(byte[] bytes) {
if (bytes != null) {
- Text t = XMLUtils.ignoreLineBreaks()
+ Text t = XMLUtils.ignoreLineBreaks()
? createText(Base64.encode(bytes))
: createText("\n" + Base64.encode(bytes) + "\n");
appendSelf(t);
@@ -325,15 +325,15 @@ public abstract class ElementProxy {
protected void appendSelf(ElementProxy toAppend) {
getElement().appendChild(toAppend.getElement());
}
-
+
protected void appendSelf(Node toAppend) {
getElement().appendChild(toAppend);
}
-
+
protected void appendOther(Element parent, Node toAppend) {
parent.appendChild(toAppend);
}
-
+
/**
* Method addText
*
@@ -393,7 +393,7 @@ public abstract class ElementProxy {
/**
* Method getTextFromTextChild
*
- * @return the Text obtained by concatenating all the text nodes of this
+ * @return the Text obtained by concatenating all the text nodes of this
* element
*/
public String getTextFromTextChild() {
@@ -410,7 +410,7 @@ public abstract class ElementProxy {
public int length(String namespace, String localname) {
int number = 0;
Node sibling = getFirstChild();
- while (sibling != null) {
+ while (sibling != null) {
if (localname.equals(sibling.getLocalName())
&& namespace.equals(sibling.getNamespaceURI())) {
number++;
@@ -449,7 +449,7 @@ public abstract class ElementProxy {
Attr a = getElement().getAttributeNodeNS(Constants.NamespaceSpecNS, ns);
- if (a != null) {
+ if (a != null) {
if (!a.getNodeValue().equals(uri)) {
Object exArgs[] = { ns, getElement().getAttributeNS(null, ns) };
@@ -481,7 +481,7 @@ public abstract class ElementProxy {
throw new XMLSecurityException("prefix.AlreadyAssigned", exArgs);
}
}
-
+
if (Constants.SignatureSpecNS.equals(namespace)) {
XMLUtils.setDsPrefix(prefix);
}
@@ -490,7 +490,7 @@ public abstract class ElementProxy {
}
prefixMappings.put(namespace, prefix);
}
-
+
/**
* This method registers the default prefixes.
*/
@@ -519,36 +519,36 @@ public abstract class ElementProxy {
/**
* New value for the wrapped XML element that this object is a proxy for.
- *
+ *
* @param elem New element
- *
+ *
* @see #getElement()
*/
protected void setElement(Element elem) {
wrappedElement = elem;
}
-
+
/**
* Set a new value for the wrapped document that this object is a proxy for.
- *
+ *
* @param doc New document object being wrapped.
- *
+ *
* @see #getDocument()
*/
protected void setDocument(Document doc) {
wrappedDoc = doc;
}
-
+
protected String getLocalAttribute(String attrName) {
return getElement().getAttributeNS(null, attrName);
}
-
+
protected void setLocalAttribute(String attrName, String value) {
getElement().setAttributeNS(null, attrName, value);
}
-
+
protected void setLocalIdAttribute(String attrName, String value) {
-
+
if (value != null) {
Attr attr = getDocument().createAttributeNS(null, attrName);
attr.setValue(value);
@@ -559,9 +559,9 @@ public abstract class ElementProxy {
getElement().removeAttributeNS(null, attrName);
}
}
-
+
protected Node getFirstChild() {
return getElement().getFirstChild();
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java Tue Dec 15 17:13:17 2015
@@ -22,239 +22,239 @@ public final class EncryptionConstants {
// Attributes that exist in XML Signature in the same way
/** Tag of Attr Algorithm **/
public static final String _ATT_ALGORITHM = Constants._ATT_ALGORITHM;
-
+
/** Tag of Attr Id**/
public static final String _ATT_ID = Constants._ATT_ID;
-
+
/** Tag of Attr Target **/
public static final String _ATT_TARGET = Constants._ATT_TARGET;
-
+
/** Tag of Attr Type **/
public static final String _ATT_TYPE = Constants._ATT_TYPE;
-
+
/** Tag of Attr URI **/
public static final String _ATT_URI = Constants._ATT_URI;
// Attributes new in XML Encryption
/** Tag of Attr encoding **/
public static final String _ATT_ENCODING = "Encoding";
-
+
/** Tag of Attr recipient **/
public static final String _ATT_RECIPIENT = "Recipient";
-
+
/** Tag of Attr mimetype **/
public static final String _ATT_MIMETYPE = "MimeType";
/** Tag of Element CarriedKeyName **/
public static final String _TAG_CARRIEDKEYNAME = "CarriedKeyName";
-
+
/** Tag of Element CipherData **/
public static final String _TAG_CIPHERDATA = "CipherData";
-
+
/** Tag of Element CipherReference **/
public static final String _TAG_CIPHERREFERENCE = "CipherReference";
-
+
/** Tag of Element CipherValue **/
public static final String _TAG_CIPHERVALUE = "CipherValue";
-
+
/** Tag of Element DataReference **/
public static final String _TAG_DATAREFERENCE = "DataReference";
-
+
/** Tag of Element EncryptedData **/
public static final String _TAG_ENCRYPTEDDATA = "EncryptedData";
-
+
/** Tag of Element EncryptedKey **/
public static final String _TAG_ENCRYPTEDKEY = "EncryptedKey";
-
+
/** Tag of Element EncryptionMethod **/
public static final String _TAG_ENCRYPTIONMETHOD = "EncryptionMethod";
-
+
/** Tag of Element EncryptionProperties **/
public static final String _TAG_ENCRYPTIONPROPERTIES = "EncryptionProperties";
-
+
/** Tag of Element EncryptionProperty **/
public static final String _TAG_ENCRYPTIONPROPERTY = "EncryptionProperty";
-
+
/** Tag of Element KeyReference **/
public static final String _TAG_KEYREFERENCE = "KeyReference";
-
+
/** Tag of Element KeySize **/
public static final String _TAG_KEYSIZE = "KeySize";
-
+
/** Tag of Element OAEPparams **/
public static final String _TAG_OAEPPARAMS = "OAEPparams";
-
+
/** Tag of Element MGF **/
public static final String _TAG_MGF = "MGF";
-
+
/** Tag of Element ReferenceList **/
public static final String _TAG_REFERENCELIST = "ReferenceList";
-
+
/** Tag of Element Transforms **/
public static final String _TAG_TRANSFORMS = "Transforms";
-
+
/** Tag of Element AgreementMethod **/
public static final String _TAG_AGREEMENTMETHOD = "AgreementMethod";
-
+
/** Tag of Element KA-Nonce **/
public static final String _TAG_KA_NONCE = "KA-Nonce";
-
+
/** Tag of Element OriginatorKeyInfo **/
public static final String _TAG_ORIGINATORKEYINFO = "OriginatorKeyInfo";
-
+
/** Tag of Element RecipientKeyInfo **/
public static final String _TAG_RECIPIENTKEYINFO = "RecipientKeyInfo";
/** Field ENCRYPTIONSPECIFICATION_URL */
- public static final String ENCRYPTIONSPECIFICATION_URL =
+ public static final String ENCRYPTIONSPECIFICATION_URL =
"http://www.w3.org/TR/2001/WD-xmlenc-core-20010626/";
- /** The namespace of the
+ /** The namespace of the
* <A HREF="http://www.w3.org/TR/2001/WD-xmlenc-core-20010626/">
* XML Encryption Syntax and Processing</A> */
- public static final String EncryptionSpecNS =
+ public static final String EncryptionSpecNS =
"http://www.w3.org/2001/04/xmlenc#";
-
+
/**
* The namespace of the XML Encryption 1.1 specification
*/
- public static final String EncryptionSpec11NS =
+ public static final String EncryptionSpec11NS =
"http://www.w3.org/2009/xmlenc11#";
/** URI for content*/
public static final String TYPE_CONTENT = EncryptionSpecNS + "Content";
-
+
/** URI for element*/
public static final String TYPE_ELEMENT = EncryptionSpecNS + "Element";
-
+
/** URI for mediatype*/
- public static final String TYPE_MEDIATYPE =
+ public static final String TYPE_MEDIATYPE =
"http://www.isi.edu/in-notes/iana/assignments/media-types/";
/** Block Encryption - REQUIRED TRIPLEDES */
- public static final String ALGO_ID_BLOCKCIPHER_TRIPLEDES =
+ public static final String ALGO_ID_BLOCKCIPHER_TRIPLEDES =
EncryptionConstants.EncryptionSpecNS + "tripledes-cbc";
-
+
/** Block Encryption - REQUIRED AES-128 */
- public static final String ALGO_ID_BLOCKCIPHER_AES128 =
+ public static final String ALGO_ID_BLOCKCIPHER_AES128 =
EncryptionConstants.EncryptionSpecNS + "aes128-cbc";
-
+
/** Block Encryption - REQUIRED AES-256 */
- public static final String ALGO_ID_BLOCKCIPHER_AES256 =
+ public static final String ALGO_ID_BLOCKCIPHER_AES256 =
EncryptionConstants.EncryptionSpecNS + "aes256-cbc";
-
+
/** Block Encryption - OPTIONAL AES-192 */
- public static final String ALGO_ID_BLOCKCIPHER_AES192 =
+ public static final String ALGO_ID_BLOCKCIPHER_AES192 =
EncryptionConstants.EncryptionSpecNS + "aes192-cbc";
-
+
/** Block Encryption - OPTIONAL AES-128-GCM */
- public static final String ALGO_ID_BLOCKCIPHER_AES128_GCM =
+ public static final String ALGO_ID_BLOCKCIPHER_AES128_GCM =
"http://www.w3.org/2009/xmlenc11#aes128-gcm";
-
+
/** Block Encryption - OPTIONAL AES-192-GCM */
- public static final String ALGO_ID_BLOCKCIPHER_AES192_GCM =
+ public static final String ALGO_ID_BLOCKCIPHER_AES192_GCM =
"http://www.w3.org/2009/xmlenc11#aes192-gcm";
-
+
/** Block Encryption - OPTIONAL AES-256-GCM */
- public static final String ALGO_ID_BLOCKCIPHER_AES256_GCM =
+ public static final String ALGO_ID_BLOCKCIPHER_AES256_GCM =
"http://www.w3.org/2009/xmlenc11#aes256-gcm";
-
+
/** Block Encryption - OPTIONAL SEED-128 */
- public static final String ALGO_ID_BLOCKCIPHER_SEED128 =
+ public static final String ALGO_ID_BLOCKCIPHER_SEED128 =
"http://www.w3.org/2007/05/xmldsig-more#seed128-cbc";
/** Block Encryption - OPTIONAL CAMELLIA-128 */
- public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA128 =
+ public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA128 =
"http://www.w3.org/2001/04/xmldsig-more#camellia128-cbc";
-
+
/** Block Encryption - OPTIONAL CAMELLIA-128 */
- public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA192 =
+ public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA192 =
"http://www.w3.org/2001/04/xmldsig-more#camellia192-cbc";
-
+
/** Block Encryption - OPTIONAL CAMELLIA-128 */
- public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA256 =
+ public static final String ALGO_ID_BLOCKCIPHER_CAMELLIA256 =
"http://www.w3.org/2001/04/xmldsig-more#camellia256-cbc";
/** Key Transport - REQUIRED RSA-v1.5*/
- public static final String ALGO_ID_KEYTRANSPORT_RSA15 =
+ public static final String ALGO_ID_KEYTRANSPORT_RSA15 =
EncryptionConstants.EncryptionSpecNS + "rsa-1_5";
-
+
/** Key Transport - REQUIRED RSA-OAEP */
- public static final String ALGO_ID_KEYTRANSPORT_RSAOAEP =
+ public static final String ALGO_ID_KEYTRANSPORT_RSAOAEP =
EncryptionConstants.EncryptionSpecNS + "rsa-oaep-mgf1p";
-
+
/** Key Transport - OPTIONAL RSA-OAEP_11 */
- public static final String ALGO_ID_KEYTRANSPORT_RSAOAEP_11 =
+ public static final String ALGO_ID_KEYTRANSPORT_RSAOAEP_11 =
EncryptionConstants.EncryptionSpec11NS + "rsa-oaep";
/** Key Agreement - OPTIONAL Diffie-Hellman */
- public static final String ALGO_ID_KEYAGREEMENT_DH =
+ public static final String ALGO_ID_KEYAGREEMENT_DH =
EncryptionConstants.EncryptionSpecNS + "dh";
/** Symmetric Key Wrap - REQUIRED TRIPLEDES KeyWrap */
- public static final String ALGO_ID_KEYWRAP_TRIPLEDES =
+ public static final String ALGO_ID_KEYWRAP_TRIPLEDES =
EncryptionConstants.EncryptionSpecNS + "kw-tripledes";
-
+
/** Symmetric Key Wrap - REQUIRED AES-128 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_AES128 =
+ public static final String ALGO_ID_KEYWRAP_AES128 =
EncryptionConstants.EncryptionSpecNS + "kw-aes128";
-
+
/** Symmetric Key Wrap - REQUIRED AES-256 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_AES256 =
+ public static final String ALGO_ID_KEYWRAP_AES256 =
EncryptionConstants.EncryptionSpecNS + "kw-aes256";
-
+
/** Symmetric Key Wrap - OPTIONAL AES-192 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_AES192 =
+ public static final String ALGO_ID_KEYWRAP_AES192 =
EncryptionConstants.EncryptionSpecNS + "kw-aes192";
-
+
/** Symmetric Key Wrap - OPTIONAL CAMELLIA-128 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_CAMELLIA128 =
+ public static final String ALGO_ID_KEYWRAP_CAMELLIA128 =
"http://www.w3.org/2001/04/xmldsig-more#kw-camellia128";
/** Symmetric Key Wrap - OPTIONAL CAMELLIA-192 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_CAMELLIA192 =
+ public static final String ALGO_ID_KEYWRAP_CAMELLIA192 =
"http://www.w3.org/2001/04/xmldsig-more#kw-camellia192";
/** Symmetric Key Wrap - OPTIONAL CAMELLIA-256 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_CAMELLIA256 =
+ public static final String ALGO_ID_KEYWRAP_CAMELLIA256 =
"http://www.w3.org/2001/04/xmldsig-more#kw-camellia256";
-
+
/** Symmetric Key Wrap - OPTIONAL SEED-128 KeyWrap */
- public static final String ALGO_ID_KEYWRAP_SEED128 =
+ public static final String ALGO_ID_KEYWRAP_SEED128 =
"http://www.w3.org/2007/05/xmldsig-more#kw-seed128";
-
+
/** Message Authentication - RECOMMENDED XML Digital Signature */
- public static final String ALGO_ID_AUTHENTICATION_XMLSIGNATURE =
+ public static final String ALGO_ID_AUTHENTICATION_XMLSIGNATURE =
"http://www.w3.org/TR/2001/CR-xmldsig-core-20010419/";
/** Canonicalization - OPTIONAL Canonical XML with Comments */
- public static final String ALGO_ID_C14N_WITHCOMMENTS =
+ public static final String ALGO_ID_C14N_WITHCOMMENTS =
"http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments";
-
+
/** Canonicalization - OPTIONAL Canonical XML (omits comments) */
- public static final String ALGO_ID_C14N_OMITCOMMENTS =
+ public static final String ALGO_ID_C14N_OMITCOMMENTS =
"http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
/** Encoding - REQUIRED base64 */
- public static final String ALGO_ID_ENCODING_BASE64 =
+ public static final String ALGO_ID_ENCODING_BASE64 =
"http://www.w3.org/2000/09/xmldsig#base64";
-
+
/** MGF1 with SHA-1 */
public static final String MGF1_SHA1 =
EncryptionConstants.EncryptionSpec11NS + "mgf1sha1";
-
+
/** MGF1 with SHA-224 */
public static final String MGF1_SHA224 =
EncryptionConstants.EncryptionSpec11NS + "mgf1sha224";
-
+
/** MGF1 with SHA-256 */
public static final String MGF1_SHA256 =
EncryptionConstants.EncryptionSpec11NS + "mgf1sha256";
-
+
/** MGF1 with SHA-384 */
public static final String MGF1_SHA384 =
EncryptionConstants.EncryptionSpec11NS + "mgf1sha384";
-
+
/** MGF1 with SHA-512 */
public static final String MGF1_SHA512 =
EncryptionConstants.EncryptionSpec11NS + "mgf1sha512";
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java Tue Dec 15 17:13:17 2015
@@ -35,7 +35,7 @@ public class HelperNodeList implements N
boolean allNodesMustHaveSameParent = false;
/**
- *
+ *
*/
public HelperNodeList() {
this(false);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java Tue Dec 15 17:13:17 2015
@@ -58,7 +58,7 @@ public class I18n {
* <CODE>exceptionMessagesResourceBundleBase</CODE>
*
* @param message
- * @param args is an <CODE>Object[]</CODE> array of strings which are inserted into
+ * @param args is an <CODE>Object[]</CODE> array of strings which are inserted into
* the String which is retrieved from the <CODE>ResouceBundle</CODE>
* @return message translated
*/
@@ -94,7 +94,7 @@ public class I18n {
return "No message with ID \"" + msgID
+ "\" found in resource bundle \""
+ Constants.exceptionMessagesResourceBundleBase + "\"";
- }
+ }
return I18n.NOT_INITIALIZED_MSG;
}
}
@@ -118,7 +118,7 @@ public class I18n {
+ "\". Original Exception was a "
+ originalException.getClass().getName() + " and message "
+ originalException.getMessage();
- }
+ }
return I18n.NOT_INITIALIZED_MSG;
}
}
@@ -138,11 +138,11 @@ public class I18n {
return "No message with ID \"" + msgID
+ "\" found in resource bundle \""
+ Constants.exceptionMessagesResourceBundleBase + "\"";
- }
+ }
return I18n.NOT_INITIALIZED_MSG;
}
}
-
+
/**
* Method init
*
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java Tue Dec 15 17:13:17 2015
@@ -49,7 +49,7 @@ public class IdResolver {
* Method getElementById
*
* @param doc the document
- * @param id the value of the ID
+ * @param id the value of the ID
* @return the element obtained by the id, or null if it is not found.
*/
public static Element getElementById(Document doc, String id) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java Tue Dec 15 17:13:17 2015
@@ -38,7 +38,7 @@ public class IgnoreAllErrorHandler imple
getProperty("org.apache.xml.security.test.warn.on.exceptions");
/** Field throwExceptions */
- private static final boolean throwExceptions =
+ private static final boolean throwExceptions =
getProperty("org.apache.xml.security.test.throw.exceptions");
private static boolean getProperty(final String name) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java Tue Dec 15 17:13:17 2015
@@ -34,13 +34,13 @@ import org.w3c.dom.NodeList;
* An implementation for XPath evaluation that uses the JDK API.
*/
public class JDKXPathAPI implements XPathAPI {
-
+
private XPathFactory xpf;
-
+
private String xpathStr;
private XPathExpression xpathExpression;
-
+
/**
* Use an XPath string to select a nodelist.
* XPath namespace prefixes are resolved from the namespaceNode.
@@ -80,7 +80,7 @@ public class JDKXPathAPI implements XPat
throw new TransformerException(ex);
}
}
-
+
/**
* Evaluate an XPath string and return true if the output is to be included or not.
* @param contextNode The node to start searching from.
@@ -114,7 +114,7 @@ public class JDKXPathAPI implements XPat
throw new TransformerException(ex);
}
}
-
+
/**
* Clear any context information from this object
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java Tue Dec 15 17:13:17 2015
@@ -116,7 +116,7 @@ public final class JavaUtils {
}
/**
- * This method reads all bytes from the given InputStream till EOF and
+ * This method reads all bytes from the given InputStream till EOF and
* returns them as a byte array.
*
* @param inputStream
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java Tue Dec 15 17:13:17 2015
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.StringReader;
public class RFC2253Parser {
-
+
/**
* Method rfc2253toXMLdsig
*
@@ -58,7 +58,7 @@ public class RFC2253Parser {
public static String normalize(String dn) {
return normalize(dn, true);
}
-
+
/**
* Method normalize
*
@@ -142,7 +142,7 @@ public class RFC2253Parser {
if (i == -1 || i > 0 && str.charAt(i - 1) == '\\') {
return str;
- }
+ }
String attrType = normalizeAT(str.substring(0, i));
// only normalize if value is a String
String attrValue = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java Tue Dec 15 17:13:17 2015
@@ -28,10 +28,10 @@ import org.w3c.dom.Element;
* @author Brent Putman (putmanb@georgetown.edu)
*/
public abstract class Signature11ElementProxy extends ElementProxy {
-
+
protected Signature11ElementProxy() {
}
-
+
/**
* Constructor Signature11ElementProxy
*
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java Tue Dec 15 17:13:17 2015
@@ -28,10 +28,10 @@ import org.w3c.dom.Element;
* @author $Author$
*/
public abstract class SignatureElementProxy extends ElementProxy {
-
+
protected SignatureElementProxy() {
}
-
+
/**
* Constructor SignatureElementProxy
*
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java Tue Dec 15 17:13:17 2015
@@ -30,14 +30,14 @@ import org.apache.xml.security.signature
public class SignerOutputStream extends ByteArrayOutputStream {
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignerOutputStream.class);
-
+
final SignatureAlgorithm sa;
/**
* @param sa
*/
public SignerOutputStream(SignatureAlgorithm sa) {
- this.sa = sa;
+ this.sa = sa;
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java Tue Dec 15 17:13:17 2015
@@ -27,12 +27,12 @@ import java.io.OutputStream;
*/
public class UnsyncBufferedOutputStream extends OutputStream {
static final int size = 8*1024;
-
+
private int pointer = 0;
private final OutputStream out;
private final byte[] buf;
-
+
/**
* Creates a buffered output stream without synchronization
* @param out the outputstream to buffer
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java Tue Dec 15 17:13:17 2015
@@ -81,7 +81,7 @@ public class UnsyncByteArrayOutputStream
public void reset() {
pos = 0;
}
-
+
private void expandSize(int newPos) {
int newSize = size;
while (newPos > newSize) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Tue Dec 15 17:13:17 2015
@@ -66,7 +66,7 @@ public final class XMLUtils {
("org.apache.xml.security.ignoreLineBreaks");
}
});
-
+
@SuppressWarnings("unchecked")
private static final WeakObjectPool<DocumentBuilder, ParserConfigurationException> pools[] = new WeakObjectPool[4];
static {
@@ -75,12 +75,12 @@ public final class XMLUtils {
pools[2] = new DocumentBuilderPool(true, false);
pools[3] = new DocumentBuilderPool(true, true);
}
-
+
private static volatile String dsPrefix = "ds";
private static volatile String ds11Prefix = "dsig11";
private static volatile String xencPrefix = "xenc";
private static volatile String xenc11Prefix = "xenc11";
-
+
private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XMLUtils.class);
@@ -92,7 +92,7 @@ public final class XMLUtils {
private XMLUtils() {
// we don't allow instantiation
}
-
+
/**
* Set the prefix for the digital signature namespace
* @param prefix the new prefix for the digital signature namespace
@@ -103,9 +103,9 @@ public final class XMLUtils {
JavaUtils.checkRegisterPermission();
dsPrefix = prefix;
}
-
+
/**
- * Set the prefix for the digital signature 1.1 namespace
+ * Set the prefix for the digital signature 1.1 namespace
* @param prefix the new prefix for the digital signature 1.1 namespace
* @throws SecurityException if a security manager is installed and the
* caller does not have permission to set the prefix
@@ -114,7 +114,7 @@ public final class XMLUtils {
JavaUtils.checkRegisterPermission();
ds11Prefix = prefix;
}
-
+
/**
* Set the prefix for the encryption namespace
* @param prefix the new prefix for the encryption namespace
@@ -125,7 +125,7 @@ public final class XMLUtils {
JavaUtils.checkRegisterPermission();
xencPrefix = prefix;
}
-
+
/**
* Set the prefix for the encryption namespace 1.1
* @param prefix the new prefix for the encryption namespace 1.1
@@ -136,7 +136,7 @@ public final class XMLUtils {
JavaUtils.checkRegisterPermission();
xenc11Prefix = prefix;
}
-
+
public static Element getNextElement(Node el) {
Node node = el;
while (node != null && node.getNodeType() != Node.ELEMENT_NODE) {
@@ -150,14 +150,14 @@ public final class XMLUtils {
* @param result
* @param exclude
* @param com whether comments or not
- */
+ */
public static void getSet(Node rootNode, Set<Node> result, Node exclude, boolean com) {
if (exclude != null && isDescendantOrSelf(exclude, rootNode)) {
return;
}
getSetRec(rootNode, result, exclude, com);
}
-
+
@SuppressWarnings("fallthrough")
private static void getSetRec(final Node rootNode, final Set<Node> result,
final Node exclude, final boolean com) {
@@ -176,17 +176,17 @@ public final class XMLUtils {
}
//no return keep working
case Node.DOCUMENT_NODE:
- for (Node r = rootNode.getFirstChild(); r != null; r = r.getNextSibling()) {
+ for (Node r = rootNode.getFirstChild(); r != null; r = r.getNextSibling()) {
if (r.getNodeType() == Node.TEXT_NODE) {
- result.add(r);
+ result.add(r);
while (r != null && r.getNodeType() == Node.TEXT_NODE) {
r = r.getNextSibling();
}
if (r == null) {
return;
}
- }
- getSetRec(r, result, exclude, com);
+ }
+ getSetRec(r, result, exclude, com);
}
return;
case Node.COMMENT_NODE:
@@ -290,7 +290,7 @@ public final class XMLUtils {
*/
public static String getFullTextChildrenFromElement(Element element) {
StringBuilder sb = new StringBuilder();
-
+
Node child = element.getFirstChild();
while (child != null) {
if (child.getNodeType() == Node.TEXT_NODE) {
@@ -316,10 +316,10 @@ public final class XMLUtils {
if (dsPrefix == null || dsPrefix.length() == 0) {
return doc.createElementNS(Constants.SignatureSpecNS, elementName);
- }
+ }
return doc.createElementNS(Constants.SignatureSpecNS, dsPrefix + ":" + elementName);
}
-
+
/**
* Creates an Element in the XML Signature 1.1 specification namespace.
*
@@ -334,7 +334,7 @@ public final class XMLUtils {
if (ds11Prefix == null || ds11Prefix.length() == 0) {
return doc.createElementNS(Constants.SignatureSpec11NS, elementName);
- }
+ }
return doc.createElementNS(Constants.SignatureSpec11NS, ds11Prefix + ":" + elementName);
}
@@ -353,12 +353,12 @@ public final class XMLUtils {
if (xencPrefix == null || xencPrefix.length() == 0) {
return doc.createElementNS(EncryptionConstants.EncryptionSpecNS, elementName);
}
- return
+ return
doc.createElementNS(
EncryptionConstants.EncryptionSpecNS, xencPrefix + ":" + elementName
);
}
-
+
/**
* Creates an Element in the XML Encryption 1.1 specification namespace.
*
@@ -374,7 +374,7 @@ public final class XMLUtils {
if (xenc11Prefix == null || xenc11Prefix.length() == 0) {
return doc.createElementNS(EncryptionConstants.EncryptionSpec11NS, elementName);
}
- return
+ return
doc.createElementNS(
EncryptionConstants.EncryptionSpec11NS, xenc11Prefix + ":" + elementName
);
@@ -386,7 +386,7 @@ public final class XMLUtils {
*
* @param element
* @param localName
- * @return true if the element is in XML Signature namespace and the local name equals
+ * @return true if the element is in XML Signature namespace and the local name equals
* the supplied one
*/
public static boolean elementIsInSignatureSpace(Element element, String localName) {
@@ -394,17 +394,17 @@ public final class XMLUtils {
return false;
}
- return Constants.SignatureSpecNS.equals(element.getNamespaceURI())
+ return Constants.SignatureSpecNS.equals(element.getNamespaceURI())
&& element.getLocalName().equals(localName);
}
-
+
/**
* Returns true if the element is in XML Signature 1.1 namespace and the local
* name equals the supplied one.
*
* @param element
* @param localName
- * @return true if the element is in XML Signature namespace and the local name equals
+ * @return true if the element is in XML Signature namespace and the local name equals
* the supplied one
*/
public static boolean elementIsInSignature11Space(Element element, String localName) {
@@ -412,7 +412,7 @@ public final class XMLUtils {
return false;
}
- return Constants.SignatureSpec11NS.equals(element.getNamespaceURI())
+ return Constants.SignatureSpec11NS.equals(element.getNamespaceURI())
&& element.getLocalName().equals(localName);
}
@@ -422,31 +422,31 @@ public final class XMLUtils {
*
* @param element
* @param localName
- * @return true if the element is in XML Encryption namespace and the local name
+ * @return true if the element is in XML Encryption namespace and the local name
* equals the supplied one
*/
public static boolean elementIsInEncryptionSpace(Element element, String localName) {
if (element == null){
return false;
}
- return EncryptionConstants.EncryptionSpecNS.equals(element.getNamespaceURI())
+ return EncryptionConstants.EncryptionSpecNS.equals(element.getNamespaceURI())
&& element.getLocalName().equals(localName);
}
-
+
/**
* Returns true if the element is in XML Encryption 1.1 namespace and the local
* name equals the supplied one.
*
* @param element
* @param localName
- * @return true if the element is in XML Encryption 1.1 namespace and the local name
+ * @return true if the element is in XML Encryption 1.1 namespace and the local name
* equals the supplied one
*/
public static boolean elementIsInEncryption11Space(Element element, String localName) {
if (element == null){
return false;
}
- return EncryptionConstants.EncryptionSpec11NS.equals(element.getNamespaceURI())
+ return EncryptionConstants.EncryptionSpec11NS.equals(element.getNamespaceURI())
&& element.getLocalName().equals(localName);
}
@@ -462,7 +462,7 @@ public final class XMLUtils {
public static Document getOwnerDocument(Node node) {
if (node.getNodeType() == Node.DOCUMENT_NODE) {
return (Document) node;
- }
+ }
try {
return node.getOwnerDocument();
} catch (NullPointerException npe) {
@@ -479,7 +479,7 @@ public final class XMLUtils {
* if the {@link Node} is a {@link Document}.
*
* @param xpathNodeSet
- * @return the owner document
+ * @return the owner document
*/
public static Document getOwnerDocument(Set<Node> xpathNodeSet) {
NullPointerException npe = null;
@@ -487,17 +487,17 @@ public final class XMLUtils {
int nodeType = node.getNodeType();
if (nodeType == Node.DOCUMENT_NODE) {
return (Document) node;
- }
+ }
try {
if (nodeType == Node.ATTRIBUTE_NODE) {
- return ((Attr)node).getOwnerElement().getOwnerDocument();
+ return ((Attr)node).getOwnerElement().getOwnerDocument();
}
return node.getOwnerDocument();
} catch (NullPointerException e) {
npe = e;
}
}
-
+
throw new NullPointerException(I18n.translate("endorsed.jdk1.4.0")
+ " Original message was \""
+ (npe == null ? "" : npe.getMessage()) + "\"");
@@ -615,12 +615,12 @@ public final class XMLUtils {
if (!element.hasChildNodes()) {
break;
}
- if (element.hasAttributes()) {
+ if (element.hasAttributes()) {
NamedNodeMap attributes = element.getAttributes();
- int attributesLength = attributes.getLength();
+ int attributesLength = attributes.getLength();
- for (Node child = element.getFirstChild(); child!=null;
- child = child.getNextSibling()) {
+ for (Node child = element.getFirstChild(); child!=null;
+ child = child.getNextSibling()) {
if (child.getNodeType() != Node.ELEMENT_NODE) {
continue;
@@ -628,11 +628,11 @@ public final class XMLUtils {
Element childElement = (Element) child;
for (int i = 0; i < attributesLength; i++) {
- Attr currentAttr = (Attr) attributes.item(i);
+ Attr currentAttr = (Attr) attributes.item(i);
if (!namespaceNs.equals(currentAttr.getNamespaceURI())) {
continue;
}
- if (childElement.hasAttributeNS(namespaceNs,
+ if (childElement.hasAttributeNS(namespaceNs,
currentAttr.getLocalName())) {
continue;
}
@@ -640,7 +640,7 @@ public final class XMLUtils {
currentAttr.getName(),
currentAttr.getNodeValue());
}
- }
+ }
}
case Node.ENTITY_REFERENCE_NODE :
case Node.DOCUMENT_NODE :
@@ -660,7 +660,7 @@ public final class XMLUtils {
sibling = node.getNextSibling();
} while (true);
}
-
+
/**
* @param sibling
* @param nodeName
@@ -669,7 +669,7 @@ public final class XMLUtils {
*/
public static Element selectDsNode(Node sibling, String nodeName, int number) {
while (sibling != null) {
- if (Constants.SignatureSpecNS.equals(sibling.getNamespaceURI())
+ if (Constants.SignatureSpecNS.equals(sibling.getNamespaceURI())
&& sibling.getLocalName().equals(nodeName)) {
if (number == 0){
return (Element)sibling;
@@ -689,7 +689,7 @@ public final class XMLUtils {
*/
public static Element selectDs11Node(Node sibling, String nodeName, int number) {
while (sibling != null) {
- if (Constants.SignatureSpec11NS.equals(sibling.getNamespaceURI())
+ if (Constants.SignatureSpec11NS.equals(sibling.getNamespaceURI())
&& sibling.getLocalName().equals(nodeName)) {
if (number == 0){
return (Element)sibling;
@@ -709,7 +709,7 @@ public final class XMLUtils {
*/
public static Element selectXencNode(Node sibling, String nodeName, int number) {
while (sibling != null) {
- if (EncryptionConstants.EncryptionSpecNS.equals(sibling.getNamespaceURI())
+ if (EncryptionConstants.EncryptionSpecNS.equals(sibling.getNamespaceURI())
&& sibling.getLocalName().equals(nodeName)) {
if (number == 0){
return (Element)sibling;
@@ -739,7 +739,7 @@ public final class XMLUtils {
}
return (Text)n;
}
-
+
/**
* @param sibling
* @param nodeName
@@ -786,7 +786,7 @@ public final class XMLUtils {
*/
public static Element selectNode(Node sibling, String uri, String nodeName, int number) {
while (sibling != null) {
- if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
+ if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
&& sibling.getLocalName().equals(nodeName)) {
if (number == 0){
return (Element)sibling;
@@ -800,22 +800,22 @@ public final class XMLUtils {
/**
* @param sibling
- * @param nodeName
+ * @param nodeName
* @return nodes with the constrain
*/
public static Element[] selectDsNodes(Node sibling, String nodeName) {
return selectNodes(sibling, Constants.SignatureSpecNS, nodeName);
}
-
+
/**
* @param sibling
- * @param nodeName
+ * @param nodeName
* @return nodes with the constrain
*/
public static Element[] selectDs11Nodes(Node sibling, String nodeName) {
return selectNodes(sibling, Constants.SignatureSpec11NS, nodeName);
}
-
+
/**
* @param sibling
* @param uri
@@ -825,7 +825,7 @@ public final class XMLUtils {
public static Element[] selectNodes(Node sibling, String uri, String nodeName) {
List<Element> list = new ArrayList<Element>();
while (sibling != null) {
- if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
+ if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
&& sibling.getLocalName().equals(nodeName)) {
list.add((Element)sibling);
}
@@ -852,7 +852,7 @@ public final class XMLUtils {
}
return resultSet;
}
-
+
/**
* Method getStrFromNode
*
@@ -918,10 +918,10 @@ public final class XMLUtils {
public static boolean ignoreLineBreaks() {
return ignoreLineBreaks;
}
-
+
/**
* Returns the attribute value for the attribute with the specified name.
- * Returns null if there is no such attribute, or
+ * Returns null if there is no such attribute, or
* the empty string if the attribute value is empty.
*
* <p>This works around a limitation of the DOM
@@ -937,7 +937,7 @@ public final class XMLUtils {
Attr attr = elem.getAttributeNodeNS(null, name);
return (attr == null) ? null : attr.getValue();
}
-
+
/**
* This method is a tree-search to help prevent against wrapping attacks. It checks that no
* two Elements have ID Attributes that match the "value" argument, if this is the case then
@@ -949,7 +949,7 @@ public final class XMLUtils {
if (!id.isEmpty() && id.charAt(0) == '#') {
id = id.substring(1);
}
-
+
Node startParent = null;
Node processedNode = null;
Element foundElement = null;
@@ -960,7 +960,7 @@ public final class XMLUtils {
while (startNode != null) {
if (startNode.getNodeType() == Node.ELEMENT_NODE) {
Element se = (Element) startNode;
-
+
NamedNodeMap attributes = se.getAttributes();
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
@@ -986,7 +986,7 @@ public final class XMLUtils {
// close node processing, get sibling
startNode = processedNode.getNextSibling();
}
-
+
// no more siblings, get parent, all children
// of parent are processed.
while (startNode == null) {
@@ -1000,10 +1000,10 @@ public final class XMLUtils {
}
return true;
}
-
+
/**
* This method is a tree-search to help prevent against wrapping attacks. It checks that no other
- * Element than the given "knownElement" argument has an ID attribute that matches the "value"
+ * Element than the given "knownElement" argument has an ID attribute that matches the "value"
* argument, which is the ID value of "knownElement". If this is the case then "false" is returned.
*/
public static boolean protectAgainstWrappingAttack(
@@ -1013,7 +1013,7 @@ public final class XMLUtils {
if (!id.isEmpty() && id.charAt(0) == '#') {
id = id.substring(1);
}
-
+
Node startParent = null;
Node processedNode = null;
if (startNode != null) {
@@ -1023,7 +1023,7 @@ public final class XMLUtils {
while (startNode != null) {
if (startNode.getNodeType() == Node.ELEMENT_NODE) {
Element se = (Element) startNode;
-
+
NamedNodeMap attributes = se.getAttributes();
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
@@ -1044,7 +1044,7 @@ public final class XMLUtils {
// close node processing, get sibling
startNode = processedNode.getNextSibling();
}
-
+
// no more siblings, get parent, all children
// of parent are processed.
while (startNode == null) {
@@ -1058,11 +1058,11 @@ public final class XMLUtils {
}
return true;
}
-
+
public static DocumentBuilder createDocumentBuilder(boolean validating) throws ParserConfigurationException {
return createDocumentBuilder(validating, true);
}
-
+
public static DocumentBuilder createDocumentBuilder(
boolean validating, boolean disAllowDocTypeDeclarations
) throws ParserConfigurationException {
@@ -1070,7 +1070,7 @@ public final class XMLUtils {
return pools[idx].getObject();
}
-
+
/**
* Return this document builder to be reused
* @param db DocumentBuilder returned from any of {@link #createDocumentBuilder} methods.
@@ -1081,7 +1081,7 @@ public final class XMLUtils {
return false;
}
db.reset();
- boolean disAllowDocTypeDeclarations =
+ boolean disAllowDocTypeDeclarations =
((DocumentBuilderProxy)db).disAllowDocTypeDeclarations();
int idx = getPoolsIndex(db.isValidating(), disAllowDocTypeDeclarations);
return pools[idx].repool(db);
@@ -1096,7 +1096,7 @@ public final class XMLUtils {
private static class DocumentBuilderProxy extends DocumentBuilder {
private final DocumentBuilder delegate;
private final boolean disAllowDocTypeDeclarations;
-
+
private DocumentBuilderProxy(DocumentBuilder actual, boolean disAllowDocTypeDeclarations) {
delegate = actual;
this.disAllowDocTypeDeclarations = disAllowDocTypeDeclarations;
@@ -1105,7 +1105,7 @@ public final class XMLUtils {
boolean disAllowDocTypeDeclarations() {
return disAllowDocTypeDeclarations;
}
-
+
public void reset() {
delegate.reset();
}
@@ -1134,7 +1134,7 @@ public final class XMLUtils {
public boolean isXIncludeAware() {
return delegate.isXIncludeAware();
}
-
+
@Override
public Document parse(InputSource is) throws SAXException, IOException {
return delegate.parse(is);
@@ -1169,14 +1169,14 @@ public final class XMLUtils {
public DOMImplementation getDOMImplementation() {
return delegate.getDOMImplementation();
}
-
+
}
- private static final class DocumentBuilderPool
+ private static final class DocumentBuilderPool
extends WeakObjectPool<DocumentBuilder, ParserConfigurationException> {
private final boolean validating, disAllowDocTypeDeclarations;
-
+
public DocumentBuilderPool(boolean validating, boolean disAllowDocTypeDeclarations) {
this.validating = validating;
this.disAllowDocTypeDeclarations = disAllowDocTypeDeclarations;
@@ -1189,7 +1189,7 @@ public final class XMLUtils {
if (disAllowDocTypeDeclarations) {
dfactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
}
- dfactory.setValidating(validating);
+ dfactory.setValidating(validating);
dfactory.setNamespaceAware(true);
return new DocumentBuilderProxy(dfactory.newDocumentBuilder(), disAllowDocTypeDeclarations);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java Tue Dec 15 17:13:17 2015
@@ -43,7 +43,7 @@ public interface XPathAPI {
NodeList selectNodeList(
Node contextNode, Node xpathnode, String str, Node namespaceNode
) throws TransformerException;
-
+
/**
* Evaluate an XPath string and return true if the output is to be included or not.
* @param contextNode The node to start searching from.
@@ -53,7 +53,7 @@ public interface XPathAPI {
*/
boolean evaluate(Node contextNode, Node xpathnode, String str, Node namespaceNode)
throws TransformerException;
-
+
/**
* Clear any context information from this object
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java Tue Dec 15 17:13:17 2015
@@ -20,16 +20,16 @@ package org.apache.xml.security.utils;
/**
- * A Factory to return an XPathAPI instance. If Xalan is available it returns XalanXPathAPI. If not, then
+ * A Factory to return an XPathAPI instance. If Xalan is available it returns XalanXPathAPI. If not, then
* it returns JDKXPathAPI.
*/
public abstract class XPathFactory {
private static boolean xalanInstalled;
-
+
static {
try {
- Class<?> funcTableClass =
+ Class<?> funcTableClass =
ClassLoaderUtils.loadClass("org.apache.xpath.compiler.FunctionTable", XPathFactory.class);
if (funcTableClass != null) {
xalanInstalled = true;
@@ -38,11 +38,11 @@ public abstract class XPathFactory {
//ignore
}
}
-
+
protected static synchronized boolean isXalanInstalled() {
return xalanInstalled;
}
-
+
/**
* Get a new XPathFactory instance
*/
@@ -54,7 +54,7 @@ public abstract class XPathFactory {
if (XalanXPathAPI.isInstalled()) {
return new XalanXPathFactory();
}
- // Some problem was encountered in fixing up the Xalan FunctionTable so fall back to the
+ // Some problem was encountered in fixing up the Xalan FunctionTable so fall back to the
// JDK implementation
return new JDKXPathFactory();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Tue Dec 15 17:13:17 2015
@@ -52,15 +52,15 @@ public class XalanXPathAPI implements XP
private XPath xpath = null;
private static FunctionTable funcTable = null;
-
+
private static boolean installed;
-
+
private XPathContext context;
-
+
static {
fixupFunctionTable();
}
-
+
/**
* Use an XPath string to select a nodelist.
@@ -84,7 +84,7 @@ public class XalanXPathAPI implements XP
// Return a NodeList.
return list.nodelist();
}
-
+
/**
* Evaluate an XPath string and return true if the output is to be included or not.
* @param contextNode The node to start searching from.
@@ -97,7 +97,7 @@ public class XalanXPathAPI implements XP
XObject object = eval(contextNode, xpathnode, str, namespaceNode);
return object.bool();
}
-
+
/**
* Clear any context information from this object
*/
@@ -106,7 +106,7 @@ public class XalanXPathAPI implements XP
xpath = null;
context = null;
}
-
+
public static synchronized boolean isInstalled() {
return installed;
}
@@ -122,7 +122,7 @@ public class XalanXPathAPI implements XP
// XPath namespaces are resolved from the input context node's document element
// if it is a root node, or else the current context node (for lack of a better
// resolution space, given the simplicity of this sample code).
- Node resolverNode =
+ Node resolverNode =
(namespaceNode.getNodeType() == Node.DOCUMENT_NODE)
? ((Document) namespaceNode).getDocumentElement() : namespaceNode;
PrefixResolverDefault prefixResolver = new PrefixResolverDefault(resolverNode);
@@ -145,7 +145,7 @@ public class XalanXPathAPI implements XP
XPath xpath = null;
Class<?>[] classes = new Class[]{String.class, SourceLocator.class, PrefixResolver.class, int.class,
ErrorListener.class, FunctionTable.class};
- Object[] objects =
+ Object[] objects =
new Object[]{str, null, prefixResolver, XPath.SELECT, null, funcTable};
try {
Constructor<?> constructor = XPath.class.getConstructor(classes);
@@ -209,5 +209,5 @@ public class XalanXPathAPI implements XP
}
}
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Tue Dec 15 17:13:17 2015
@@ -41,10 +41,10 @@ public class ResourceResolver {
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResourceResolver.class);
-
+
/** these are the system-wide resolvers */
private static final List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
-
+
/** Field resolverSpi */
private final ResourceResolverSpi resolverSpi;
@@ -81,7 +81,7 @@ public class ResourceResolver {
ResourceResolver resolverTmp = resolver;
if (!resolver.resolverSpi.engineIsThreadSafe()) {
try {
- resolverTmp =
+ resolverTmp =
new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
} catch (InstantiationException e) {
throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
@@ -89,16 +89,16 @@ public class ResourceResolver {
throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
}
}
-
+
if (log.isDebugEnabled()) {
log.debug(
"check resolvability by class " + resolverTmp.getClass().getName()
);
}
-
+
if (resolverTmp != null && resolverTmp.canResolve(context)) {
// Check to see whether the Resolver is allowed
- if (context.secureValidation
+ if (context.secureValidation
&& (resolverTmp.resolverSpi instanceof ResolverLocalFilesystem
|| resolverTmp.resolverSpi instanceof ResolverDirectHTTP)) {
Object exArgs[] = { resolverTmp.resolverSpi.getClass().getName() };
@@ -110,13 +110,13 @@ public class ResourceResolver {
}
}
}
-
+
Object exArgs[] = { context.uriToResolve != null
? context.uriToResolve : "null", context.baseUri };
throw new ResourceResolverException("utils.resolver.noClass", exArgs, context.uriToResolve, context.baseUri);
}
-
+
/**
* Method getInstance
*
@@ -132,7 +132,7 @@ public class ResourceResolver {
) throws ResourceResolverException {
return getInstance(uri, baseURI, individualResolvers, false);
}
-
+
/**
* Method getInstance
*
@@ -149,13 +149,13 @@ public class ResourceResolver {
) throws ResourceResolverException {
if (log.isDebugEnabled()) {
log.debug(
- "I was asked to create a ResourceResolver and got "
+ "I was asked to create a ResourceResolver and got "
+ (individualResolvers == null ? 0 : individualResolvers.size())
);
}
ResourceResolverContext context = new ResourceResolverContext(uri, baseURI, secureValidation);
-
+
// first check the individual Resolvers
if (individualResolvers != null) {
for (int i = 0; i < individualResolvers.size(); i++) {
@@ -189,8 +189,8 @@ public class ResourceResolver {
public static void register(String className) {
JavaUtils.checkRegisterPermission();
try {
- Class<ResourceResolverSpi> resourceResolverClass =
- (Class<ResourceResolverSpi>)
+ Class<ResourceResolverSpi> resourceResolverClass =
+ (Class<ResourceResolverSpi>)
ClassLoaderUtils.loadClass(className, ResourceResolver.class);
register(resourceResolverClass, false);
} catch (ClassNotFoundException e) {
@@ -210,7 +210,7 @@ public class ResourceResolver {
public static void registerAtStart(String className) {
JavaUtils.checkRegisterPermission();
try {
- Class<ResourceResolverSpi> resourceResolverClass =
+ Class<ResourceResolverSpi> resourceResolverClass =
(Class<ResourceResolverSpi>)
ClassLoaderUtils.loadClass(className, ResourceResolver.class);
register(resourceResolverClass, true);
@@ -220,7 +220,7 @@ public class ResourceResolver {
}
/**
- * Registers a ResourceResolverSpi class. This method logs a warning if the class
+ * Registers a ResourceResolverSpi class. This method logs a warning if the class
* cannot be registered.
* @param className
* @param start
@@ -238,9 +238,9 @@ public class ResourceResolver {
log.warn("Error loading resolver " + className + " disabling it");
}
}
-
+
/**
- * Registers a ResourceResolverSpi instance. This method logs a warning if the class
+ * Registers a ResourceResolverSpi instance. This method logs a warning if the class
* cannot be registered.
* @param resourceResolverSpi
* @param start
@@ -252,7 +252,7 @@ public class ResourceResolver {
synchronized(resolverList) {
if (start) {
resolverList.add(0, new ResourceResolver(resourceResolverSpi));
- } else {
+ } else {
resolverList.add(new ResourceResolver(resourceResolverSpi));
}
}
@@ -260,7 +260,7 @@ public class ResourceResolver {
log.debug("Registered resolver: " + resourceResolverSpi.toString());
}
}
-
+
/**
* This method registers the default resolvers.
*/
@@ -272,7 +272,7 @@ public class ResourceResolver {
resolverList.add(new ResourceResolver(new ResolverDirectHTTP()));
}
}
-
+
/**
* Method resolve
*
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverContext.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverContext.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverContext.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverContext.java Tue Dec 15 17:13:17 2015
@@ -28,12 +28,12 @@ public class ResourceResolverContext {
this.secureValidation = secureValidation;
this.uriToResolve = attr != null ? attr.getValue() : null;
}
-
+
public final String uriToResolve;
-
+
public final boolean secureValidation;
-
+
public final String baseUri;
-
+
public final Attr attr;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java Tue Dec 15 17:13:17 2015
@@ -29,11 +29,11 @@ import org.apache.xml.security.exception
public class ResourceResolverException extends XMLSecurityException {
private static final long serialVersionUID = 1L;
-
+
private String uri = null;
-
+
private String baseURI = null;
-
+
/**
* Constructor ResourceResolverException
*
@@ -98,7 +98,7 @@ public class ResourceResolverException e
}
/**
- *
+ *
* @param uri
*/
public void setURI(String uri) {
@@ -106,7 +106,7 @@ public class ResourceResolverException e
}
/**
- *
+ *
* @return the uri
*/
public String getURI() {
@@ -114,7 +114,7 @@ public class ResourceResolverException e
}
/**
- *
+ *
* @param baseURI
*/
public void setbaseURI(String baseURI) {
@@ -122,11 +122,11 @@ public class ResourceResolverException e
}
/**
- *
+ *
* @return the baseURI
*/
public String getbaseURI() {
return this.baseURI;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Tue Dec 15 17:13:17 2015
@@ -39,9 +39,9 @@ public abstract class ResourceResolverSp
/**
* This is the workhorse method used to resolve resources.
* @param context Context to use to resolve resources.
- *
+ *
* @return the resource wrapped around a XMLSignatureInput
- *
+ *
* @throws ResourceResolverException
*/
public abstract XMLSignatureInput engineResolveURI(ResourceResolverContext context)
@@ -74,7 +74,7 @@ public abstract class ResourceResolverSp
}
/**
- *
+ *
* @param newProperties
*/
public void engineAddProperies(Map<String, String> newProperties) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java Tue Dec 15 17:13:17 2015
@@ -64,7 +64,7 @@ public class ResolverAnonymous extends R
return input;
}
- /**
+ /**
* @inheritDoc
*/
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Tue Dec 15 17:13:17 2015
@@ -61,10 +61,10 @@ public class ResolverDirectHTTP extends
org.slf4j.LoggerFactory.getLogger(ResolverDirectHTTP.class);
/** Field properties[] */
- private static final String properties[] = {
+ private static final String properties[] = {
"http.proxy.host", "http.proxy.port",
"http.proxy.username", "http.proxy.password",
- "http.basic.username", "http.basic.password"
+ "http.basic.username", "http.basic.password"
};
/** Field HttpProxyHost */
@@ -89,7 +89,7 @@ public class ResolverDirectHTTP extends
public boolean engineIsThreadSafe() {
return true;
}
-
+
/**
* @inheritDoc
*/
@@ -246,7 +246,7 @@ public class ResolverDirectHTTP extends
}
/**
- * @inheritDoc
+ * @inheritDoc
*/
public String[] engineGetPropertyKeys() {
return ResolverDirectHTTP.properties.clone();
@@ -259,14 +259,14 @@ public class ResolverDirectHTTP extends
} else {
newUri = new URI(baseURI).resolve(uri);
}
-
+
// if the URI contains a fragment, ignore it
if (newUri.getFragment() != null) {
- URI uriNewNoFrag =
+ URI uriNewNoFrag =
new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
return uriNewNoFrag;
}
return newUri;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java Tue Dec 15 17:13:17 2015
@@ -39,17 +39,17 @@ public class ResolverFragment extends Re
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverFragment.class);
-
+
@Override
public boolean engineIsThreadSafe() {
return true;
}
-
+
/**
* @inheritDoc
*/
@Override
- public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
+ public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
throws ResourceResolverException {
Document doc = context.attr.getOwnerElement().getOwnerDocument();
@@ -104,9 +104,9 @@ public class ResolverFragment extends Re
result.setMIMEType("text/xml");
if (context.baseUri != null && context.baseUri.length() > 0) {
- result.setSourceURI(context.baseUri.concat(context.uriToResolve));
+ result.setSourceURI(context.baseUri.concat(context.uriToResolve));
} else {
- result.setSourceURI(context.uriToResolve);
+ result.setSourceURI(context.uriToResolve);
}
return result;
}
@@ -123,8 +123,8 @@ public class ResolverFragment extends Re
}
return false;
}
-
- if (context.uriToResolve.equals("") ||
+
+ if (context.uriToResolve.equals("") ||
context.uriToResolve.charAt(0) == '#' && !context.uriToResolve.startsWith("#xpointer(")
) {
if (log.isDebugEnabled()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java Tue Dec 15 17:13:17 2015
@@ -31,12 +31,12 @@ import org.apache.xml.security.utils.res
* A simple ResourceResolver for requests into the local filesystem.
*/
public class ResolverLocalFilesystem extends ResourceResolverSpi {
-
+
private static final int FILE_URI_LENGTH = "file:/".length();
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverLocalFilesystem.class);
-
+
@Override
public boolean engineIsThreadSafe() {
return true;
@@ -145,10 +145,10 @@ public class ResolverLocalFilesystem ext
} else {
newUri = new URI(baseURI).resolve(uri);
}
-
+
// if the URI contains a fragment, ignore it
if (newUri.getFragment() != null) {
- URI uriNewNoFrag =
+ URI uriNewNoFrag =
new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
return uriNewNoFrag;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java Tue Dec 15 17:13:17 2015
@@ -46,7 +46,7 @@ public class ResolverXPointer extends Re
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverXPointer.class);
-
+
private static final String XP = "#xpointer(id(";
private static final int XP_LENGTH = XP.length();
@@ -54,7 +54,7 @@ public class ResolverXPointer extends Re
public boolean engineIsThreadSafe() {
return true;
}
-
+
/**
* @inheritDoc
*/
@@ -70,7 +70,7 @@ public class ResolverXPointer extends Re
} else if (isXPointerId(context.uriToResolve)) {
String id = getXPointerId(context.uriToResolve);
resultNode = doc.getElementById(id);
-
+
if (context.secureValidation) {
Element start = context.attr.getOwnerDocument().getDocumentElement();
if (!XMLUtils.protectAgainstWrappingAttack(start, id)) {
@@ -95,9 +95,9 @@ public class ResolverXPointer extends Re
result.setMIMEType("text/xml");
if (context.baseUri != null && context.baseUri.length() > 0) {
- result.setSourceURI(context.baseUri.concat(context.uriToResolve));
+ result.setSourceURI(context.baseUri.concat(context.uriToResolve));
} else {
- result.setSourceURI(context.uriToResolve);
+ result.setSourceURI(context.uriToResolve);
}
return result;
@@ -142,7 +142,7 @@ public class ResolverXPointer extends Re
String idPlusDelim = uri.substring(XP_LENGTH, uri.length() - 2);
int idLen = idPlusDelim.length() -1;
- if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
+ if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
|| idPlusDelim.charAt(0) == '\'' && idPlusDelim.charAt(idLen) == '\'') {
if (log.isDebugEnabled()) {
log.debug("Id = " + idPlusDelim.substring(1, idLen));
@@ -163,9 +163,9 @@ public class ResolverXPointer extends Re
private static String getXPointerId(String uri) {
if (uri.startsWith(XP) && uri.endsWith("))")) {
String idPlusDelim = uri.substring(XP_LENGTH,uri.length() - 2);
-
+
int idLen = idPlusDelim.length() -1;
- if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
+ if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
|| idPlusDelim.charAt(0) == '\'' && idPlusDelim.charAt(idLen) == '\'') {
return idPlusDelim.substring(1, idLen);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java Tue Dec 15 17:13:17 2015
@@ -39,12 +39,12 @@ public class KeySelectorExceptionTest ex
KeySelectorException kse = new KeySelectorException();
assertNull(kse.getMessage());
assertNull(kse.getCause());
-
+
// test KeySelectorException(String)
kse = new KeySelectorException("test");
assertEquals("test", kse.getMessage());
assertNull(kse.getCause());
-
+
// test KeySelectorException(String, Throwable)
IllegalArgumentException iae = new IllegalArgumentException("iae");
kse = new KeySelectorException("random", iae);
@@ -56,7 +56,7 @@ public class KeySelectorExceptionTest ex
assertEquals(iae.toString(), kse.getMessage());
assertTrue(compareThrowable(iae, kse.getCause()));
}
-
+
private static boolean compareThrowable(Throwable t1, Throwable t2) {
boolean result = false;
// first compare their toString presentation
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java Tue Dec 15 17:13:17 2015
@@ -39,14 +39,14 @@ public class KeySelectorTest extends org
private class MyOwnKey implements Key {
private static final long serialVersionUID = -3288147894137347920L;
-
+
private String algo;
private byte[] val;
MyOwnKey(String algorithm, byte[] value) {
algo = algorithm;
val = value.clone();
}
-
+
public String getAlgorithm() {
return algo;
}
@@ -74,9 +74,9 @@ public class KeySelectorTest extends org
// X509IssuerSerial objects, etc?
XMLSignatureFactory dsigFac = XMLSignatureFactory.getInstance
("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
- SignatureMethod sm1 =
+ SignatureMethod sm1 =
dsigFac.newSignatureMethod(SignatureMethod.DSA_SHA1, null);
- SignatureMethod sm2 =
+ SignatureMethod sm2 =
dsigFac.newSignatureMethod(SignatureMethod.RSA_SHA1, null);
assertTrue(compareKey(key, selector1.select
@@ -84,7 +84,7 @@ public class KeySelectorTest extends org
assertTrue(compareKey(key, selector1.select
(info, KeySelector.Purpose.VERIFY, sm2, null).getKey()));
}
-
+
private static boolean compareKey(Object answer, Key key) {
boolean result = false;
if (answer instanceof MyOwnKey) {