[Neuclear-develop] neuclear-id/src/java/org/neuclear/id Identity.java,1.29,1.30 NSTools.java,1.28,1.29 SignatureRequest.java,1.13,1.14 SignedNamedCore.java,1.18,1.19 SignedNamedObject.java,1.17,1.18

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/src/java/org/neuclear/id

Modified Files:
	Identity.java NSTools.java SignatureRequest.java 
	SignedNamedCore.java SignedNamedObject.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: Identity.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Identity.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Identity.java	16 Jan 2004 23:42:09 -0000	1.29
--- Identity.java	18 Feb 2004 00:14:31 -0000	1.30
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.30  2004/02/18 00:14:31  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.29  2004/01/16 23:42:09  pelle
   * Added Base32 class. The Base32 encoding used wasnt following the standards.
***************
*** 314,319 ****
--- 318,325 ----
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.id.targets.Targets;
  import org.neuclear.xml.xmlsec.KeyInfo;
  import org.neuclear.xml.xmlsec.XMLSecTools;
***************
*** 354,396 ****
       */
      public Identity(final PublicKey pub){
!         this(new SignedNamedCore(pub),pub);
      }
  
!     protected Identity(final SignedNamedCore core, final PublicKey pub)  {
          super(core);
          this.pub = pub;
      }
  
  
!     public final String getRepository() {
!         return "http://repository.neuclear.org";
!     }
! 
      public final String getSigner() {
!         return "http://localhost:11870/Signer";
      }
  
-     public final String getLogger() {
-         return null;
-     }
- 
-     public final String getReceiver() {
-         return null;
-     }
  
      public final SignedNamedObject receive(final SignedNamedObject obj) throws NeuClearException {
! /*
!         if (!Utility.isEmpty(receiver))
!             return Sender.quickSend(receiver, obj);
!         else
! */
!             throw new NeuClearException("Cant receive object, " + getName() + " doesnt have a registered Receiver");
      }
  
      final void log(final SignedNamedObject obj) throws NeuClearException {
! /*
!         if (!Utility.isEmpty(logger))
!             Sender.quickSend(logger, obj);
! */
      }
  
--- 360,389 ----
       */
      public Identity(final PublicKey pub){
!         this(new SignedNamedCore(pub),pub,null,null);
      }
  
!     protected Identity(final SignedNamedCore core, final PublicKey pub,String signer,Targets targets)  {
          super(core);
          this.pub = pub;
+         this.targets=(targets!=null)?targets:Targets.EMPTY;
+         this.signer=Utility.denullString(signer,DEFAULT_SIGNER);
      }
  
  
!     //TODO update to use Targets
      public final String getSigner() {
!         return signer;
      }
  
  
+     //TODO update to use Targets
      public final SignedNamedObject receive(final SignedNamedObject obj) throws NeuClearException {
!         targets.send(obj);
!         return null;
      }
  
+     //TODO update to use Targets
      final void log(final SignedNamedObject obj) throws NeuClearException {
!         targets.log(obj);
      }
  
***************
*** 405,421 ****
  
      private final PublicKey pub;
  
!     private final static Identity createRootIdentity() {
! 
!         try {
!             final PublicKey rootpk = CryptoTools.createPK(NSROOTPKMOD, NSROOTPKEXP);
!             return new Identity(SignedNamedCore.createRootCore(), rootpk);
!         } catch (NeuClearException e) {
!             e.printStackTrace();
!         }
!         return null;
!     }
! 
!     public static final Identity NEUROOT = createRootIdentity();
  
      public final java.security.cert.Certificate[] getCertificateChain() {
--- 398,405 ----
  
      private final PublicKey pub;
+     private final Targets  targets;
+     private final String signer;
  
!     public static final String DEFAULT_SIGNER = "http://localhost:11870/Signer";
  
      public final java.security.cert.Certificate[] getCertificateChain() {
***************
*** 436,439 ****
--- 420,424 ----
      }
  
+ 
      private final class NeuClearCertificate extends Certificate {
          public NeuClearCertificate(Identity id) {
***************
*** 503,507 ****
                  final KeyInfo ki = new KeyInfo(InvalidNamedObjectException.assertContainsElementQName(allowElement, XMLSecTools.createQName("KeyInfo")));
                  final PublicKey pub = ki.getPublicKey();
!                 return new Identity(core, pub);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);
--- 488,495 ----
                  final KeyInfo ki = new KeyInfo(InvalidNamedObjectException.assertContainsElementQName(allowElement, XMLSecTools.createQName("KeyInfo")));
                  final PublicKey pub = ki.getPublicKey();
!                 final Targets targets=Targets.parseList(elem);
!                 final Element se=elem.element("Signer");
!                 final String signer=(se!=null)?se.getTextTrim():null;
!                 return new Identity(core, pub,signer,targets);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);

Index: NSTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/NSTools.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** NSTools.java	19 Jan 2004 23:49:44 -0000	1.28
--- NSTools.java	18 Feb 2004 00:14:32 -0000	1.29
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.29  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.28  2004/01/19 23:49:44  pelle
   * Unit testing uncovered further issues with Base32
***************
*** 210,216 ****
  package org.neuclear.id;
  
! import org.dom4j.*;
  import org.neuclear.commons.Utility;
- import org.neuclear.id.resolver.NSResolver;
  
  import java.util.regex.Matcher;
--- 214,220 ----
  package org.neuclear.id;
  
! import org.dom4j.DocumentHelper;
! import org.dom4j.Namespace;
  import org.neuclear.commons.Utility;
  
  import java.util.regex.Matcher;
***************
*** 366,401 ****
      }
  
-     /**
-      * Verifies that Dom4j node is an element or document containing a NamedObject.
-      * <br><b>Important</b>
-      * It does not verify if it has been signed.
-      * 
-      * @param node 
-      * @return 
-      */
-     public static boolean isNamedObject(Node node) {
- 
-         if (node == null) return false;
-         Element elem = null;
-         if (node instanceof Document)
-             elem = ((Document) node).getRootElement();
-         else if (node instanceof Element)
-             elem = (Element) node;
-         else
-             return false;
-         return !Utility.isEmpty(elem.attributeValue(DocumentHelper.createQName("name", NS_NEUID)));
-     }
- 
-     public static String getRepositoryURL(String alias) throws InvalidNamedObjectException {
-         String url=isHttpScheme(alias);
-         if (url==null){
-             try {
-                 return NSResolver.resolveIdentity(alias).getRepository();
-             } catch (Exception e) {
-                 return getRepositoryURL(getSignatoryURI(alias));
-             }
-         }
-         return url;
-     }
  
      private static final String HTTP_SCHEME_EX = "^neu:(neuid:)?\\/\\/(([\\w-]+\\.)+[\\w-]+)$";
--- 370,373 ----

Index: SignatureRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SignatureRequest.java	20 Jan 2004 17:39:12 -0000	1.13
--- SignatureRequest.java	18 Feb 2004 00:14:32 -0000	1.14
***************
*** 4,9 ****
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.builders.Builder;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
--- 4,7 ----
***************
*** 29,32 ****
--- 27,34 ----
  $Id$
  $Log$
+ Revision 1.14  2004/02/18 00:14:32  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.13  2004/01/20 17:39:12  pelle
  Further updates to unit tests

Index: SignedNamedCore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedCore.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SignedNamedCore.java	20 Jan 2004 17:39:12 -0000	1.18
--- SignedNamedCore.java	18 Feb 2004 00:14:32 -0000	1.19
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.19  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.18  2004/01/20 17:39:12  pelle
   * Further updates to unit tests
***************
*** 294,298 ****
   * @see NamedObjectReader
   * @see SignedNamedObject
-  * @see org.neuclear.id.builders.NamedObjectBuilder
   * @see org.neuclear.id.verifier.VerifyingReader
   * @see org.neuclear.id.resolver.NSResolver
--- 298,301 ----
***************
*** 511,515 ****
      }
      static Identity createSimpleIdentity(PublicKey pub){
!         return new Identity(new SignedNamedCore(pub),pub);
      }
  
--- 514,518 ----
      }
      static Identity createSimpleIdentity(PublicKey pub){
!         return new Identity(new SignedNamedCore(pub),pub,null,null);
      }
  

Index: SignedNamedObject.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedObject.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SignedNamedObject.java	10 Jan 2004 00:03:21 -0000	1.17
--- SignedNamedObject.java	18 Feb 2004 00:14:32 -0000	1.18
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.18  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.17  2004/01/10 00:03:21  pelle
   * Implemented new Schema for Transfer*
***************
*** 258,262 ****
   * 
   * @see NamedObjectReader
-  * @see org.neuclear.id.builders.NamedObjectBuilder
   * @see org.neuclear.id.verifier.VerifyingReader
   * @see org.neuclear.id.resolver.NSResolver
--- 262,265 ----
***************
*** 363,367 ****
          return getEncoded().equals(((SignedNamedObject)object).getEncoded());
      }
- 
      private final SignedNamedCore core;
  
--- 366,369 ----