Menu
▾
▴
neuclear-develop — Support requests, cvs etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(119) |
Oct
(111) |
Nov
(238) |
Dec
(395) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(239) |
Feb
(59) |
Mar
(354) |
Apr
(489) |
May
(23) |
Jun
(2) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(5) |
Jun
(2) |
Jul
|
Aug
|
Sep
(3) |
Oct
(14) |
Nov
(17) |
Dec
(9) |
| 2007 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(7) |
May
(3) |
Jun
(6) |
Jul
(4) |
Aug
(3) |
Sep
(15) |
Oct
(13) |
Nov
(35) |
Dec
(40) |
| 2009 |
Jan
(19) |
Feb
(21) |
Mar
(16) |
Apr
(18) |
May
(36) |
Jun
(20) |
Jul
(32) |
Aug
(11) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(13) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(4) |
Nov
|
Dec
(3) |
| 2012 |
Jan
(3) |
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(8) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
(8) |
Oct
(3) |
Nov
(8) |
Dec
(4) |
| 2013 |
Jan
(2) |
Feb
(1) |
Mar
(5) |
Apr
(6) |
May
(10) |
Jun
(5) |
Jul
(6) |
Aug
(7) |
Sep
(5) |
Oct
(2) |
Nov
(4) |
Dec
(4) |
| 2014 |
Jan
(13) |
Feb
(4) |
Mar
(7) |
Apr
(9) |
May
(20) |
Jun
(13) |
Jul
(10) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2015 |
Jan
(3) |
Feb
(3) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(2) |
Jul
(4) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bug...@ve...> - 2004-04-15 15:13:54
|
The following issue has been updated:
Updater: Pelle Braendgaard (mailto:pe...@ve...)
Date: Thu, 15 Apr 2004 8:13 AM
Changes:
Version changed to r_0_7
Fix Version changed to r_0_7
---------------------------------------------------------------------
For a full history of the issue, see:
http://jira.neuclear.org//browse/COM-27?page=history
---------------------------------------------------------------------
View the issue:
http://jira.neuclear.org//browse/COM-27
Here is an overview of the issue:
---------------------------------------------------------------------
Key: COM-27
Summary: Loop when JCESigner is loaded with incorrect passphrase
Type: Bug
Status: Open
Priority: Major
Original Estimate: Unknown
Time Spent: Unknown
Remaining: Unknown
Project: NeuClear Commons
Fix Fors:
r_0_7
Versions:
r_0_7
Assignee: Pelle Braendgaard
Reporter: Pelle Braendgaard
Created: Wed, 14 Apr 2004 1:21 PM
Updated: Thu, 15 Apr 2004 8:13 AM
Description:
---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.neuclear.org//secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
|
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:36
|
Update of /cvsroot/neuclear/neuclear-ledger-hibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5289 Modified Files: project.properties project.xml Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.properties 23 Mar 2004 21:57:50 -0000 1.3 --- project.properties 14 Apr 2004 23:51:27 -0000 1.4 *************** *** 2,6 **** # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- ! #maven.test.skip=true maven.compile.debug = on --- 2,6 ---- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- ! maven.test.skip=true maven.compile.debug = on Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.xml 25 Mar 2004 19:04:18 -0000 1.5 --- project.xml 14 Apr 2004 23:51:27 -0000 1.6 *************** *** 85,94 **** </dependency> <dependency> - <id>hibernate</id> - <name>hibernate</name> - <version>2.1.2</version> - - </dependency> - <dependency> <id>dom4j</id> <version>1.4</version> --- 85,88 ---- *************** *** 98,101 **** --- 92,111 ---- </dependency> <dependency> + <id>prevayler</id> + <name>prevayler</name> + <version>2.0.2.000beta</version> + <jar>prevayler2.02.000beta.jar</jar> + </dependency> + <dependency> + <id>trove</id> + <name>trove</name> + <version>1.0.2</version> + </dependency> + <dependency> + <id>hibernate</id> + <name>hibernate</name> + <version>2.1.2</version> + </dependency> + <dependency> <id>odmg</id> <version>3.0</version> *************** *** 116,144 **** </dependency> <dependency> ! <id>carol</id> ! <version>1.5.2</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <groupId>jotm</groupId> ! <artifactId>jotm</artifactId> ! <version>1.4.3</version> <properties> <war.bundle>true</war.bundle> </properties> </dependency> - <!-- <dependency> - <groupId>jotm</groupId> - <artifactId>jotm_jrmp_stubs</artifactId> - <version>1.4.3</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency>--> <dependency> ! <id>xapool</id> ! <version>1.3.1</version> <properties> <war.bundle>true</war.bundle> --- 126,142 ---- </dependency> <dependency> ! <id>mysql</id> ! <jar>mysql-connector-java-3.0.8-stable-bin.jar</jar> </dependency> <dependency> ! <id>ehcache</id> ! <version>0.7</version> <properties> <war.bundle>true</war.bundle> </properties> </dependency> <dependency> ! <id>asm</id> ! <version>1.4</version> <properties> <war.bundle>true</war.bundle> *************** *** 157,160 **** --- 155,193 ---- </dependency> + <!-- + <dependency> + <id>carol</id> + <version>1.5.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>jotm</groupId> + <artifactId>jotm</artifactId> + <version>1.4.3</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + --> + <!-- <dependency> + <groupId>jotm</groupId> + <artifactId>jotm_jrmp_stubs</artifactId> + <version>1.4.3</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency>--> + <!-- + <dependency> + <id>xapool</id> + <version>1.3.1</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + --> + </dependencies> <build> |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:36
|
Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5289/src/java Modified Files: hibernate.properties Log Message: Fixed Exchange tests and Cactus tests working on web app. |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:28
|
Update of /cvsroot/neuclear/neuclear-ledger-prevalent In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5269 Modified Files: project.properties Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/project.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.properties 23 Mar 2004 22:02:23 -0000 1.3 --- project.properties 14 Apr 2004 23:51:20 -0000 1.4 *************** *** 2,6 **** # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- ! maven.test.skip=false maven.compile.debug = on --- 2,6 ---- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- ! maven.test.skip=true maven.compile.debug = on |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:23
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/test/org/neuclear/exchange/orders/builders Modified Files: AbstractExchangeOrderTest.java CancelExchangeOrderBuilderTest.java ExchangeCompletedReceiptBuilderTest.java ExchangeCompletionOrderBuilderTest.java Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: ExchangeCompletionOrderBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilderTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletionOrderBuilderTest.java 5 Apr 2004 16:31:45 -0000 1.1 --- ExchangeCompletionOrderBuilderTest.java 14 Apr 2004 23:51:13 -0000 1.2 *************** *** 36,39 **** --- 36,42 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:51:13 pelle + Fixed Exchange tests and Cactus tests working on web app. + Revision 1.1 2004/04/05 16:31:45 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. *************** *** 77,92 **** assertTrue(obj instanceof ExchangeCompletionOrder); ExchangeCompletionOrder complete = (ExchangeCompletionOrder) obj; ! assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), complete.getSignatory().getPublicKey().getEncoded()); assertEquals("done", complete.getComment()); assertEquals(19.0, complete.getAmount().getAmount(), 0); assertNotNull(complete.getExchangeTime()); assertNotNull(complete.getReceipt()); ExchangeOrderReceipt receipt = complete.getReceipt(); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); --- 80,99 ---- assertTrue(obj instanceof ExchangeCompletionOrder); ExchangeCompletionOrder complete = (ExchangeCompletionOrder) obj; ! assertEquals(getPublicKeyName("exchange"), complete.getSignatory().getName()); assertEquals("done", complete.getComment()); assertEquals(19.0, complete.getAmount().getAmount(), 0); assertNotNull(complete.getExchangeTime()); assertNotNull(complete.getReceipt()); + ExchangeOrderReceipt receipt = complete.getReceipt(); ! assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); + ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getPublicKeyName("bob"), order.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); *************** *** 101,109 **** BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date()); ! ExchangeCompletionOrderBuilder builder = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done"); return builder; } } --- 108,119 ---- BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date()); ! ExchangeCompletionOrderBuilder builder = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done"); return builder; } + protected String getSignersAlias() { + return "exchange"; + } } Index: ExchangeCompletedReceiptBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/ExchangeCompletedReceiptBuilderTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletedReceiptBuilderTest.java 5 Apr 2004 16:31:45 -0000 1.1 --- ExchangeCompletedReceiptBuilderTest.java 14 Apr 2004 23:51:13 -0000 1.2 *************** *** 33,36 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:51:13 pelle + Fixed Exchange tests and Cactus tests working on web app. + Revision 1.1 2004/04/05 16:31:45 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. *************** *** 74,94 **** assertTrue(obj instanceof ExchangeCompletedReceipt); ExchangeCompletedReceipt cr = (ExchangeCompletedReceipt) obj; ! assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), cr.getSignatory().getPublicKey().getEncoded()); assertNotNull(cr.getOrder()); assertNotNull(cr.getValueTime()); ExchangeCompletionOrder complete = cr.getOrder(); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), complete.getSignatory().getPublicKey().getEncoded()); assertEquals("done", complete.getComment()); assertEquals(19.0, complete.getAmount().getAmount(), 0); assertNotNull(complete.getExchangeTime()); assertNotNull(complete.getReceipt()); ExchangeOrderReceipt receipt = complete.getReceipt(); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); --- 77,101 ---- assertTrue(obj instanceof ExchangeCompletedReceipt); ExchangeCompletedReceipt cr = (ExchangeCompletedReceipt) obj; ! assertEquals(getPublicKeyName("bux"), cr.getSignatory().getName()); assertNotNull(cr.getOrder()); assertNotNull(cr.getValueTime()); ExchangeCompletionOrder complete = cr.getOrder(); ! assertEquals(getPublicKeyName("exchange"), complete.getSignatory().getName()); assertEquals("done", complete.getComment()); assertEquals(19.0, complete.getAmount().getAmount(), 0); assertNotNull(complete.getExchangeTime()); assertNotNull(complete.getReceipt()); + ExchangeOrderReceipt receipt = complete.getReceipt(); ! assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); + ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getPublicKeyName("bob"), order.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); *************** *** 103,112 **** BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date()); ! ExchangeCompletionOrderBuilder cb = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done"); ! ExchangeCompletedReceiptBuilder builder = new ExchangeCompletedReceiptBuilder((ExchangeCompletionOrder) cb.convert("neu://test/bux", getSigner()), new Date()); return builder; } } --- 110,123 ---- BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date()); ! ExchangeCompletionOrderBuilder cb = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done"); ! ExchangeCompletedReceiptBuilder builder = new ExchangeCompletedReceiptBuilder((ExchangeCompletionOrder) cb.convert("exchange", getSigner()), new Date()); return builder; } + protected String getSignersAlias() { + return "bux"; + } + } Index: AbstractExchangeOrderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/AbstractExchangeOrderTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractExchangeOrderTest.java 5 Apr 2004 16:31:44 -0000 1.1 --- AbstractExchangeOrderTest.java 14 Apr 2004 23:51:12 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:51:12 pelle + Fixed Exchange tests and Cactus tests working on web app. + Revision 1.1 2004/04/05 16:31:44 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. *************** *** 33,40 **** public Asset createTestAsset() throws NeuClearException { AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org", ! getSigner().getPublicKey("neu://test/bux"), ! getAlice().getPublicKey(), 2, 0); ! return (Asset) builder.convert(NAME, getSigner()); } --- 36,43 ---- public Asset createTestAsset() throws NeuClearException { AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org", ! getSigner().getPublicKey("bux"), ! getSigner().getPublicKey("buxissuer"), 2, 0); ! return (Asset) builder.convert(PROMOTER, getSigner()); } *************** *** 42,49 **** public Asset createShoeAsset() throws NeuClearException { AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org", ! getSigner().getPublicKey("neu://test"), ! getAlice().getPublicKey(), 2, 0); ! return (Asset) builder.convert(NAME, getSigner()); } --- 45,52 ---- public Asset createShoeAsset() throws NeuClearException { AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org", ! getSigner().getPublicKey("shoes"), ! getSigner().getPublicKey("shoesissuer"), 2, 0); ! return (Asset) builder.convert(PROMOTER, getSigner()); } *************** *** 51,56 **** public ExchangeAgent createTestExchangeAgent() throws NeuClearException { ExchangeAgentBuilder builder = new ExchangeAgentBuilder("http://tradex.neuclear.org", ! getSigner().getPublicKey("neu://bob@test")); ! return (ExchangeAgent) builder.convert(NAME, getSigner()); } --- 54,59 ---- public ExchangeAgent createTestExchangeAgent() throws NeuClearException { ExchangeAgentBuilder builder = new ExchangeAgentBuilder("http://tradex.neuclear.org", ! getSigner().getPublicKey("exchange")); ! return (ExchangeAgent) builder.convert("carol", getSigner()); } *************** *** 59,61 **** --- 62,65 ---- protected Asset shoes; protected ExchangeAgent agent; + public static String PROMOTER = "ivan"; } Index: CancelExchangeOrderBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/CancelExchangeOrderBuilderTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CancelExchangeOrderBuilderTest.java 5 Apr 2004 16:31:45 -0000 1.1 --- CancelExchangeOrderBuilderTest.java 14 Apr 2004 23:51:13 -0000 1.2 *************** *** 36,39 **** --- 36,42 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:51:13 pelle + Fixed Exchange tests and Cactus tests working on web app. + Revision 1.1 2004/04/05 16:31:45 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. *************** *** 77,89 **** assertTrue(obj instanceof CancelExchangeOrder); CancelExchangeOrder cancel = (CancelExchangeOrder) obj; ! assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), cancel.getSignatory().getPublicKey().getEncoded()); assertNotNull(cancel.getReceipt()); ExchangeOrderReceipt receipt = cancel.getReceipt(); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); --- 80,95 ---- assertTrue(obj instanceof CancelExchangeOrder); CancelExchangeOrder cancel = (CancelExchangeOrder) obj; ! assertEquals(getPublicKeyName("bob"), cancel.getSignatory().getName()); assertNotNull(cancel.getReceipt()); ExchangeOrderReceipt receipt = cancel.getReceipt(); ! assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); assertNotNull(receipt.getValuetime()); assertNotNull(receipt.getOrder()); + ExchangeOrder order = receipt.getOrder(); assertEquals(bux.getDigest(), order.getAsset().getDigest()); ! assertEquals(getPublicKeyName("bob"), order.getSignatory().getName()); ! // assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); *************** *** 98,106 **** BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date()); ! CancelExchangeOrderBuilder builder = new CancelExchangeOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner())); return builder; } } --- 104,116 ---- BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))}; Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test"); ! ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date()); ! CancelExchangeOrderBuilder builder = new CancelExchangeOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner())); return builder; } + protected String getSignersAlias() { + return "bob"; + } + } |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:23
|
Update of /cvsroot/neuclear/neuclear-pay In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208 Modified Files: project.properties project.xml Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/project.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.properties 23 Mar 2004 22:02:06 -0000 1.7 --- project.properties 14 Apr 2004 23:51:13 -0000 1.8 *************** *** 2,5 **** --- 2,6 ---- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- + maven.test.skip=true maven.compile.debug = on *************** *** 18,22 **** #maven.ui.property.file = ui.properties maven.repo.remote = http://old.neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ - maven.test.skip=true maven.repo.central = old.neuclear.org maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven --- 19,22 ---- Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** project.xml 31 Mar 2004 23:10:50 -0000 1.23 --- project.xml 14 Apr 2004 23:51:13 -0000 1.24 *************** *** 67,78 **** <!-- Need to mark these as compile-time/run-time --> <dependencies> ! <dependency> ! <id>hsqldb</id> ! <version>1.7.1</version> ! </dependency> <dependency> <id>neuclear-commons</id> <name>neuclear-commons</name> ! <version>0.6</version> <properties> <war.bundle>true</war.bundle> --- 67,80 ---- <!-- Need to mark these as compile-time/run-time --> <dependencies> ! <!-- ! <dependency> ! <id>hsqldb</id> ! <version>1.7.1</version> ! </dependency> ! --> <dependency> <id>neuclear-commons</id> <name>neuclear-commons</name> ! <version>0.7-SNAPSHOT</version> <properties> <war.bundle>true</war.bundle> *************** *** 82,86 **** <id>neuclear-ledger</id> <name>neuclear-ledger</name> ! <version>0.6</version> <properties> <war.bundle>true</war.bundle> --- 84,104 ---- <id>neuclear-ledger</id> <name>neuclear-ledger</name> ! <version>0.4-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-ledger-prevalent</id> ! <name>neuclear-ledger-prevalent</name> ! <version>0.4-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-ledger-hibernate</id> ! <name>neuclear-ledger-hibernate</name> ! <version>0.4-SNAPSHOT</version> <properties> <war.bundle>true</war.bundle> *************** *** 105,109 **** <id>neuclear-xmlsig</id> <name>neuclear-xmlsig</name> ! <version>0.12</version> <properties> <war.bundle>true</war.bundle> --- 123,127 ---- <id>neuclear-xmlsig</id> <name>neuclear-xmlsig</name> ! <version>0.13-SNAPSHOT</version> <properties> <war.bundle>true</war.bundle> *************** *** 119,143 **** </dependency> <dependency> ! <id>commons-cli</id> ! <name>commons-cli</name> ! <version>1.0-beta-2</version> </dependency> <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> <properties> ! <war.bundle>false</war.bundle> </properties> </dependency> <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8</version> </dependency> <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> <properties> <war.bundle>true</war.bundle> --- 137,164 ---- </dependency> <dependency> ! <id>hibernate</id> ! <name>hibernate</name> ! <version>2.1.2</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>odmg</id> ! <version>3.0</version> <properties> ! <war.bundle>true</war.bundle> </properties> </dependency> <dependency> ! <id>cglib</id> ! <version>2.0-rc2</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>commons-collections</id> ! <version>2.1</version> <properties> <war.bundle>true</war.bundle> *************** *** 145,150 **** </dependency> <dependency> ! <id>jstl</id> ! <version>1.0.2</version> <properties> <war.bundle>true</war.bundle> --- 166,171 ---- </dependency> <dependency> ! <id>mysql</id> ! <jar>mysql-connector-java-3.0.8-stable-bin.jar</jar> <properties> <war.bundle>true</war.bundle> *************** *** 152,175 **** </dependency> <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> </dependency> <dependency> ! <id>carol</id> ! <version>1.5.2</version> </dependency> <dependency> ! <id>jotm</id> ! <version>1.4.3</version> </dependency> <dependency> ! <id>xapool</id> ! <version>1.3.1</version> </dependency> <dependency> ! <id>jta-spec</id> ! <version>1.0.1</version> </dependency> </dependencies> --- 173,256 ---- </dependency> <dependency> ! <id>ehcache</id> ! <version>0.7</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>asm</id> ! <version>1.4</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>jta-spec</id> ! <version>1.0.1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>commons-logging</id> ! <version>1.0.3</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> </dependency> + <dependency> + <id>junit</id> + <name>junit</name> + <version>3.8</version> + </dependency> + <!-- <dependency> + <id>waterken-adt</id> + <version>2.0-beta13</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency>--> + <!-- + <dependency> + <id>jstl</id> + <version>1.0.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + --> + <dependency> + <id>servletapi</id> + <name>servletapi</name> + <version>2.3</version> + </dependency> + <!-- + <dependency> + <id>carol</id> + <version>1.5.2</version> + </dependency> + <dependency> + <id>jotm</id> + <version>1.4.3</version> + </dependency> + <dependency> + <id>xapool</id> + <version>1.3.1</version> + </dependency> + <dependency> + <id>jta-spec</id> + <version>1.0.1</version> + </dependency> + --> </dependencies> |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:23
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/webapp/SECURE Modified Files: transfer.jsp Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: transfer.jsp =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE/transfer.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** transfer.jsp 5 Apr 2004 16:31:45 -0000 1.9 --- transfer.jsp 14 Apr 2004 23:51:13 -0000 1.10 *************** *** 1,5 **** <%@ page import="org.neuclear.id.Identity, org.neuclear.commons.Utility, ! org.neuclear.asset.orders.builders.TransferRequestBuilder, org.neuclear.id.resolver.Resolver, org.neuclear.asset.contracts.Asset, --- 1,5 ---- <%@ page import="org.neuclear.id.Identity, org.neuclear.commons.Utility, ! org.neuclear.asset.orders.builders.TransferOrderBuilder, org.neuclear.id.resolver.Resolver, org.neuclear.asset.contracts.Asset, *************** *** 7,23 **** org.neuclear.id.builders.SignatureRequestBuilder, org.neuclear.asset.contracts.AssetGlobals, ! org.neuclear.asset.orders.transfers.TransferGlobals, org.neuclear.asset.servlet.AssetControllerServlet, org.neuclear.id.SignedNamedObject, org.neuclear.commons.crypto.Base64, org.neuclear.commons.servlets.ServletTools, ! org.neuclear.asset.orders.transfers.TransferGlobals, ! org.neuclear.id.Service"%> <% AssetGlobals.registerReaders(); TransferGlobals.registerReaders(); ! Identity userns=(Identity) request.getUserPrincipal(); String service=ServletTools.getInitParam("service",config); ! Service asset=(Service)Resolver.resolveIdentity(service); String recipient=Utility.denullString(request.getParameter("recipient")); double amount=Double.parseDouble(Utility.denullString(request.getParameter("amount"),"0")); --- 7,25 ---- org.neuclear.id.builders.SignatureRequestBuilder, org.neuclear.asset.contracts.AssetGlobals, ! org.neuclear.asset.servlet.AssetControllerServlet, org.neuclear.id.SignedNamedObject, org.neuclear.commons.crypto.Base64, org.neuclear.commons.servlets.ServletTools, ! org.neuclear.id.Service, ! org.neuclear.asset.orders.TransferGlobals, ! org.neuclear.id.Signatory, ! org.neuclear.asset.orders.Amount"%> <% AssetGlobals.registerReaders(); TransferGlobals.registerReaders(); ! Signatory userns=(Signatory) request.getUserPrincipal(); String service=ServletTools.getInitParam("service",config); ! // Service asset=(Service)Resolver.resolveIdentity(service); String recipient=Utility.denullString(request.getParameter("recipient")); double amount=Double.parseDouble(Utility.denullString(request.getParameter("amount"),"0")); *************** *** 49,65 **** </p> <% } else { ! TransferRequestBuilder transfer=new TransferRequestBuilder( ! asset, ! userns, ! Resolver.resolveIdentity(recipient), ! amount, ! TimeTools.now(), comment ) ; ! SignatureRequestBuilder sigreq=new SignatureRequestBuilder(service,userns.getName(),transfer,comment); ! SignedNamedObject sig=sigreq.sign(getSigner()); %> ! <form action="<%=userns.getSigner()%>" method="POST"> <input name="neuclear-request" value="<%=Base64.encode(sig.getEncoded().getBytes())%>" type="hidden"> <input name="endpoint" value="<%=ServletTools.getAbsoluteURL(request, "/Asset")%>" type="hidden"> --- 51,65 ---- </p> <% } else { ! TransferOrderBuilder transfer=new TransferOrderBuilder( ! service, ! recipient, ! new Amount(amount), comment ) ; ! SignatureRequestBuilder sigreq=new SignatureRequestBuilder(transfer,comment); ! SignedNamedObject sig=sigreq.sign(); %> ! <form action="http://localhost:11870/Signer" method="POST"> <input name="neuclear-request" value="<%=Base64.encode(sig.getEncoded().getBytes())%>" type="hidden"> <input name="endpoint" value="<%=ServletTools.getAbsoluteURL(request, "/Asset")%>" type="hidden"> |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:22
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/webapp Modified Files: index.jsp Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: index.jsp =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/index.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.jsp 1 Apr 2004 23:18:35 -0000 1.4 --- index.jsp 14 Apr 2004 23:51:13 -0000 1.5 *************** *** 5,13 **** org.neuclear.commons.servlets.ServletTools , org.neuclear.id.Identity, ! org.neuclear.id.resolver.Resolver"%> <% response.setHeader("Pragma","no-cache"); response.setDateHeader("Expires",0); ! Identity userns=(Identity) request.getUserPrincipal(); boolean loggedin=userns!=null; --- 5,14 ---- org.neuclear.commons.servlets.ServletTools , org.neuclear.id.Identity, ! org.neuclear.id.resolver.Resolver, ! org.neuclear.id.Signatory"%> <% response.setHeader("Pragma","no-cache"); response.setDateHeader("Expires",0); ! Signatory userns=(Signatory) request.getUserPrincipal(); boolean loggedin=userns!=null; |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:51:22
|
Update of /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/test-cactus/org/neuclear/asset/receiver/servlet Modified Files: AssetControllerServletTest.java Log Message: Fixed Exchange tests and Cactus tests working on web app. Index: AssetControllerServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet/AssetControllerServletTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AssetControllerServletTest.java 1 Apr 2004 23:18:34 -0000 1.4 --- AssetControllerServletTest.java 14 Apr 2004 23:51:13 -0000 1.5 *************** *** 6,16 **** import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.commons.crypto.Base64; import org.neuclear.commons.crypto.signers.JCESigner; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.auth.AuthenticationServlet; - import org.neuclear.id.resolver.Resolver; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; --- 6,18 ---- import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.signers.JCESigner; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.auth.AuthenticationServlet; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; *************** *** 42,45 **** --- 44,50 ---- $Id$ $Log$ + Revision 1.5 2004/04/14 23:51:13 pelle + Fixed Exchange tests and Cactus tests working on web app. + Revision 1.4 2004/04/01 23:18:34 pelle Split Identity into Signatory and Identity class. *************** *** 72,75 **** --- 77,84 ---- } + protected String getPublicKeyName(String alias) throws NonExistingSignerException { + return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded())); + } + public void beginAuthReq(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { theRequest.setContentType("application/x-www-form-urlencoded"); *************** *** 102,109 **** assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(sigreq.getSignatory().getName(), "neu://test"); assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); ! assertEquals(sigreq.getUserid(), "neu://bob@test"); ! assertEquals(Resolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction()); } --- 111,117 ---- assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(getPublicKeyName("neu://test"), sigreq.getSignatory().getName()); assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); ! assertEquals("http://localhost:11870/Signer", forms[0].getAction()); } |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:45:24
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/java/org/neuclear/id/signers Modified Files: SignatureRequestServlet.java SigningServlet.java Log Message: Got the cactus tests working and the sample web app Index: SignatureRequestServlet.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SignatureRequestServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SignatureRequestServlet.java 1 Apr 2004 23:19:48 -0000 1.2 --- SignatureRequestServlet.java 14 Apr 2004 23:44:44 -0000 1.3 *************** *** 2,6 **** import org.neuclear.commons.NeuClearException; ! import org.neuclear.commons.Utility; import org.neuclear.commons.crypto.signers.ServletSignerFactory; import org.neuclear.commons.crypto.signers.Signer; --- 2,7 ---- import org.neuclear.commons.NeuClearException; ! import org.neuclear.commons.crypto.passphraseagents.UserCancellationException; ! import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.ServletSignerFactory; import org.neuclear.commons.crypto.signers.Signer; *************** *** 9,13 **** import org.neuclear.id.builders.Builder; import org.neuclear.id.builders.SignatureRequestBuilder; - import org.neuclear.id.resolver.Resolver; import org.neuclear.xml.XMLException; import org.neuclear.xml.xmlsec.XMLSecTools; --- 10,13 ---- *************** *** 44,47 **** --- 44,50 ---- $Id$ $Log$ + Revision 1.3 2004/04/14 23:44:44 pelle + Got the cactus tests working and the sample web app + Revision 1.2 2004/04/01 23:19:48 pelle Split Identity into Signatory and Identity class. *************** *** 137,146 **** try { ! final Identity user = getUserNS(request); final Builder namedreq = createBuilder(request); ! final SignatureRequestBuilder sigreq = new SignatureRequestBuilder(user.getName(), namedreq, "Login to Site"); ! sigreq.sign(serviceid, signer); out.write("<form action=\""); ! out.print(user.getSigner()); out.write("\" method=\"POST\" id=\"sigrequest\">\n "); out.write("<input name=\"neuclear-request\" value=\""); --- 140,158 ---- try { ! // final Identity user = getUserNS(request); final Builder namedreq = createBuilder(request); ! final SignatureRequestBuilder sigreq = new SignatureRequestBuilder(namedreq, "Login to Site"); ! try { ! sigreq.sign(serviceid, signer); ! } catch (XMLSecurityException e) { ! e.printStackTrace(); ! } catch (UserCancellationException e) { ! e.printStackTrace(); ! } catch (NonExistingSignerException e) { ! e.printStackTrace(); ! } out.write("<form action=\""); ! out.write(Identity.DEFAULT_SIGNER); ! // out.print(user.getSigner()); out.write("\" method=\"POST\" id=\"sigrequest\">\n "); out.write("<input name=\"neuclear-request\" value=\""); *************** *** 166,175 **** protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException { ! if (request.getUserPrincipal() != null) ! return (Identity) request.getUserPrincipal(); ! final String username = request.getParameter("identity"); ! if (Utility.isEmpty(username)) ! throw new NeuClearException("No Identity Provided"); ! return Resolver.resolveIdentity(username); } --- 178,187 ---- protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException { ! // if (request.getUserPrincipal() != null) ! return (Identity) request.getUserPrincipal(); ! // final String username = request.getParameter("identity"); ! // if (Utility.isEmpty(username)) ! // throw new NeuClearException("No Identity Provided"); ! // return Resolver.resolveIdentity(username); } Index: SigningServlet.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SigningServlet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SigningServlet.java 14 Apr 2004 00:11:34 -0000 1.6 --- SigningServlet.java 14 Apr 2004 23:44:44 -0000 1.7 *************** *** 2,5 **** --- 2,8 ---- * $Id$ * $Log$ + * Revision 1.7 2004/04/14 23:44:44 pelle + * Got the cactus tests working and the sample web app + * * Revision 1.6 2004/04/14 00:11:34 pelle * Added a MessageLabel for handling errors, validation and info *************** *** 341,347 **** throw new NeuClearException("nothing to sign"); } - if (!signer.canSignFor(sigreq.getUserid())) - throw new NonExistingSignerException(sigreq.getUserid()); - response.setHeader("Pragma", "no-cache"); response.setDateHeader("Expires", 0); --- 344,347 ---- |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:45:23
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/java/org/neuclear/id/builders Modified Files: AuthenticationTicketBuilder.java SignatureRequestBuilder.java Log Message: Got the cactus tests working and the sample web app Index: AuthenticationTicketBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AuthenticationTicketBuilder.java 2 Mar 2004 18:59:10 -0000 1.11 --- AuthenticationTicketBuilder.java 14 Apr 2004 23:44:28 -0000 1.12 *************** *** 2,9 **** import org.dom4j.DocumentHelper; - import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.commons.time.TimeTools; import org.neuclear.id.InvalidNamedObjectException; ! import org.neuclear.id.NSTools; import java.sql.Timestamp; --- 2,8 ---- import org.dom4j.DocumentHelper; import org.neuclear.commons.time.TimeTools; import org.neuclear.id.InvalidNamedObjectException; ! import org.neuclear.id.auth.AuthenticationTicket; import java.sql.Timestamp; *************** *** 30,33 **** --- 29,35 ---- $Id$ $Log$ + Revision 1.12 2004/04/14 23:44:28 pelle + Got the cactus tests working and the sample web app + Revision 1.11 2004/03/02 18:59:10 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 89,100 **** */ public final class AuthenticationTicketBuilder extends Builder { ! public AuthenticationTicketBuilder(final String user, final String requester, final String site) throws InvalidNamedObjectException { ! this(user, requester, new Timestamp(new Date().getTime() + 1800000), site); } ! public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws InvalidNamedObjectException { super(DocumentHelper.createQName(AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH)); - createAttribute("userid",user); - createAttribute("requester", NSTools.normalizeNameURI(requester)); createAttribute("validto", TimeTools.formatTimeStamp(validto)); createAttribute("sitehref", site); --- 91,100 ---- */ public final class AuthenticationTicketBuilder extends Builder { ! public AuthenticationTicketBuilder(final String site) throws InvalidNamedObjectException { ! this(new Timestamp(new Date().getTime() + 1800000), site); } ! public AuthenticationTicketBuilder(final Date validto, final String site) throws InvalidNamedObjectException { super(DocumentHelper.createQName(AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH)); createAttribute("validto", TimeTools.formatTimeStamp(validto)); createAttribute("sitehref", site); *************** *** 102,105 **** - } --- 102,104 ---- Index: SignatureRequestBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SignatureRequestBuilder.java 19 Jan 2004 23:49:44 -0000 1.10 --- SignatureRequestBuilder.java 14 Apr 2004 23:44:28 -0000 1.11 *************** *** 26,29 **** --- 26,32 ---- $Id$ $Log$ + Revision 1.11 2004/04/14 23:44:28 pelle + Got the cactus tests working and the sample web app + Revision 1.10 2004/01/19 23:49:44 pelle Unit testing uncovered further issues with Base32 *************** *** 85,93 **** */ public final class SignatureRequestBuilder extends Builder { ! public SignatureRequestBuilder(final String userid, final Builder unsigned, final String description) throws NeuClearException { super(createNEUIDQName(SignatureRequest.SIGREQUEST_TAG)); final Element unsignedElem = addElement("Unsigned"); unsignedElem.add(unsigned.getElement()); - createAttribute("userid", userid); if (!Utility.isEmpty(description)) addElement("Description").setText(description); --- 88,95 ---- */ public final class SignatureRequestBuilder extends Builder { ! public SignatureRequestBuilder(final Builder unsigned, final String description) throws NeuClearException { super(createNEUIDQName(SignatureRequest.SIGREQUEST_TAG)); final Element unsignedElem = addElement("Unsigned"); unsignedElem.add(unsigned.getElement()); if (!Utility.isEmpty(description)) addElement("Description").setText(description); |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:45:07
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/java/org/neuclear/id/auth Modified Files: AuthenticationServlet.java AuthenticationTicket.java Log Message: Got the cactus tests working and the sample web app Index: AuthenticationServlet.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth/AuthenticationServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AuthenticationServlet.java 22 Mar 2004 20:09:43 -0000 1.2 --- AuthenticationServlet.java 14 Apr 2004 23:44:28 -0000 1.3 *************** *** 28,31 **** --- 28,34 ---- $Id$ $Log$ + Revision 1.3 2004/04/14 23:44:28 pelle + Got the cactus tests working and the sample web app + Revision 1.2 2004/03/22 20:09:43 pelle Added simple ledger for unit testing and in memory use *************** *** 108,114 **** protected Builder createBuilder(final HttpServletRequest request) throws NeuClearException { ! final String userns = request.getParameter("identity"); request.getSession(true).setAttribute("auth", userns); ! return new AuthenticationTicketBuilder(userns, getServiceid(), request.getRequestURI()); } --- 111,117 ---- protected Builder createBuilder(final HttpServletRequest request) throws NeuClearException { ! final String userns = request.getParameter("signer"); request.getSession(true).setAttribute("auth", userns); ! return new AuthenticationTicketBuilder(request.getRequestURI()); } Index: AuthenticationTicket.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth/AuthenticationTicket.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AuthenticationTicket.java 2 Mar 2004 18:59:10 -0000 1.1 --- AuthenticationTicket.java 14 Apr 2004 23:44:28 -0000 1.2 *************** *** 14,21 **** import org.dom4j.QName; import org.neuclear.commons.NeuClearException; - import org.neuclear.commons.Utility; import org.neuclear.commons.time.TimeTools; ! import org.neuclear.id.*; ! import org.neuclear.xml.xmlsec.XMLSecurityException; import java.sql.Timestamp; --- 14,22 ---- import org.dom4j.QName; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.time.TimeTools; ! import org.neuclear.id.InvalidNamedObjectException; ! import org.neuclear.id.NamedObjectReader; ! import org.neuclear.id.SignedNamedCore; ! import org.neuclear.id.SignedNamedObject; import java.sql.Timestamp; *************** *** 35,50 **** * </auth:AuthenticationTicket> * </pre> ! * * @param core ! * @param requester ! * @param validto ! * @param siteurl */ ! private AuthenticationTicket(final SignedNamedCore core, final String requester, final Timestamp validto, final String siteurl) { super(core); this.validTo = validto.getTime(); this.siteurl = siteurl; - this.requester = requester; - } --- 36,48 ---- * </auth:AuthenticationTicket> * </pre> ! * * @param core ! * @param validto ! * @param siteurl */ ! private AuthenticationTicket(final SignedNamedCore core, final Timestamp validto, final String siteurl) { super(core); this.validTo = validto.getTime(); this.siteurl = siteurl; } *************** *** 77,92 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! final QName qelem=DocumentHelper.createQName(TAG_NAME,NS_NSAUTH); ! InvalidNamedObjectException.assertElementQName(core,elem,qelem); ! final QName qreq = DocumentHelper.createQName("requester", NS_NSAUTH); ! final String requester = InvalidNamedObjectException.assertAttributeQName(core,elem,qreq); final QName qsite = DocumentHelper.createQName("sitehref", NS_NSAUTH); ! final String sitehref = InvalidNamedObjectException.assertAttributeQName(core,elem,qsite); try { final QName qtime = DocumentHelper.createQName("validto", NS_NSAUTH); ! final Timestamp validto = TimeTools.parseTimeStamp(InvalidNamedObjectException.assertAttributeQName(core,elem,qtime)); ! return new AuthenticationTicket(core, requester, validto, sitehref); } catch (ParseException e) { ! throw new InvalidNamedObjectException(core.getName(),e.getLocalizedMessage()); } } --- 75,88 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! final QName qelem = DocumentHelper.createQName(TAG_NAME, NS_NSAUTH); ! InvalidNamedObjectException.assertElementQName(core, elem, qelem); final QName qsite = DocumentHelper.createQName("sitehref", NS_NSAUTH); ! final String sitehref = InvalidNamedObjectException.assertAttributeQName(core, elem, qsite); try { final QName qtime = DocumentHelper.createQName("validto", NS_NSAUTH); ! final Timestamp validto = TimeTools.parseTimeStamp(InvalidNamedObjectException.assertAttributeQName(core, elem, qtime)); ! return new AuthenticationTicket(core, validto, sitehref); } catch (ParseException e) { ! throw new InvalidNamedObjectException(core.getName(), e.getLocalizedMessage()); } } *************** *** 94,98 **** } - private final String requester; private final String siteurl; private final long validTo; --- 90,93 ---- |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/webapp Modified Files: index.jsp Log Message: Got the cactus tests working and the sample web app Index: index.jsp =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/webapp/index.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.jsp 1 Apr 2004 23:19:51 -0000 1.14 --- index.jsp 14 Apr 2004 23:44:46 -0000 1.15 *************** *** 5,13 **** org.neuclear.commons.servlets.ServletTools , org.neuclear.id.Identity, ! org.neuclear.id.resolver.Resolver"%> <% response.setHeader("Pragma","no-cache"); response.setDateHeader("Expires",0); ! Identity userns=(Identity) request.getUserPrincipal(); boolean loggedin=userns!=null; --- 5,14 ---- org.neuclear.commons.servlets.ServletTools , org.neuclear.id.Identity, ! org.neuclear.id.resolver.Resolver, ! org.neuclear.id.Signatory"%> <% response.setHeader("Pragma","no-cache"); response.setDateHeader("Expires",0); ! Signatory userns=(Signatory) request.getUserPrincipal(); boolean loggedin=userns!=null; *************** *** 24,28 **** <form action="Authorize" method="POST"> <table bgcolor="#FFFFE0"><tr><td valign="top"> ! <input name="identity" value="<%=(userns!=null)?userns.getName():""%>" type="text" size="30"> </td><td valign="top"> <input type="submit" name="submit" value="Login"> --- 25,29 ---- <form action="Authorize" method="POST"> <table bgcolor="#FFFFE0"><tr><td valign="top"> ! <input name="signer" value="<%=(userns!=null)?userns.getName():""%>" type="text" size="30"> </td><td valign="top"> <input type="submit" name="submit" value="Login"> |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790 Modified Files: project.properties project.xml Log Message: Got the cactus tests working and the sample web app Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/project.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** project.xml 23 Mar 2004 22:03:17 -0000 1.30 --- project.xml 14 Apr 2004 23:44:47 -0000 1.31 *************** *** 71,75 **** <id>neuclear-xmlsig</id> <name>neuclear-xmlsig</name> ! <version>0.12</version> <properties> <war.bundle>true</war.bundle> --- 71,75 ---- <id>neuclear-xmlsig</id> <name>neuclear-xmlsig</name> ! <version>0.13-SNAPSHOT</version> <properties> <war.bundle>true</war.bundle> *************** *** 80,84 **** <id>neuclear-commons</id> <name>neuclear-commons</name> ! <version>0.6</version> <properties> <war.bundle>true</war.bundle> --- 80,84 ---- <id>neuclear-commons</id> <name>neuclear-commons</name> ! <version>0.7-SNAPSHOT</version> <properties> <war.bundle>true</war.bundle> *************** *** 129,139 **** <version>1.0</version> </dependency> ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> <dependency> <id>javamail</id> --- 129,141 ---- <version>1.0</version> </dependency> ! <!-- ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! --> <dependency> <id>javamail</id> |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/receiver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test-cactus/org/neuclear/id/receiver Modified Files: MockReceiver.java ReceiverServletTest.java Log Message: Got the cactus tests working and the sample web app Index: ReceiverServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/receiver/ReceiverServletTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReceiverServletTest.java 2 Mar 2004 18:59:13 -0000 1.1 --- ReceiverServletTest.java 14 Apr 2004 23:44:46 -0000 1.2 *************** *** 3,11 **** import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; - import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.crypto.Base64; import org.neuclear.commons.crypto.signers.JCESigner; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.builders.AuthenticationTicketBuilder; import org.neuclear.xml.XMLException; --- 3,14 ---- import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; import org.neuclear.commons.NeuClearException; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.signers.JCESigner; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; + import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.id.builders.AuthenticationTicketBuilder; import org.neuclear.xml.XMLException; *************** *** 36,39 **** --- 39,45 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.1 2004/03/02 18:59:13 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 74,81 **** public void beginReceiveBase64(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test",signer); theRequest.setContentType("application/x-www-form-urlencoded"); ! String b64 =Base64.encode(ticket.getEncoded().getBytes()); theRequest.addParameter("neuclear-request", b64, "POST"); theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver", --- 80,87 ---- public void beginReceiveBase64(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://localhost"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer); theRequest.setContentType("application/x-www-form-urlencoded"); ! String b64 = Base64.encode(ticket.getEncoded().getBytes()); theRequest.addParameter("neuclear-request", b64, "POST"); theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver", *************** *** 83,89 **** } ! public void testReceiveBase64() throws ServletException, IOException { assertEquals(request.getContentType(), "application/x-www-form-urlencoded"); ! assertEquals(request.getMethod(),"POST"); ReceiverServlet servlet = new ReceiverServlet(); MockReceiver receiver = new MockReceiver(); --- 89,99 ---- } ! protected String getPublicKeyName(String alias) throws NonExistingSignerException { ! return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded())); ! } ! ! public void testReceiveBase64() throws ServletException, IOException, NonExistingSignerException { assertEquals(request.getContentType(), "application/x-www-form-urlencoded"); ! assertEquals(request.getMethod(), "POST"); ReceiverServlet servlet = new ReceiverServlet(); MockReceiver receiver = new MockReceiver(); *************** *** 92,111 **** servlet.service(request, response); assertNotNull(receiver.getLastReceived()); ! assertEquals(receiver.getLastReceived().getSignatory().getName(), "neu://bob@test"); } - public void beginReceiveSOAP(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException, IOException { ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://alice@test", "neu://test", "http://localhost"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test",signer); theRequest.setContentType("text/xml"); theRequest.setURL("http://users.neuclear.org", "/test", "/Service", null, null); ! theRequest.setUserData(new ByteArrayInputStream(ticket.getEncoded().getBytes())); ! } ! public void testReceiveSOAP() throws ServletException, IOException { assertEquals(request.getContentType(), "text/xml"); ! assertEquals(request.getMethod(),"POST"); ReceiverServlet servlet = new ReceiverServlet(); MockReceiver receiver = new MockReceiver(); --- 102,122 ---- servlet.service(request, response); assertNotNull(receiver.getLastReceived()); ! assertEquals(getPublicKeyName("neu://bob@test"), receiver.getLastReceived().getSignatory().getName()); } ! public void beginReceiveSOAP(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException, IOException { ! ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://localhost"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer); theRequest.setContentType("text/xml"); theRequest.setURL("http://users.neuclear.org", "/test", "/Service", null, null); ! theRequest.setUserData(new ByteArrayInputStream(ticket.getEncoded().getBytes())); ! } ! public void testReceiveSOAP() throws ServletException, IOException, NonExistingSignerException { assertEquals(request.getContentType(), "text/xml"); ! assertEquals(request.getMethod(), "POST"); ReceiverServlet servlet = new ReceiverServlet(); MockReceiver receiver = new MockReceiver(); *************** *** 114,120 **** servlet.service(request, response); assertNotNull(receiver.getLastReceived()); ! assertEquals(receiver.getLastReceived().getSignatory().getName(), "neu://alice@test"); } JCESigner signer; } --- 125,132 ---- servlet.service(request, response); assertNotNull(receiver.getLastReceived()); ! assertEquals(getPublicKeyName("neu://bob@test"), receiver.getLastReceived().getSignatory().getName()); } + JCESigner signer; } Index: MockReceiver.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/receiver/MockReceiver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MockReceiver.java 2 Mar 2004 18:59:13 -0000 1.1 --- MockReceiver.java 14 Apr 2004 23:44:46 -0000 1.2 *************** *** 2,11 **** import org.neuclear.commons.NeuClearException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; - import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.builders.AuthenticationTicketBuilder; - import org.neuclear.xml.ElementProxy; /* --- 2,10 ---- import org.neuclear.commons.NeuClearException; + import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.builders.AuthenticationTicketBuilder; /* *************** *** 29,32 **** --- 28,34 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.1 2004/03/02 18:59:13 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 53,66 **** public MockReceiver() { try { ! signer=new TestCaseSigner(); } catch (InvalidPassphraseException e) { throw new RuntimeException(e); } } /** * Add your main transaction processing logic within this method. * Remember you must check the validity of the SignedNamedObject here. Until you do so * you can not trust it. ! * * @param obj * @throws UnsupportedTransaction --- 55,69 ---- public MockReceiver() { try { ! signer = new TestCaseSigner(); } catch (InvalidPassphraseException e) { throw new RuntimeException(e); } } + /** * Add your main transaction processing logic within this method. * Remember you must check the validity of the SignedNamedObject here. Until you do so * you can not trust it. ! * * @param obj * @throws UnsupportedTransaction *************** *** 68,72 **** public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException { received = obj; ! return new AuthenticationTicketBuilder("neu://test", obj.getName(), "http://localhost").convert("neu://bob@test",signer);//Just some dummy } --- 71,75 ---- public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException { received = obj; ! return new AuthenticationTicketBuilder("http://localhost").convert("neu://bob@test", signer);//Just some dummy } *************** *** 74,77 **** --- 77,81 ---- return received; } + private Signer signer; private SignedNamedObject received = null; |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test-cactus/org/neuclear/id/auth Modified Files: AuthenticationFilterTest.java AuthenticationServletTest.java Log Message: Got the cactus tests working and the sample web app Index: AuthenticationServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth/AuthenticationServletTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AuthenticationServletTest.java 1 Apr 2004 23:19:51 -0000 1.2 --- AuthenticationServletTest.java 14 Apr 2004 23:44:46 -0000 1.3 *************** *** 6,15 **** import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.commons.crypto.Base64; import org.neuclear.commons.crypto.signers.JCESigner; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; - import org.neuclear.id.resolver.Resolver; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; --- 6,18 ---- import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.signers.JCESigner; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; + import org.neuclear.id.Identity; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; *************** *** 41,44 **** --- 44,50 ---- $Id$ $Log$ + Revision 1.3 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.2 2004/04/01 23:19:51 pelle Split Identity into Signatory and Identity class. *************** *** 99,108 **** assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(sigreq.getSignatory().getName(), "neu://test"); assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); ! assertEquals(sigreq.getUserid(), "neu://bob@test"); ! assertEquals(Resolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction()); } JCESigner signer; --- 105,118 ---- assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(getPublicKeyName("neu://test"), sigreq.getSignatory().getName()); assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); ! assertEquals(Identity.DEFAULT_SIGNER, forms[0].getAction()); } + protected String getPublicKeyName(String alias) throws NonExistingSignerException { + return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded())); + } + + JCESigner signer; Index: AuthenticationFilterTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth/AuthenticationFilterTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AuthenticationFilterTest.java 2 Mar 2004 18:59:13 -0000 1.1 --- AuthenticationFilterTest.java 14 Apr 2004 23:44:46 -0000 1.2 *************** *** 4,8 **** --- 4,11 ---- import org.apache.cactus.WebRequest; import org.neuclear.commons.NeuClearException; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignedNamedObject; *************** *** 35,38 **** --- 38,44 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.1 2004/03/02 18:59:13 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 63,68 **** public void beginValid(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost"); ! SignedNamedObject signed = authreq.convert("neu://bob@test",signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); --- 69,74 ---- public void beginValid(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost"); ! SignedNamedObject signed = authreq.convert("neu://bob@test", signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); *************** *** 81,85 **** ServletResponse theResponse) throws IOException, ServletException { assertNotNull(request.getUserPrincipal()); ! assertEquals("neu://bob@test", request.getUserPrincipal().getName()); } --- 87,96 ---- ServletResponse theResponse) throws IOException, ServletException { assertNotNull(request.getUserPrincipal()); ! try { ! assertEquals(Base32.encode(CryptoTools.digest(signer.getPublicKey("neu://bob@test").getEncoded())), request.getUserPrincipal().getName()); ! } catch (NonExistingSignerException e) { ! e.printStackTrace(); ! assertTrue(false); ! } } *************** *** 96,100 **** public void beginUnsigned(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost"); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = XMLSecTools.encodeElementBase64(authreq); --- 107,111 ---- public void beginUnsigned(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost"); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = XMLSecTools.encodeElementBase64(authreq); |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test/org/neuclear/id Modified Files: IdentityTests.java NeuClearBenchmark.java SignedNamedCoreTest.java Log Message: Got the cactus tests working and the sample web app Index: SignedNamedCoreTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SignedNamedCoreTest.java 1 Apr 2004 23:19:51 -0000 1.9 --- SignedNamedCoreTest.java 14 Apr 2004 23:44:46 -0000 1.10 *************** *** 33,36 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.10 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.9 2004/04/01 23:19:51 pelle Split Identity into Signatory and Identity class. *************** *** 93,97 **** assertNotNull(bobx); assertNotNull(bobx.getName()); ! System.out.println(bobx.getName()); assertNotNull(bobx.getPublicKey()); } --- 96,100 ---- assertNotNull(bobx); assertNotNull(bobx.getName()); ! // System.out.println(bobx.getName()); assertNotNull(bobx.getPublicKey()); } *************** *** 99,108 **** public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException { final String name = "neu://bob@test"; ! final Builder builder = new AuthenticationTicketBuilder(name, "neu://test", "http://slashdot.org"); ! System.out.println("====="); ! System.out.println(builder.asXML()); builder.sign(name, signer); ! System.out.println(builder.asXML()); assertTrue(builder.verify()); --- 102,111 ---- public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException { final String name = "neu://bob@test"; ! final Builder builder = new AuthenticationTicketBuilder("http://slashdot.org"); ! // System.out.println("====="); ! // System.out.println(builder.asXML()); builder.sign(name, signer); ! // System.out.println(builder.asXML()); assertTrue(builder.verify()); Index: NeuClearBenchmark.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NeuClearBenchmark.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NeuClearBenchmark.java 3 Mar 2004 23:26:44 -0000 1.4 --- NeuClearBenchmark.java 14 Apr 2004 23:44:46 -0000 1.5 *************** *** 1,8 **** package org.neuclear.id; - import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.builders.AuthenticationTicketBuilder; --- 1,8 ---- package org.neuclear.id; import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; + import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.id.builders.AuthenticationTicketBuilder; *************** *** 14,30 **** * To change this template use Options | File Templates. */ ! public class NeuClearBenchmark implements Runnable{ private static final int RUNS = 100; private static final int THREADS = 10; public NeuClearBenchmark() throws InvalidPassphraseException { ! signer=new TestCaseSigner(); } ! public static void main(String args[]){ try { ! NeuClearBenchmark bench=new NeuClearBenchmark(); bench.startTimer(); ! for (int i=0;i<THREADS;i++) new Thread(bench).start(); --- 14,31 ---- * To change this template use Options | File Templates. */ ! public class NeuClearBenchmark implements Runnable { private static final int RUNS = 100; private static final int THREADS = 10; public NeuClearBenchmark() throws InvalidPassphraseException { ! signer = new TestCaseSigner(); } ! ! public static void main(String args[]) { try { ! NeuClearBenchmark bench = new NeuClearBenchmark(); bench.startTimer(); ! for (int i = 0; i < THREADS; i++) new Thread(bench).start(); *************** *** 35,57 **** } ! public void startTimer(){ ! start=System.currentTimeMillis(); ! startMemory=Runtime.getRuntime().totalMemory(); } - long start=0; - long end=0; - long startMemory=0; - long endMemory=0; ! public synchronized void finished(){ ! if (++count==THREADS) { ! long end=System.currentTimeMillis(); ! long endMemory=Runtime.getRuntime().totalMemory(); //long postGC=Ru ! System.out.println("Amount of runs:"+RUNS*THREADS); ! System.out.println("Total Time: "+(end-start)/1000+" seconds"); ! System.out.println("Time per Transaction: "+(end-start)/(THREADS+RUNS)+" ms."); ! System.out.println("Memory Increase: "+(endMemory-startMemory)); ! System.out.println("Memory Increase per Transaction: "+(endMemory-startMemory)/(THREADS+RUNS)); notifyAll(); } --- 36,59 ---- } ! public void startTimer() { ! start = System.currentTimeMillis(); ! startMemory = Runtime.getRuntime().totalMemory(); } ! long start = 0; ! long end = 0; ! long startMemory = 0; ! long endMemory = 0; ! ! public synchronized void finished() { ! if (++count == THREADS) { ! long end = System.currentTimeMillis(); ! long endMemory = Runtime.getRuntime().totalMemory(); //long postGC=Ru ! System.out.println("Amount of runs:" + RUNS * THREADS); ! System.out.println("Total Time: " + (end - start) / 1000 + " seconds"); ! System.out.println("Time per Transaction: " + (end - start) / (THREADS + RUNS) + " ms."); ! System.out.println("Memory Increase: " + (endMemory - startMemory)); ! System.out.println("Memory Increase per Transaction: " + (endMemory - startMemory) / (THREADS + RUNS)); notifyAll(); } *************** *** 59,68 **** } ! public void run() { try { ! for (int i=0;i<RUNS;i++) { ! AuthenticationTicketBuilder builder=new AuthenticationTicketBuilder("neu://alice@test","neu://test","http://test.com"); ! AuthenticationTicket ticket=(AuthenticationTicket) builder.convert("neu://bob@test",signer); } finished(); --- 61,71 ---- } ! ! public void run() { try { ! for (int i = 0; i < RUNS; i++) { ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://test.com"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer); } finished(); *************** *** 71,75 **** } } private Signer signer; ! private int count=0; } --- 74,79 ---- } } + private Signer signer; ! private int count = 0; } Index: IdentityTests.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** IdentityTests.java 1 Apr 2004 23:19:51 -0000 1.9 --- IdentityTests.java 14 Apr 2004 23:44:46 -0000 1.10 *************** *** 38,44 **** Identity id = (Identity) obj; assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! obj.getName().substring(5, 37)); assertEquals(new String(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! new String(Base32.decode(obj.getName().substring(5, 37)))); assertEquals(id.getSigner(), SIGNER); assertNotNull(id.getSignatory().getPublicKey()); --- 38,44 ---- Identity id = (Identity) obj; assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! obj.getName().substring(4, 36)); assertEquals(new String(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! new String(Base32.decode(obj.getName().substring(4, 36)))); assertEquals(id.getSigner(), SIGNER); assertNotNull(id.getSignatory().getPublicKey()); *************** *** 58,63 **** assertNotNull(id); assertNotNull(id.getName()); ! assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5)); assertEquals(kp.getPublic(), id.getPublicKey()); --- 58,63 ---- assertNotNull(id); assertNotNull(id.getName()); ! // assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName()); assertEquals(kp.getPublic(), id.getPublicKey()); *************** *** 72,77 **** SignedNamedObject obj = VerifyingReader.getInstance().read(elem); System.out.println("Name: " + obj.getName()); ! assertEquals("sha1:", obj.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(5, 37)); assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32)); --- 72,77 ---- SignedNamedObject obj = VerifyingReader.getInstance().read(elem); System.out.println("Name: " + obj.getName()); ! // assertEquals("sha1:", obj.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(4, 36)); assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32)); *************** *** 80,85 **** assertNotNull(id); assertNotNull(id.getName()); ! assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5)); assertEquals(kp.getPublic(), id.getPublicKey()); --- 80,85 ---- assertNotNull(id); assertNotNull(id.getName()); ! // assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName()); assertEquals(kp.getPublic(), id.getPublicKey()); |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/signers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test-cactus/org/neuclear/id/signers Modified Files: SigningServletTest.java Log Message: Got the cactus tests working and the sample web app Index: SigningServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/signers/SigningServletTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SigningServletTest.java 2 Mar 2004 18:59:13 -0000 1.1 --- SigningServletTest.java 14 Apr 2004 23:44:46 -0000 1.2 *************** *** 4,15 **** import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; - import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.commons.crypto.Base64; import org.neuclear.commons.crypto.signers.JCESigner; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.builders.AuthenticationTicketBuilder; import org.neuclear.id.builders.SignatureRequestBuilder; --- 4,18 ---- import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.signers.JCESigner; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; + import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.id.builders.AuthenticationTicketBuilder; import org.neuclear.id.builders.SignatureRequestBuilder; *************** *** 43,46 **** --- 46,52 ---- $Id$ $Log$ + Revision 1.2 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.1 2004/03/02 18:59:13 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 97,103 **** public void beginSign(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost"); ! SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://bob@test", authreq, "test"); ! SignedNamedObject signed = sigreq.convert("neu://test",signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); --- 103,109 ---- public void beginSign(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost"); ! SignatureRequestBuilder sigreq = new SignatureRequestBuilder(authreq, "test"); ! SignedNamedObject signed = sigreq.convert("neu://test", signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); *************** *** 137,143 **** public void beginSignatureRequest(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost"); ! SignatureRequestBuilder sigreq = new SignatureRequestBuilder( "neu://bob@test", authreq, "test"); ! SignedNamedObject signed = sigreq.convert("neu://test",signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); --- 143,149 ---- public void beginSignatureRequest(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException { ! AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost"); ! SignatureRequestBuilder sigreq = new SignatureRequestBuilder(authreq, "test"); ! SignedNamedObject signed = sigreq.convert("neu://test", signer); theRequest.setContentType("application/x-www-form-urlencoded"); String b64 = Base64.encode(signed.getEncoded().getBytes()); *************** *** 169,173 **** assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(sigreq.getSignatory().getName(), "neu://test"); assertTrue(forms[0].hasParameterNamed("endpoint")); assertEquals("http://localhost", forms[0].getParameterValue("endpoint")); --- 175,179 ---- assertTrue(obj instanceof SignatureRequest); SignatureRequest sigreq = (SignatureRequest) obj; ! assertEquals(getPublicKeyName("neu://test"), sigreq.getSignatory().getName()); assertTrue(forms[0].hasParameterNamed("endpoint")); assertEquals("http://localhost", forms[0].getParameterValue("endpoint")); *************** *** 175,178 **** --- 181,188 ---- } + protected String getPublicKeyName(String alias) throws NonExistingSignerException { + return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded())); + } + JCESigner signer; } |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:54
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/jce In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test/org/neuclear/id/jce Removed Files: NeuClearJCETest.java Log Message: Got the cactus tests working and the sample web app --- NeuClearJCETest.java DELETED --- |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:54
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test/org/neuclear/id/builders Modified Files: AuthenticationBuilderTest.java SigningRequestBuilderTest.java Log Message: Got the cactus tests working and the sample web app Index: SigningRequestBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SigningRequestBuilderTest.java 22 Mar 2004 20:09:49 -0000 1.13 --- SigningRequestBuilderTest.java 14 Apr 2004 23:44:45 -0000 1.14 *************** *** 29,32 **** --- 29,35 ---- $Id$ $Log$ + Revision 1.14 2004/04/14 23:44:45 pelle + Got the cactus tests working and the sample web app + Revision 1.13 2004/03/22 20:09:49 pelle Added simple ledger for unit testing and in memory use *************** *** 117,122 **** protected Builder createBuilder() throws Exception { ! final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080"); ! return new SignatureRequestBuilder("neu://bob@test", authreq, "For testing purposes"); } --- 120,125 ---- protected Builder createBuilder() throws Exception { ! final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://users.neuclear.org:8080"); ! return new SignatureRequestBuilder(authreq, "For testing purposes"); } Index: AuthenticationBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/AuthenticationBuilderTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AuthenticationBuilderTest.java 22 Mar 2004 20:09:49 -0000 1.10 --- AuthenticationBuilderTest.java 14 Apr 2004 23:44:45 -0000 1.11 *************** *** 29,32 **** --- 29,35 ---- $Id$ $Log$ + Revision 1.11 2004/04/14 23:44:45 pelle + Got the cactus tests working and the sample web app + Revision 1.10 2004/03/22 20:09:49 pelle Added simple ledger for unit testing and in memory use *************** *** 97,101 **** protected Builder createBuilder() throws Exception { ! return new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080"); } --- 100,104 ---- protected Builder createBuilder() throws Exception { ! return new AuthenticationTicketBuilder("http://users.neuclear.org:8080"); } |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:53
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/java/org/neuclear/id Modified Files: SignatureRequest.java Log Message: Got the cactus tests working and the sample web app Index: SignatureRequest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SignatureRequest.java 22 Mar 2004 20:09:49 -0000 1.15 --- SignatureRequest.java 14 Apr 2004 23:44:45 -0000 1.16 *************** *** 27,30 **** --- 27,33 ---- $Id$ $Log$ + Revision 1.16 2004/04/14 23:44:45 pelle + Got the cactus tests working and the sample web app + Revision 1.15 2004/03/22 20:09:49 pelle Added simple ledger for unit testing and in memory use *************** *** 120,134 **** */ public final class SignatureRequest extends SignedNamedObject { ! private SignatureRequest(final SignedNamedCore core, final String userid, final Builder unsigned, final String description) { super(core); - this.userid = userid; this.unsigned = unsigned; this.description = description; } - public final String getUserid() { - return userid; - } - public final Builder getUnsigned() { return (Builder) unsigned.clone(); --- 123,132 ---- */ public final class SignatureRequest extends SignedNamedObject { ! private SignatureRequest(final SignedNamedCore core, final Builder unsigned, final String description) { super(core); this.unsigned = unsigned; this.description = description; } public final Builder getUnsigned() { return (Builder) unsigned.clone(); *************** *** 149,153 **** InvalidNamedObjectException.assertElementQName(core, elem, createNEUIDQName(SIGREQUEST_TAG)); final Element request = InvalidNamedObjectException.assertContainsElementQName(core, elem, createNEUIDQName("Unsigned")); - final String userid = InvalidNamedObjectException.assertAttributeQName(core, elem, createNEUIDQName("userid")); final Element uelem = ((Element) request.elements().get(0)).createCopy(); final Document doc = DocumentHelper.createDocument(uelem); --- 147,150 ---- *************** *** 159,163 **** description = descrelem.getText(); ! return new SignatureRequest(core, userid, unsigned, description); } catch (XMLSecurityException e) { throw new InvalidNamedObjectException(core.getName(), e); --- 156,160 ---- description = descrelem.getText(); ! return new SignatureRequest(core, unsigned, description); } catch (XMLSecurityException e) { throw new InvalidNamedObjectException(core.getName(), e); *************** *** 168,172 **** } - private final String userid; private final Builder unsigned; private final String description; --- 165,168 ---- |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:53
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/java/org/neuclear/tests Modified Files: AbstractObjectCreationTest.java AbstractSigningTest.java Log Message: Got the cactus tests working and the sample web app Index: AbstractObjectCreationTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractObjectCreationTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AbstractObjectCreationTest.java 2 Apr 2004 16:59:04 -0000 1.6 --- AbstractObjectCreationTest.java 14 Apr 2004 23:44:45 -0000 1.7 *************** *** 25,29 **** // System.out.println(builder.asXML()); assertNotNull(builder); ! SignedNamedObject obj = builder.convert(NAME, getSigner()); assertNotNull(obj); assertEquals(getRequiredClass(), obj.getClass()); --- 25,29 ---- // System.out.println(builder.asXML()); assertNotNull(builder); ! SignedNamedObject obj = builder.convert(getSignersAlias(), getSigner()); assertNotNull(obj); assertEquals(getRequiredClass(), obj.getClass()); *************** *** 31,34 **** --- 31,38 ---- } + protected String getSignersAlias() { + return NAME; + } + protected void assertEquals(byte a[], byte b[]) { if (a == null && b == null) *************** *** 51,54 **** protected abstract Builder createBuilder() throws Exception; ! public static final String NAME = "neu://test"; } --- 55,58 ---- protected abstract Builder createBuilder() throws Exception; ! protected static final String NAME = "neu://test"; } Index: AbstractSigningTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractSigningTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AbstractSigningTest.java 12 Apr 2004 19:27:27 -0000 1.8 --- AbstractSigningTest.java 14 Apr 2004 23:44:45 -0000 1.9 *************** *** 3,8 **** --- 3,10 ---- import junit.framework.TestCase; import org.neuclear.commons.NeuClearException; + import org.neuclear.commons.crypto.Base32; import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.signers.JCESigner; + import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.Signatory; *************** *** 31,34 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.9 2004/04/14 23:44:45 pelle + Got the cactus tests working and the sample web app + Revision 1.8 2004/04/12 19:27:27 pelle Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests. *************** *** 90,93 **** --- 95,102 ---- } + protected String getPublicKeyName(String alias) throws NonExistingSignerException { + return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded())); + } + /** * Handy Test User always available |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:40:08
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2953/src/java/org/neuclear/commons/crypto/signers Modified Files: ServletSignerFactory.java Added Files: testkeys.jks Log Message: Fixed a few things in the ServletSignerFactory Added testkeys.jks where it should be. Index: ServletSignerFactory.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/ServletSignerFactory.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ServletSignerFactory.java 14 Apr 2004 00:10:52 -0000 1.10 --- ServletSignerFactory.java 14 Apr 2004 23:39:57 -0000 1.11 *************** *** 49,56 **** return (Signer) map.get(hash); final PassPhraseAgent coreagent = getAgent(agenttype); final PassPhraseAgent agent = createWrapperAgent(keeppassphrase, coreagent, serviceid); // If keystore is "test" setup the TestCaseSigner otherwise use the JCESigner ! final Signer signer = createSigner(keystore, (InteractiveAgent) agent); map.put(hash, signer); return signer; --- 49,57 ---- return (Signer) map.get(hash); + System.out.println("using keystore: " + keystore); final PassPhraseAgent coreagent = getAgent(agenttype); final PassPhraseAgent agent = createWrapperAgent(keeppassphrase, coreagent, serviceid); // If keystore is "test" setup the TestCaseSigner otherwise use the JCESigner ! final Signer signer = createSigner(keystore, agent); map.put(hash, signer); return signer; *************** *** 63,67 **** } ! private static final BrowsableSigner createSigner(final String keystore, final InteractiveAgent agent) throws GeneralSecurityException, NeuClearException, FileNotFoundException { if (!Utility.isEmpty(keystore)) { if (keystore.toLowerCase().equals("test")) --- 64,68 ---- } ! private static final BrowsableSigner createSigner(final String keystore, final PassPhraseAgent agent) throws GeneralSecurityException, NeuClearException, FileNotFoundException { if (!Utility.isEmpty(keystore)) { if (keystore.toLowerCase().equals("test")) *************** *** 71,75 **** return new JCESigner(keystore, "jks", "SUN", agent); } ! return new DefaultSigner(agent); } --- 72,78 ---- return new JCESigner(keystore, "jks", "SUN", agent); } ! if (agent instanceof InteractiveAgent) ! return new DefaultSigner((InteractiveAgent) agent); ! throw new NeuClearException("DefaultSigner requires an interactive agent"); } --- NEW FILE: testkeys.jks --- (This appears to be a binary file; contents omitted.) |
|
From: Pelle B. <pe...@us...> - 2004-04-14 23:40:06
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2953/src/java/org/neuclear/commons/crypto/passphraseagents/swing Modified Files: KeyStoreDialog.java Log Message: Fixed a few things in the ServletSignerFactory Added testkeys.jks where it should be. Index: KeyStoreDialog.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/KeyStoreDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** KeyStoreDialog.java 14 Apr 2004 00:10:51 -0000 1.4 --- KeyStoreDialog.java 14 Apr 2004 23:39:57 -0000 1.5 *************** *** 33,36 **** --- 33,40 ---- $Id$ $Log$ + Revision 1.5 2004/04/14 23:39:57 pelle + Fixed a few things in the ServletSignerFactory + Added testkeys.jks where it should be. + Revision 1.4 2004/04/14 00:10:51 pelle Added a MessageLabel for handling errors, validation and info *************** *** 337,340 **** --- 341,345 ---- message.error(e); } + KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwner(); } |
|
From: Pelle B. <pe...@us...> - 2004-04-14 21:55:06
|
Update of /cvsroot/neuclear/neuclear-commons/src/testdata/keys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14902 Modified Files: testkeys.jks Log Message: Updated test keys with new identities Index: testkeys.jks =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/testdata/keys/testkeys.jks,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsbgq1iy and /tmp/cvsG4MByM differ |
570 messages has been excluded from this view by a project administrator.
