Attachment #21336 for bug #40897

View | Details | Raw Unified | Return to bug 40897
Collapse All | Expand All

Lines 71-77 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/algorithms/Algorithm.java (-1 / +1 lines)
71	*/	71	*/
72	protected void setAlgorithmURI(String algorithmURI) {	72	protected void setAlgorithmURI(String algorithmURI) {
73		73
74	if ((this._state == MODE_CREATE) && (algorithmURI != null)) {	74	if ( (algorithmURI != null)) {
75	this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,	75	this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
76	algorithmURI);	76	algorithmURI);
77	}	77	}

Lines 3722-3729 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/encryption/XMLCipher.java (-2 / +1 lines)
3722	}	3722	}
3723		3723
3724	this._doc = doc;	3724	this._doc = doc;
3725	this._state = ElementProxy.MODE_CREATE;	3725	this._constructionElement = createElementForFamilyLocal(this._doc,
3726	this._constructionElement = createElementForFamilyLocal(this._doc,
3727	this.getBaseNamespace(), this.getBaseLocalName());	3726	this.getBaseNamespace(), this.getBaseLocalName());
3728	}	3727	}
3729	/**	3728	/**




           throws XMLSecurityException {

      super(element, BaseURI);
      
      boolean noElements=true;
      Node sibling=this._constructionElement.getFirstChild();
      while (sibling!=null) {
      	 if (sibling.getNodeType()!=Node.ELEMENT_NODE) {

      	 	sibling=sibling.getNextSibling();
            continue;
         }
      	 return;
         Element currentElem = (Element) sibling;
         sibling=sibling.getNextSibling();
         String localname = currentElem.getLocalName();

         if (currentElem.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
            if (localname.equals(Constants._TAG_X509ISSUERSERIAL)) {
               XMLX509IssuerSerial is = new XMLX509IssuerSerial(currentElem,
                                           BaseURI);

               this.add(is);
            } else if (localname.equals(Constants._TAG_X509SKI)) {
               XMLX509SKI ski = new XMLX509SKI(currentElem, BaseURI);

               this.add(ski);
            } else if (localname.equals(Constants._TAG_X509SUBJECTNAME)) {
               XMLX509SubjectName sn = new XMLX509SubjectName(currentElem,
                                          BaseURI);

               this.add(sn);
            } else if (localname.equals(Constants._TAG_X509CERTIFICATE)) {
               XMLX509Certificate cert = new XMLX509Certificate(currentElem,
                                            BaseURI);

               this.add(cert);
            } else if (localname.equals(Constants._TAG_X509CRL)) {
               XMLX509CRL crl = new XMLX509CRL(currentElem, BaseURI);

               this.add(crl);
            } else {
               log.warn("Found a " + currentElem.getTagName() + " element in "
                        + Constants._TAG_X509DATA);
               this.addUnknownElement(currentElem);
            }
         } else {
            log.warn("Found a " + currentElem.getTagName() + " element in "
                     + Constants._TAG_X509DATA);
            this.addUnknownElement(currentElem);
         }
      }
      /* No Elements found */
      Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
      throw new XMLSecurityException("xml.WrongContent", exArgs);
        throw new XMLSecurityException("xml.WrongContent", exArgs);
     }

   }

   /**

    */
   public void add(XMLX509IssuerSerial xmlX509IssuerSerial) {

      if (this._state == MODE_SIGN) {
         this._constructionElement
            .appendChild(xmlX509IssuerSerial.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param xmlX509SKI
    */
   public void add(XMLX509SKI xmlX509SKI) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(xmlX509SKI.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param xmlX509SubjectName
    */
   public void add(XMLX509SubjectName xmlX509SubjectName) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(xmlX509SubjectName.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param xmlX509Certificate
    */
   public void add(XMLX509Certificate xmlX509Certificate) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(xmlX509Certificate.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param xmlX509CRL
    */
   public void add(XMLX509CRL xmlX509CRL) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(xmlX509CRL.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param element
    */
   public void addUnknownElement(Element element) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(element);
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**




    */
   public void setId(String Id) {

      if ((Id != null)) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
         IdResolver.registerElementById(this._constructionElement, Id);
      }

    */
   public void add(KeyName keyname) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(keyname.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param keyvalue
    */
   public void add(KeyValue keyvalue) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(keyvalue.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param mgmtdata
    */
   public void add(MgmtData mgmtdata) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(mgmtdata.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param pgpdata
    */
   public void add(PGPData pgpdata) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(pgpdata.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param retrievalmethod
    */
   public void add(RetrievalMethod retrievalmethod) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(retrievalmethod.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param spkidata
    */
   public void add(SPKIData spkidata) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(spkidata.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

    * @param x509data
    */
   public void add(X509Data x509data) {

      if (this._state == MODE_SIGN) {
    	  if (x509Datas==null)
    		  x509Datas=new ArrayList();
    	  x509Datas.add(x509data);

    	  x509Datas.add(x509data);
         this._constructionElement.appendChild(x509data.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

	/**


	public void add(EncryptedKey encryptedKey) 
		throws XMLEncryptionException {

		if (this._state == MODE_SIGN) {
			if (encryptedKeys==null)
				encryptedKeys=new ArrayList();
			encryptedKeys.add(encryptedKey);

			encryptedKeys.add(encryptedKey);
			XMLCipher cipher = XMLCipher.getInstance();
			this._constructionElement.appendChild(cipher.martial(encryptedKey));
		}

	}

   /**

    * @param element
    */
   public void addUnknownElement(Element element) {

      if (this._state == MODE_SIGN) {
         this._constructionElement.appendChild(element);
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**




           String BaseURI, String referenceURI, Transforms transforms, String digestURI, String ReferenceId, String ReferenceType)
              throws XMLSignatureException {

      if (this._state == MODE_SIGN) {

         // the this._doc is handed implicitly by the this.getOwnerDocument()
         Reference ref = new Reference(this._doc, BaseURI, referenceURI, this,
                                       transforms, digestURI);

         // add the Element of the Reference object to the Manifest/SignedInfo
         this._constructionElement.appendChild(ref.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      }
   }

   /**

   public void generateDigestValues()
           throws XMLSignatureException, ReferenceNotInitializedException {

      if (this._state == MODE_SIGN) {
         for (int i = 0; i < this.getLength(); i++) {

            // update the cached Reference object, the Element content is automatically updated


            currentRef.generateDigestValue();
         }
      }
   }

   /**

    */
   public Reference item(int i) throws XMLSecurityException {

      if (this._state == MODE_SIGN) {

         // we already have real objects
         return (Reference) this._references.get(i);
      } 
         if (this._references.get(i) == null) {

            // not yet constructed, so _we_ have to            

    */
   public void setId(String Id) {

      if (Id != null) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
         IdResolver.registerElementById(this._constructionElement, Id);
      }




    */
   public void setId(String Id) {

      if ((Id != null)) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
         IdResolver.registerElementById(this._constructionElement, Id);
      }

    */
   public void setMimeType(String MimeType) {

      if ( (MimeType != null)) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,
                                                MimeType);
      }

    */
   public void setEncoding(String Encoding) {

      if ((Encoding != null)) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,
                                                Encoding);
      }


      Node result = null;

      result = this._constructionElement.appendChild(node);
         result = this._constructionElement.appendChild(node);
      }

      return result;
   }




    */
   public void setURI(String URI) {

      if ( URI != null) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_URI,
                                                  URI);
      }

    */
   public void setId(String Id) {

      if ( Id != null ) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
         IdResolver.registerElementById(this._constructionElement, Id);
      }

    */
   public void setType(String Type) {

      if (Type != null) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE,
                                                  Type);
      }

    */
   private void setDigestValueElement(byte[] digestValue)
   {

      if (this._state == MODE_SIGN) {

         Node n=digestValueElement.getFirstChild();
         while (n!=null) {
               digestValueElement.removeChild(n);

         Text t = this._doc.createTextNode(base64codedValue);

         digestValueElement.appendChild(t);
      }
   }

   /**

    */
   public void generateDigestValue()
           throws XMLSignatureException, ReferenceNotInitializedException {
      this.setDigestValueElement(this.calculateDigest());
      if (this._state == MODE_SIGN) {

         this.setDigestValueElement(this.calculateDigest());
      }
   }

   /**

Lines 105-111 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/signature/SignatureProperties.java (-1 / +1 lines)
105	*/	105	*/
106	public void setId(String Id) {	106	public void setId(String Id) {
107		107
108	if ((this._state == MODE_SIGN) && (Id != null)) {	108	if ((Id != null)) {
109	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	109	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
110	IdResolver.registerElementById(this._constructionElement, Id);	110	IdResolver.registerElementById(this._constructionElement, Id);
111	}	111	}

Lines 76-82 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/signature/SignatureProperty.java (-2 / +2 lines)
76	*/	76	*/
77	public void setId(String Id) {	77	public void setId(String Id) {
78		78
79	if ((this._state == MODE_SIGN) && (Id != null)) {	79	if ((Id != null)) {
80	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	80	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
81	IdResolver.registerElementById(this._constructionElement, Id);	81	IdResolver.registerElementById(this._constructionElement, Id);
82	}	82	}
Lines 98-104 Link Here
98	*/	98	*/
99	public void setTarget(String Target) {	99	public void setTarget(String Target) {
100		100
101	if ((this._state == MODE_SIGN) && (Target != null)) {	101	if ((Target != null)) {
102	this._constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);	102	this._constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);
103	}	103	}
104	}	104	}




    */
   public void setId(String Id) {

      if ( (Id != null)) {
         this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
         IdResolver.registerElementById(this._constructionElement, Id);
      }

   private void setSignatureValueElement(byte[] bytes)
   {

      if (this._state == MODE_SIGN) {
    	 while (signatureValueElement.hasChildNodes()) {
        	 signatureValueElement.removeChild(signatureValueElement.getFirstChild());
         }

         if (base64codedValue.length() > 76) {
	    XMLUtils.addReturnToElement(signatureValueElement);
         }
      }
   }

   /**

   public KeyInfo getKeyInfo() {

      // check to see if we are signing and if we have to create a keyinfo
      if ( (this._keyInfo == null)) {

         // create the KeyInfo
         this._keyInfo = new KeyInfo(this._doc);

   public void appendObject(ObjectContainer object)
           throws XMLSignatureException {

      //try {
         //if (this._state != MODE_SIGN) {
           // throw new XMLSignatureException(
             //  "signature.operationOnlyBeforeSign");
         //}

         this._constructionElement.appendChild(object.getElement());
         XMLUtils.addReturnToElement(this._constructionElement);
      //} catch (XMLSecurityException ex) {
        // throw new XMLSignatureException("empty", ex);
      //}
   }

   /**

      }

      try {
        // if (this._state == MODE_SIGN) {
            //Create a SignatureAlgorithm object
        	SignedInfo si = this.getSignedInfo();
            SignatureAlgorithm sa = si.getSignatureAlgorithm();               


            // set them on the SignateValue element
            this.setSignatureValueElement(jcebytes);
         //}
      } catch (CanonicalizationException ex) {
         throw new XMLSignatureException("empty", ex);
      } catch (InvalidCanonicalizerException ex) {




package org.apache.xml.security.utils;

import org.apache.xml.security.exceptions.XMLSecurityException;
import org.w3c.dom.Element;

public interface ElementChecker {
	 /**
	  * Check that the elemnt is the one expect
	  *
	  * @throws XMLSecurityException
	  */
	   void guaranteeThatElementInCorrectSpace(ElementProxy expected, Element actual)
	           throws XMLSecurityException;
}




package org.apache.xml.security.utils;

import org.apache.xml.security.exceptions.XMLSecurityException;
import org.w3c.dom.Element;

public class ElementCheckerImpl {
	/** A checker for DOM that interns NS */
	public static class InternedNsChecker implements ElementChecker {
		public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
				Element actual) throws XMLSecurityException {

		      String localnameSHOULDBE = expected.getBaseLocalName();
		      String namespaceSHOULDBE = expected.getBaseNamespace();
		      
		      String localnameIS = actual.getLocalName();
		      String namespaceIS = actual.getNamespaceURI();
		      if ((namespaceSHOULDBE!=namespaceIS) ||
		       !localnameSHOULDBE.equals(localnameIS) ) {      
		         Object exArgs[] = { namespaceIS +":"+ localnameIS, 
		           namespaceSHOULDBE +":"+ localnameSHOULDBE};
		         throw new XMLSecurityException("xml.WrongElement", exArgs);
		      }			
		}		
	}
	
	/** A checker for DOM that interns NS */
	public static class FullChecker implements ElementChecker {
		public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
				Element actual) throws XMLSecurityException {

		      String localnameSHOULDBE = expected.getBaseLocalName();
		      String namespaceSHOULDBE = expected.getBaseNamespace();
		      
		      String localnameIS = actual.getLocalName();
		      String namespaceIS = actual.getNamespaceURI();
		      if ((!namespaceSHOULDBE.equals(namespaceIS)) ||
		       !localnameSHOULDBE.equals(localnameIS) ) {      
		         Object exArgs[] = { namespaceIS +":"+ localnameIS, 
		           namespaceSHOULDBE +":"+ localnameSHOULDBE};
		         throw new XMLSecurityException("xml.WrongElement", exArgs);
		      }			
		}		
	}
	
	/** An empty checker if schema checking is used */
	public static class EmptyChecker implements ElementChecker {
		public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
				Element actual) throws XMLSecurityException {
		}		
	}
}




   /** {@link org.apache.commons.logging} logging facility */
    static org.apache.commons.logging.Log log = 
        org.apache.commons.logging.LogFactory.getLog(ElementProxy.class.getName());
   
    /** The element has been created by the code **/
   public static final int MODE_CREATE  = 0;
   /** The element has been readed from a DOM tree by the code **/
   public static final int MODE_PROCESS = 1;
   /** The element isn't known if it is readen or created **/
   public static final int MODE_UNKNOWN = 2;

   /** The element is going to be signed **/
   public static final int MODE_SIGN    = MODE_CREATE;
   /** The element is going to be verified **/
   public static final int MODE_VERIFY  = MODE_PROCESS;

   /** The element is going to be encrypted **/
   public static final int MODE_ENCRYPT = MODE_CREATE;
   /** The element is going to be decrypted **/
   public static final int MODE_DECRYPT = MODE_PROCESS;

   protected int _state = MODE_UNKNOWN;
   //J+

   /**
    * Returns the namespace of the Elements of the sub-class.
    *

      }

      this._doc = doc;
      this._state = ElementProxy.MODE_CREATE;
      this._constructionElement = createElementForFamilyLocal(this._doc,
    		  this.getBaseNamespace(), this.getBaseLocalName());      
   }       

      }
        
      this._doc = element.getOwnerDocument();
      this._state = ElementProxy.MODE_PROCESS;
      this._constructionElement = element;
      this._baseURI = BaseURI;
   }

      }

      this._doc = element.getOwnerDocument();
      this._state = ElementProxy.MODE_PROCESS;
      this._constructionElement = element;
      this._baseURI = BaseURI;


   public String getBaseURI() {
      return this._baseURI;
   }
   
   static ElementChecker checker = new ElementCheckerImpl.InternedNsChecker();

   /**
    * Method guaranteeThatElementInCorrectSpace

    *
    * @throws XMLSecurityException
    */
   void guaranteeThatElementInCorrectSpace()
           throws XMLSecurityException {
	  
	  checker.guaranteeThatElementInCorrectSpace(this,this._constructionElement);
      String namespaceSHOULDBE = this.getBaseNamespace();
      
      String localnameIS = this._constructionElement.getLocalName();
      String namespaceIS = this._constructionElement.getNamespaceURI();
      if ((namespaceSHOULDBE!=namespaceIS) ||
       !localnameSHOULDBE.equals(localnameIS) ) {      
         Object exArgs[] = { namespaceIS +":"+ localnameIS, 
           namespaceSHOULDBE +":"+ localnameSHOULDBE};
         throw new XMLSecurityException("xml.WrongElement", exArgs);
      }
   }

   /**




	      }

	      this._doc = doc;
	      this._state = ElementProxy.MODE_CREATE;
	      this._constructionElement =  XMLUtils.createElementInSignatureSpace(this._doc,
	    		   this.getBaseLocalName());
      //super(doc);
      //this._constructionElement.setAttributeNS(Constants.NamespaceSpecNS,"xmlns:ds",
        //          Constants.SignatureSpecNS);
   }

   /**

Return to bug 40897

Lines 131-137 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/keys/KeyInfo.java (-28 / +1 lines)
131	*/	131	*/
132	public void setId(String Id) {	132	public void setId(String Id) {
133		133
134	if ((this._state == MODE_SIGN) && (Id != null)) {	134	if ((Id != null)) {
135	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	135	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
136	IdResolver.registerElementById(this._constructionElement, Id);	136	IdResolver.registerElementById(this._constructionElement, Id);
137	}	137	}
Lines 162-171 Link Here
162	*/	162	*/
163	public void add(KeyName keyname) {	163	public void add(KeyName keyname) {
164		164
165	if (this._state == MODE_SIGN) {
166	this._constructionElement.appendChild(keyname.getElement());	165	this._constructionElement.appendChild(keyname.getElement());
167	XMLUtils.addReturnToElement(this._constructionElement);	166	XMLUtils.addReturnToElement(this._constructionElement);
168	}
169	}	167	}
170		168
171	/**	169	/**
Lines 219-229 Link Here
219	* @param keyvalue	217	* @param keyvalue
220	*/	218	*/
221	public void add(KeyValue keyvalue) {	219	public void add(KeyValue keyvalue) {
222
223	if (this._state == MODE_SIGN) {
224	this._constructionElement.appendChild(keyvalue.getElement());	220	this._constructionElement.appendChild(keyvalue.getElement());
225	XMLUtils.addReturnToElement(this._constructionElement);	221	XMLUtils.addReturnToElement(this._constructionElement);
226	}
227	}	222	}
228		223
229	/**	224	/**
Lines 241-251 Link Here
241	* @param mgmtdata	236	* @param mgmtdata
242	*/	237	*/
243	public void add(MgmtData mgmtdata) {	238	public void add(MgmtData mgmtdata) {
244
245	if (this._state == MODE_SIGN) {
246	this._constructionElement.appendChild(mgmtdata.getElement());	239	this._constructionElement.appendChild(mgmtdata.getElement());
247	XMLUtils.addReturnToElement(this._constructionElement);	240	XMLUtils.addReturnToElement(this._constructionElement);
248	}
249	}	241	}
250		242
251	/**	243	/**
Lines 254-264 Link Here
254	* @param pgpdata	246	* @param pgpdata
255	*/	247	*/
256	public void add(PGPData pgpdata) {	248	public void add(PGPData pgpdata) {
257
258	if (this._state == MODE_SIGN) {
259	this._constructionElement.appendChild(pgpdata.getElement());	249	this._constructionElement.appendChild(pgpdata.getElement());
260	XMLUtils.addReturnToElement(this._constructionElement);	250	XMLUtils.addReturnToElement(this._constructionElement);
261	}
262	}	251	}
263		252
264	/**	253	/**
Lines 279-289 Link Here
279	* @param retrievalmethod	268	* @param retrievalmethod
280	*/	269	*/
281	public void add(RetrievalMethod retrievalmethod) {	270	public void add(RetrievalMethod retrievalmethod) {
282
283	if (this._state == MODE_SIGN) {
284	this._constructionElement.appendChild(retrievalmethod.getElement());	271	this._constructionElement.appendChild(retrievalmethod.getElement());
285	XMLUtils.addReturnToElement(this._constructionElement);	272	XMLUtils.addReturnToElement(this._constructionElement);
286	}
287	}	273	}
288		274
289	/**	275	/**
Lines 292-302 Link Here
292	* @param spkidata	278	* @param spkidata
293	*/	279	*/
294	public void add(SPKIData spkidata) {	280	public void add(SPKIData spkidata) {
295
296	if (this._state == MODE_SIGN) {
297	this._constructionElement.appendChild(spkidata.getElement());	281	this._constructionElement.appendChild(spkidata.getElement());
298	XMLUtils.addReturnToElement(this._constructionElement);	282	XMLUtils.addReturnToElement(this._constructionElement);
299	}
300	}	283	}
301		284
302	/**	285	/**
Lines 305-312 Link Here
305	* @param x509data	288	* @param x509data
306	*/	289	*/
307	public void add(X509Data x509data) {	290	public void add(X509Data x509data) {
308
309	if (this._state == MODE_SIGN) {
310	if (x509Datas==null)	291	if (x509Datas==null)
311	x509Datas=new ArrayList();	292	x509Datas=new ArrayList();
312	x509Datas.add(x509data);	293	x509Datas.add(x509data);
Lines 312-318 Link Here
312	x509Datas.add(x509data);	293	x509Datas.add(x509data);
313	this._constructionElement.appendChild(x509data.getElement());	294	this._constructionElement.appendChild(x509data.getElement());
314	XMLUtils.addReturnToElement(this._constructionElement);	295	XMLUtils.addReturnToElement(this._constructionElement);
315	}
316	}	296	}
317		297
318	/**	298	/**
Lines 324-331 Link Here
324		304
325	public void add(EncryptedKey encryptedKey)	305	public void add(EncryptedKey encryptedKey)
326	throws XMLEncryptionException {	306	throws XMLEncryptionException {
327
328	if (this._state == MODE_SIGN) {
329	if (encryptedKeys==null)	307	if (encryptedKeys==null)
330	encryptedKeys=new ArrayList();	308	encryptedKeys=new ArrayList();
331	encryptedKeys.add(encryptedKey);	309	encryptedKeys.add(encryptedKey);
Lines 331-338 Link Here
331	encryptedKeys.add(encryptedKey);	309	encryptedKeys.add(encryptedKey);
332	XMLCipher cipher = XMLCipher.getInstance();	310	XMLCipher cipher = XMLCipher.getInstance();
333	this._constructionElement.appendChild(cipher.martial(encryptedKey));	311	this._constructionElement.appendChild(cipher.martial(encryptedKey));
334	}
335
336	}	312	}
337		313
338	/**	314	/**
Lines 341-351 Link Here
341	* @param element	317	* @param element
342	*/	318	*/
343	public void addUnknownElement(Element element) {	319	public void addUnknownElement(Element element) {
344
345	if (this._state == MODE_SIGN) {
346	this._constructionElement.appendChild(element);	320	this._constructionElement.appendChild(element);
347	XMLUtils.addReturnToElement(this._constructionElement);	321	XMLUtils.addReturnToElement(this._constructionElement);
348	}
349	}	322	}
350		323
351	/**	324	/**

Lines 137-144 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/signature/Manifest.java (-11 / +1 lines)
137	String BaseURI, String referenceURI, Transforms transforms, String digestURI, String ReferenceId, String ReferenceType)	137	String BaseURI, String referenceURI, Transforms transforms, String digestURI, String ReferenceId, String ReferenceType)
138	throws XMLSignatureException {	138	throws XMLSignatureException {
139		139
140	if (this._state == MODE_SIGN) {
141
142	// the this._doc is handed implicitly by the this.getOwnerDocument()	140	// the this._doc is handed implicitly by the this.getOwnerDocument()
143	Reference ref = new Reference(this._doc, BaseURI, referenceURI, this,	141	Reference ref = new Reference(this._doc, BaseURI, referenceURI, this,
144	transforms, digestURI);	142	transforms, digestURI);
Lines 157-163 Link Here
157	// add the Element of the Reference object to the Manifest/SignedInfo	155	// add the Element of the Reference object to the Manifest/SignedInfo
158	this._constructionElement.appendChild(ref.getElement());	156	this._constructionElement.appendChild(ref.getElement());
159	XMLUtils.addReturnToElement(this._constructionElement);	157	XMLUtils.addReturnToElement(this._constructionElement);
160	}
161	}	158	}
162		159
163	/**	160	/**
Lines 171-177 Link Here
171	public void generateDigestValues()	168	public void generateDigestValues()
172	throws XMLSignatureException, ReferenceNotInitializedException {	169	throws XMLSignatureException, ReferenceNotInitializedException {
173		170
174	if (this._state == MODE_SIGN) {
175	for (int i = 0; i < this.getLength(); i++) {	171	for (int i = 0; i < this.getLength(); i++) {
176		172
177	// update the cached Reference object, the Element content is automatically updated	173	// update the cached Reference object, the Element content is automatically updated
Lines 179-185 Link Here
179		175
180	currentRef.generateDigestValue();	176	currentRef.generateDigestValue();
181	}	177	}
182	}
183	}	178	}
184		179
185	/**	180	/**
Lines 201-211 Link Here
201	*/	196	*/
202	public Reference item(int i) throws XMLSecurityException {	197	public Reference item(int i) throws XMLSecurityException {
203		198
204	if (this._state == MODE_SIGN) {
205
206	// we already have real objects
207	return (Reference) this._references.get(i);
208	}
209	if (this._references.get(i) == null) {	199	if (this._references.get(i) == null) {
210		200
211	// not yet constructed, so _we_ have to	201	// not yet constructed, so _we_ have to
Lines 225-231 Link Here
225	*/	215	*/
226	public void setId(String Id) {	216	public void setId(String Id) {
227		217
228	if ((this._state == MODE_SIGN) && (Id != null)) {	218	if (Id != null) {
229	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	219	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
230	IdResolver.registerElementById(this._constructionElement, Id);	220	IdResolver.registerElementById(this._constructionElement, Id);
231	}	221	}

Lines 64-70 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/signature/ObjectContainer.java (-6 / +4 lines)
64	*/	64	*/
65	public void setId(String Id) {	65	public void setId(String Id) {
66		66
67	if ((this._state == MODE_SIGN) && (Id != null)) {	67	if ((Id != null)) {
68	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	68	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
69	IdResolver.registerElementById(this._constructionElement, Id);	69	IdResolver.registerElementById(this._constructionElement, Id);
70	}	70	}
Lines 86-92 Link Here
86	*/	86	*/
87	public void setMimeType(String MimeType) {	87	public void setMimeType(String MimeType) {
88		88
89	if ((this._state == MODE_SIGN) && (MimeType != null)) {	89	if ( (MimeType != null)) {
90	this._constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,	90	this._constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,
91	MimeType);	91	MimeType);
92	}	92	}
Lines 108-114 Link Here
108	*/	108	*/
109	public void setEncoding(String Encoding) {	109	public void setEncoding(String Encoding) {
110		110
111	if ((this._state == MODE_SIGN) && (Encoding != null)) {	111	if ((Encoding != null)) {
112	this._constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,	112	this._constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,
113	Encoding);	113	Encoding);
114	}	114	}
Lines 133-141 Link Here
133		133
134	Node result = null;	134	Node result = null;
135		135
136	if (this._state == MODE_SIGN) {	136	result = this._constructionElement.appendChild(node);
137	result = this._constructionElement.appendChild(node);
138	}
139		137
140	return result;	138	return result;
141	}	139	}

Lines 233-239 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/signature/Reference.java (-12 / +4 lines)
233	*/	233	*/
234	public void setURI(String URI) {	234	public void setURI(String URI) {
235		235
236	if ((this._state == MODE_SIGN) && (URI != null)) {	236	if ( URI != null) {
237	this._constructionElement.setAttributeNS(null, Constants._ATT_URI,	237	this._constructionElement.setAttributeNS(null, Constants._ATT_URI,
238	URI);	238	URI);
239	}	239	}
Lines 255-261 Link Here
255	*/	255	*/
256	public void setId(String Id) {	256	public void setId(String Id) {
257		257
258	if ((this._state == MODE_SIGN) && (Id != null)) {	258	if ( Id != null ) {
259	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);	259	this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
260	IdResolver.registerElementById(this._constructionElement, Id);	260	IdResolver.registerElementById(this._constructionElement, Id);
261	}	261	}
Lines 277-283 Link Here
277	*/	277	*/
278	public void setType(String Type) {	278	public void setType(String Type) {
279		279
280	if ((this._state == MODE_SIGN) && (Type != null)) {	280	if (Type != null) {
281	this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE,	281	this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE,
282	Type);	282	Type);
283	}	283	}
Lines 334-342 Link Here
334	*/	334	*/
335	private void setDigestValueElement(byte[] digestValue)	335	private void setDigestValueElement(byte[] digestValue)
336	{	336	{
337
338	if (this._state == MODE_SIGN) {
339
340	Node n=digestValueElement.getFirstChild();	337	Node n=digestValueElement.getFirstChild();
341	while (n!=null) {	338	while (n!=null) {
342	digestValueElement.removeChild(n);	339	digestValueElement.removeChild(n);
Lines 347-353 Link Here
347	Text t = this._doc.createTextNode(base64codedValue);	344	Text t = this._doc.createTextNode(base64codedValue);
348		345
349	digestValueElement.appendChild(t);	346	digestValueElement.appendChild(t);
350	}
351	}	347	}
352		348
353	/**	349	/**
Lines 358-368 Link Here
358	*/	354	*/
359	public void generateDigestValue()	355	public void generateDigestValue()
360	throws XMLSignatureException, ReferenceNotInitializedException {	356	throws XMLSignatureException, ReferenceNotInitializedException {
361		357	this.setDigestValueElement(this.calculateDigest());
362	if (this._state == MODE_SIGN) {
363
364	this.setDigestValueElement(this.calculateDigest());
365	}
366	}	358	}
367		359
368	/**	360	/**

Lines 68-75 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/keys/content/X509Data.java (-64 / +4 lines)
68	throws XMLSecurityException {	68	throws XMLSecurityException {
69		69
70	super(element, BaseURI);	70	super(element, BaseURI);
71
72	boolean noElements=true;
73	Node sibling=this._constructionElement.getFirstChild();	71	Node sibling=this._constructionElement.getFirstChild();
74	while (sibling!=null) {	72	while (sibling!=null) {
75	if (sibling.getNodeType()!=Node.ELEMENT_NODE) {	73	if (sibling.getNodeType()!=Node.ELEMENT_NODE) {
Lines 76-127 Link Here
76	sibling=sibling.getNextSibling();	74	sibling=sibling.getNextSibling();
77	continue;	75	continue;
78	}	76	}
79	noElements=false;	77	return;
80	Element currentElem = (Element) sibling;
81	sibling=sibling.getNextSibling();
82	String localname = currentElem.getLocalName();
83
84	if (currentElem.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
85	if (localname.equals(Constants._TAG_X509ISSUERSERIAL)) {
86	XMLX509IssuerSerial is = new XMLX509IssuerSerial(currentElem,
87	BaseURI);
88
89	this.add(is);
90	} else if (localname.equals(Constants._TAG_X509SKI)) {
91	XMLX509SKI ski = new XMLX509SKI(currentElem, BaseURI);
92
93	this.add(ski);
94	} else if (localname.equals(Constants._TAG_X509SUBJECTNAME)) {
95	XMLX509SubjectName sn = new XMLX509SubjectName(currentElem,
96	BaseURI);
97
98	this.add(sn);
99	} else if (localname.equals(Constants._TAG_X509CERTIFICATE)) {
100	XMLX509Certificate cert = new XMLX509Certificate(currentElem,
101	BaseURI);
102
103	this.add(cert);
104	} else if (localname.equals(Constants._TAG_X509CRL)) {
105	XMLX509CRL crl = new XMLX509CRL(currentElem, BaseURI);
106
107	this.add(crl);
108	} else {
109	log.warn("Found a " + currentElem.getTagName() + " element in "
110	+ Constants._TAG_X509DATA);
111	this.addUnknownElement(currentElem);
112	}
113	} else {
114	log.warn("Found a " + currentElem.getTagName() + " element in "
115	+ Constants._TAG_X509DATA);
116	this.addUnknownElement(currentElem);
117	}
118	}	78	}
119	if (noElements) {	79	/* No Elements found */
120	Object exArgs[] = { "Elements", Constants._TAG_X509DATA };	80	Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
121		81	throw new XMLSecurityException("xml.WrongContent", exArgs);
122	throw new XMLSecurityException("xml.WrongContent", exArgs);
123	}
124
125	}	82	}
126		83
127	/**	84	/**
Lines 165-175 Link Here
165	*/	122	*/
166	public void add(XMLX509IssuerSerial xmlX509IssuerSerial) {	123	public void add(XMLX509IssuerSerial xmlX509IssuerSerial) {
167		124
168	if (this._state == MODE_SIGN) {
169	this._constructionElement	125	this._constructionElement
170	.appendChild(xmlX509IssuerSerial.getElement());	126	.appendChild(xmlX509IssuerSerial.getElement());
171	XMLUtils.addReturnToElement(this._constructionElement);	127	XMLUtils.addReturnToElement(this._constructionElement);
172	}
173	}	128	}
174		129
175	/**	130	/**
Lines 198-208 Link Here
198	* @param xmlX509SKI	153	* @param xmlX509SKI
199	*/	154	*/
200	public void add(XMLX509SKI xmlX509SKI) {	155	public void add(XMLX509SKI xmlX509SKI) {
201
202	if (this._state == MODE_SIGN) {
203	this._constructionElement.appendChild(xmlX509SKI.getElement());	156	this._constructionElement.appendChild(xmlX509SKI.getElement());
204	XMLUtils.addReturnToElement(this._constructionElement);	157	XMLUtils.addReturnToElement(this._constructionElement);
205	}
206	}	158	}
207		159
208	/**	160	/**
Lines 229-239 Link Here
229	* @param xmlX509SubjectName	181	* @param xmlX509SubjectName
230	*/	182	*/
231	public void add(XMLX509SubjectName xmlX509SubjectName) {	183	public void add(XMLX509SubjectName xmlX509SubjectName) {
232
233	if (this._state == MODE_SIGN) {
234	this._constructionElement.appendChild(xmlX509SubjectName.getElement());	184	this._constructionElement.appendChild(xmlX509SubjectName.getElement());
235	XMLUtils.addReturnToElement(this._constructionElement);	185	XMLUtils.addReturnToElement(this._constructionElement);
236	}
237	}	186	}
238		187
239	/**	188	/**
Lines 262-272 Link Here
262	* @param xmlX509Certificate	211	* @param xmlX509Certificate
263	*/	212	*/
264	public void add(XMLX509Certificate xmlX509Certificate) {	213	public void add(XMLX509Certificate xmlX509Certificate) {
265
266	if (this._state == MODE_SIGN) {
267	this._constructionElement.appendChild(xmlX509Certificate.getElement());	214	this._constructionElement.appendChild(xmlX509Certificate.getElement());
268	XMLUtils.addReturnToElement(this._constructionElement);	215	XMLUtils.addReturnToElement(this._constructionElement);
269	}
270	}	216	}
271		217
272	/**	218	/**
Lines 284-294 Link Here
284	* @param xmlX509CRL	230	* @param xmlX509CRL
285	*/	231	*/
286	public void add(XMLX509CRL xmlX509CRL) {	232	public void add(XMLX509CRL xmlX509CRL) {
287
288	if (this._state == MODE_SIGN) {
289	this._constructionElement.appendChild(xmlX509CRL.getElement());	233	this._constructionElement.appendChild(xmlX509CRL.getElement());
290	XMLUtils.addReturnToElement(this._constructionElement);	234	XMLUtils.addReturnToElement(this._constructionElement);
291	}
292	}	235	}
293		236
294	/**	237	/**
Lines 297-307 Link Here
297	* @param element	240	* @param element
298	*/	241	*/
299	public void addUnknownElement(Element element) {	242	public void addUnknownElement(Element element) {
300
301	if (this._state == MODE_SIGN) {
302	this._constructionElement.appendChild(element);	243	this._constructionElement.appendChild(element);
303	XMLUtils.addReturnToElement(this._constructionElement);	244	XMLUtils.addReturnToElement(this._constructionElement);
304	}
305	}	245	}
306		246
307	/**	247	/**

Line 0 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/utils/ElementChecker.java (+14 lines)
	1	package org.apache.xml.security.utils;
	2
	3	import org.apache.xml.security.exceptions.XMLSecurityException;
	4	import org.w3c.dom.Element;
	5
	6	public interface ElementChecker {
	7	/**
	8	* Check that the elemnt is the one expect
	9	*
	10	* @throws XMLSecurityException
	11	*/
	12	void guaranteeThatElementInCorrectSpace(ElementProxy expected, Element actual)
	13	throws XMLSecurityException;
	14	}

Lines 42-68 Link Here

(-)/Users/raulbenito/Documents/workspace/XML_SECURITY_TRUNK/src/org/apache/xml/security/utils/ElementProxy.java (-36 / +6 lines)
42	/** {@link org.apache.commons.logging} logging facility */	42	/** {@link org.apache.commons.logging} logging facility */
43	static org.apache.commons.logging.Log log =	43	static org.apache.commons.logging.Log log =
44	org.apache.commons.logging.LogFactory.getLog(ElementProxy.class.getName());	44	org.apache.commons.logging.LogFactory.getLog(ElementProxy.class.getName());
45	//J-	45
46	/ The element has been created by the code /
47	public static final int MODE_CREATE = 0;
48	/ The element has been readed from a DOM tree by the code /
49	public static final int MODE_PROCESS = 1;
50	/ The element isn't known if it is readen or created /
51	public static final int MODE_UNKNOWN = 2;
52
53	/ The element is going to be signed /
54	public static final int MODE_SIGN = MODE_CREATE;
55	/ The element is going to be verified /
56	public static final int MODE_VERIFY = MODE_PROCESS;
57
58	/ The element is going to be encrypted /
59	public static final int MODE_ENCRYPT = MODE_CREATE;
60	/ The element is going to be decrypted /
61	public static final int MODE_DECRYPT = MODE_PROCESS;
62
63	protected int _state = MODE_UNKNOWN;
64	//J+
65
66	/**	46	/**
67	* Returns the namespace of the Elements of the sub-class.	47	* Returns the namespace of the Elements of the sub-class.
68	*	48	*
Lines 104-110 Link Here
104	}	84	}
105		85
106	this._doc = doc;	86	this._doc = doc;
107	this._state = ElementProxy.MODE_CREATE;
108	this._constructionElement = createElementForFamilyLocal(this._doc,	87	this._constructionElement = createElementForFamilyLocal(this._doc,
109	this.getBaseNamespace(), this.getBaseLocalName());	88	this.getBaseNamespace(), this.getBaseLocalName());
110	}	89	}
Lines 194-200 Link Here
194	}	173	}
195		174
196	this._doc = element.getOwnerDocument();	175	this._doc = element.getOwnerDocument();
197	this._state = ElementProxy.MODE_PROCESS;
198	this._constructionElement = element;	176	this._constructionElement = element;
199	this._baseURI = BaseURI;	177	this._baseURI = BaseURI;
200	}	178	}
Lines 218-224 Link Here
218	}	196	}
219		197
220	this._doc = element.getOwnerDocument();	198	this._doc = element.getOwnerDocument();
221	this._state = ElementProxy.MODE_PROCESS;
222	this._constructionElement = element;	199	this._constructionElement = element;
223	this._baseURI = BaseURI;	200	this._baseURI = BaseURI;
224		201
Lines 267-272 Link Here
267	public String getBaseURI() {	244	public String getBaseURI() {
268	return this._baseURI;	245	return this._baseURI;
269	}	246	}
		247
		248	static ElementChecker checker = new ElementCheckerImpl.InternedNsChecker();
270		249
271	/**	250	/**
272	* Method guaranteeThatElementInCorrectSpace	251	* Method guaranteeThatElementInCorrectSpace
Lines 273-292 Link Here
273	*	252	*
274	* @throws XMLSecurityException	253	* @throws XMLSecurityException
275	*/	254	*/
276	public void guaranteeThatElementInCorrectSpace()	255	void guaranteeThatElementInCorrectSpace()
277	throws XMLSecurityException {	256	throws XMLSecurityException {
278		257
279	String localnameSHOULDBE = this.getBaseLocalName();	258	checker.guaranteeThatElementInCorrectSpace(this,this._constructionElement);
280	String namespaceSHOULDBE = this.getBaseNamespace();
281		259
282	String localnameIS = this._constructionElement.getLocalName();
283	String namespaceIS = this._constructionElement.getNamespaceURI();
284	if ((namespaceSHOULDBE!=namespaceIS) \|\|
285	!localnameSHOULDBE.equals(localnameIS) ) {
286	Object exArgs[] = { namespaceIS +":"+ localnameIS,
287	namespaceSHOULDBE +":"+ localnameSHOULDBE};
288	throw new XMLSecurityException("xml.WrongElement", exArgs);
289	}
290	}	260	}
291		261
292	/**	262	/**