Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv12836/src/test/org/neuclear/id/builders
Modified Files:
AuthenticationBuilderTest.java IdentityBuilderTest.java
SigningRequestBuilderTest.java
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.
Index: AuthenticationBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/AuthenticationBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AuthenticationBuilderTest.java 18 Nov 2003 00:01:56 -0000 1.1
--- AuthenticationBuilderTest.java 19 Nov 2003 23:34:00 -0000 1.2
***************
*** 29,32 ****
--- 29,41 ----
$Id$
$Log$
+ Revision 1.2 2003/11/19 23:34:00 pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+
Revision 1.1 2003/11/18 00:01:56 pelle
The sample signing web application for logging in and out is now working.
***************
*** 48,56 ****
AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
assertEquals(authreq.getParent().getName(), "neu://bob@test");
- authreq.sign(signer);
- assertTrue(authreq.isSigned());
try {
! AuthenticationTicket auth = (AuthenticationTicket) authreq.verify();
! assertTrue(true);
assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
--- 57,63 ----
AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
assertEquals(authreq.getParent().getName(), "neu://bob@test");
try {
! AuthenticationTicket auth = (AuthenticationTicket) authreq.sign(signer);
! assertTrue(authreq.isSigned());
assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
Index: IdentityBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/IdentityBuilderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IdentityBuilderTest.java 18 Nov 2003 15:07:37 -0000 1.5
--- IdentityBuilderTest.java 19 Nov 2003 23:34:00 -0000 1.6
***************
*** 10,14 ****
import org.neuclear.tests.AbstractSigningTest;
import org.neuclear.xml.XMLException;
- import org.neuclear.xml.XMLTools;
import java.io.File;
--- 10,13 ----
***************
*** 36,39 ****
--- 35,47 ----
$Id$
$Log$
+ Revision 1.6 2003/11/19 23:34:00 pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+
Revision 1.5 2003/11/18 15:07:37 pelle
Changes to JCE Implementation
***************
*** 78,92 ****
final String parent = NSTools.getParentNSURI(id.getName());
if (getSigner().canSignFor(parent)) {
id.sign(getSigner());
-
} else if (parent.equals("neu://")) {
id.sign(rootsigner);
}
File file = new File(PATH + NSTools.url2path(id.getName()) + "/root.id");
file.getParentFile().mkdirs();
- // XMLTools.writeFile(file, id.getElement());
System.out.println("Wrote: " + file.getAbsolutePath());
- SignedNamedObject sec = id.verify();
assertEquals(id.getName(), sec.getName());
assertTrue(true);
--- 86,99 ----
final String parent = NSTools.getParentNSURI(id.getName());
+ SignedNamedObject sec = null;
if (getSigner().canSignFor(parent)) {
id.sign(getSigner());
} else if (parent.equals("neu://")) {
id.sign(rootsigner);
}
+ assertNotNull(sec);
File file = new File(PATH + NSTools.url2path(id.getName()) + "/root.id");
file.getParentFile().mkdirs();
System.out.println("Wrote: " + file.getAbsolutePath());
assertEquals(id.getName(), sec.getName());
assertTrue(true);
Index: SigningRequestBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SigningRequestBuilderTest.java 18 Nov 2003 00:01:56 -0000 1.1
--- SigningRequestBuilderTest.java 19 Nov 2003 23:34:00 -0000 1.2
***************
*** 30,33 ****
--- 30,42 ----
$Id$
$Log$
+ Revision 1.2 2003/11/19 23:34:00 pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+
Revision 1.1 2003/11/18 00:01:56 pelle
The sample signing web application for logging in and out is now working.
***************
*** 50,64 ****
SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://test", "neu://bob@test", authreq, "For testing purposes");
assertEquals(sigreq.getParent().getName(), "neu://test");
- sigreq.sign(signer);
- assertTrue(sigreq.isSigned());
try {
! SignatureRequest tosign = (SignatureRequest) sigreq.verify();
assertEquals(tosign.getName(), sigreq.getName());
NamedObjectBuilder auth2 = tosign.getUnsigned();
assertEquals(auth2.getParent().getName(), "neu://bob@test");
- auth2.sign(signer);
- assertTrue(auth2.isSigned());
! AuthenticationTicket auth = (AuthenticationTicket) auth2.verify();
assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
--- 59,72 ----
SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://test", "neu://bob@test", authreq, "For testing purposes");
assertEquals(sigreq.getParent().getName(), "neu://test");
try {
! SignatureRequest tosign = (SignatureRequest) sigreq.sign(signer);
! assertTrue(sigreq.isSigned());
assertEquals(tosign.getName(), sigreq.getName());
+
NamedObjectBuilder auth2 = tosign.getUnsigned();
assertEquals(auth2.getParent().getName(), "neu://bob@test");
! AuthenticationTicket auth = (AuthenticationTicket) auth2.sign(signer);
! assertTrue(auth2.isSigned());
assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
|