- automatic test for voting

- signed messages

11 files changed, 198 insertions, 14 deletions

diff --git a/src/main/java/org/gnunet/mesh/Mesh.java b/src/main/java/org/gnunet/mesh/Mesh.java
index ad6686d..6f8f4b3 100644
--- a/src/main/java/org/gnunet/mesh/Mesh.java
+++ b/src/main/java/org/gnunet/mesh/Mesh.java
@@ -320,13 +320,17 @@ public class Mesh {
         this.ports = ports;
         this.inboundTunnelHandler = inboundTunnelHandler;
 
-        logger.debug("mesh handle created");
-
         client = new Client("mesh", cfg);
         client.installReceiver(new MeshMessageReceiver());
         ClientConnectMessage ccm = new ClientConnectMessage();
         ccm.applicationList = ports;
+        String portList = "";
+        for (int p : ports) {
+            portList += "" + p + " ";
+        }
         client.send(ccm);
+
+        logger.debug("mesh handle created, listening on ports {}", portList);
     }
 
     /**
@@ -345,6 +349,11 @@ public class Mesh {
         return new Tunnel<T>(peer, port, nobuffer, reliable, initialContext);
     }
 
+    public <T> Tunnel<T> createTunnel(PeerIdentity peer, int port, boolean nobuffer, boolean reliable) {
+        logger.debug("creating tunnel to peer {} over port {}", peer.toString(), port);
+        return new Tunnel<T>(peer, port, nobuffer, reliable, null);
+    }
+
     /**
      * Disconnect from the mesh service.
      * All tunnels will be destroyed.
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java
index 512ed01..083d343 100644
--- a/src/main/java/org/gnunet/util/RelativeTime.java
+++ b/src/main/java/org/gnunet/util/RelativeTime.java
@@ -210,7 +210,6 @@ public final class RelativeTime implements Comparable<RelativeTime> {
 
 
 
-
     public RelativeTimeMessage toNetwork() {
         long rval = this.rel_value_us;
         assert rval >= 0;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
index dca60b2..43bd55a 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
@@ -23,7 +23,17 @@ public class EcdsaPrivateKey implements Message {
     }
 
     public EcdsaPublicKey getPublicKey() {
-        return EcdsaPublicKey.random();
+        // FIXME: this is not the real implementation,
+        // beware that this dummy implementation leaks the key!
+        EcdsaPublicKey publicKey = new EcdsaPublicKey();
+        byte[] v = new byte[32];
+        System.arraycopy(d, 0, v, 0, 8);
+        System.arraycopy(d, 0, v, 8, 8);
+        System.arraycopy(d, 0, v, 16, 8);
+        System.arraycopy(d, 0, v, 24, 8);
+        System.arraycopy(v, 0, publicKey.x, 0, 32);
+        System.arraycopy(v, 0, publicKey.y, 0, 32);
+        return publicKey;
     }
 
     public static EcdsaPrivateKey createRandom() {
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
index 1589b67..b668a3f 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
@@ -48,7 +48,7 @@ public class EcdsaSignature implements Message {
         this.s = new byte[32];
     }
 
-    public boolean verify(byte[] m, int purpose, EddsaPublicKey publicKey) {
+    public boolean verify(byte[] m, int purpose, EcdsaPublicKey publicKey) {
         return false;
     }
 
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
new file mode 100644
index 0000000..0cb293a
--- /dev/null
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
@@ -0,0 +1,60 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util.crypto;
+
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+
+/**
+ * A message together with a signature on the message and it's purpose.
+ */
+public class EcdsaSignedMessage<M extends Message> implements Message {
+    @NestedMessage
+    public EcdsaSignature signature;
+    @UInt32
+    public int purpose;
+    @NestedMessage
+    public M innerMessage;
+
+    public EcdsaSignedMessage() {
+        // empty constructor required by org.gnunet.construct
+    }
+
+    public boolean verify(EcdsaPublicKey signerPublicKey) {
+        return signature.verify(Construct.toBinary(innerMessage), purpose, signerPublicKey);
+    }
+
+    public static <T extends Message> EcdsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EcdsaPrivateKey privateKey, EcdsaPublicKey publicKey) {
+        EcdsaSignedMessage<T> esm = new EcdsaSignedMessage<T>();
+        esm.purpose = purpose;
+        esm.innerMessage = innerMessage;
+        esm.signature = privateKey.sign(purpose, Construct.toBinary(innerMessage));
+        return esm;
+    }
+
+    public static <T extends Message> EcdsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EcdsaPrivateKey privateKey) {
+        return signMessage(innerMessage, purpose, privateKey, privateKey.getPublicKey());
+    }
+}
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
index 973706f..21aa647 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
@@ -13,6 +13,10 @@ public class EddsaPrivateKey implements Message {
     @FixedSizeIntegerArray(bitSize = 8, signed = false, length = 32)
     public byte[] d;
 
+    public EddsaSignature sign(int purpose, byte[] m) {
+        return sign(getPublicKey(), purpose, m);
+    }
+
     public EddsaSignature sign(EddsaPublicKey publicKey, int purpose, byte[] m) {
         MessageDigest sha512;
         try {
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
new file mode 100644
index 0000000..27f969a
--- /dev/null
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
@@ -0,0 +1,80 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util.crypto;
+
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+
+/**
+ * A message together with a signature on the message and it's purpose.
+ */
+public class EddsaSignedMessage<M extends Message> implements Message {
+    @NestedMessage
+    public EddsaSignature signature;
+    @UInt32
+    public int purpose;
+    @NestedMessage
+    public M innerMessage;
+
+    public EddsaSignedMessage() {
+        // empty constructor required by org.gnunet.construct
+    }
+
+    public boolean verify(EddsaPublicKey signerPublicKey) {
+        return signature.verify(Construct.toBinary(innerMessage), purpose, signerPublicKey);
+    }
+
+    public static <T extends Message> EddsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EddsaPrivateKey privateKey, EddsaPublicKey publicKey) {
+        EddsaSignedMessage<T> esm = new EddsaSignedMessage<T>();
+        esm.purpose = purpose;
+        esm.innerMessage = innerMessage;
+        esm.signature = privateKey.sign(publicKey, purpose, Construct.toBinary(innerMessage));
+        return esm;
+    }
+
+    public static <T extends Message> EddsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EddsaPrivateKey privateKey) {
+        return signMessage(innerMessage, purpose, privateKey, privateKey.getPublicKey());
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
index 852acc6..72d444f 100644
--- a/src/main/java/org/gnunet/voting/Ballot.java
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -418,6 +418,8 @@ public class Ballot {
                 buf.append(" ");
             }
             buf.append("\n");
+        } else {
+            buf.append("ballot not registered");
         }
         if (!confirmationSigs.isEmpty()) {
             buf.append("ballot's vote has been submitted to with the following authorities:\n");
@@ -428,7 +430,7 @@ public class Ballot {
             buf.append("\n");
         }
         else {
-            buf.append("ballot not registered\n");
+            buf.append("ballot not submitted\n");
         }
         if (choiceId != -1) {
             buf.append("choice selected\n");
@@ -529,9 +531,12 @@ public class Ballot {
         if (this.groupCert != null) {
             throw new InvalidBallotException("ballot already has group information");
         }
+        // FIXME: add this check again once the crypto is in sync
+        /*
         if (voterPub != null && !groupCert.getMemberPublicKey().equals(voterPub)) {
             throw new InvalidBallotException("group and voter public key do not match");
         }
+        */
         voterPub = groupCert.getMemberPublicKey();
         this.groupCert = groupCert;
     }
diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index 23e7f4a..4883acc 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -241,7 +241,7 @@ public class BallotTool extends Program {
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("registering ballot with authority " + currentAuthority.toString());
             mesh = new Mesh(getConfiguration(), new BallotTunnelEndHandler(), new BallotRegisterReceiver());
-            tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
             BallotRegisterRequestMessage m = new BallotRegisterRequestMessage();
             CompressedConfig ccfg = new CompressedConfig(ballot.toConfiguration());
             m.compressedBallotConfig = ccfg.compressedData;
@@ -250,7 +250,8 @@ public class BallotTool extends Program {
         }
         if (issue) {
             if (null == ego) {
-                System.out.println("no ego given");
+                System.err.println("no ego given");
+                setReturnValue(1);
                 return;
             }
             ballot.issue(ego.getPrivateKey());
@@ -259,7 +260,8 @@ public class BallotTool extends Program {
         }
         if (select != null) {
             if (null == ego) {
-                System.out.println("no ego given");
+                System.err.println("no ego given");
+                setReturnValue(1);
                 return;
             }
             ballot.encodeChoice(select, ego.getPrivateKey());
@@ -301,6 +303,7 @@ public class BallotTool extends Program {
             List<PeerIdentity> remainingAuthorities = ballot.getAuthorities();
             if (remainingAuthorities.isEmpty()) {
                 System.err.println("no authorities available");
+                setReturnValue(2);
                 return;
             }
             Random r = new Random();
@@ -358,6 +361,7 @@ public class BallotTool extends Program {
 
     public static void main(String args[]) {
         Program tool = new BallotTool(args);
-        tool.start();
+        int ret = tool.start();
+        System.exit(ret);
     }
 }
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
index 6ae2860..7ae5846 100644
--- a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
+++ b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
@@ -107,6 +107,7 @@ public class TallyAuthorityDaemon extends Program {
 
         @Override
         public void onDone() {
+            System.out.println("got element from consensus");
             electionState.consensusDone = true;
             electionState.consensus.destroy();
             electionState.consensus = null;
@@ -151,7 +152,7 @@ public class TallyAuthorityDaemon extends Program {
                         + electionState.ballot.startTime.toFancyString() + ", now "
                         + AbsoluteTime.now().toFancyString() + ")";
                 getSender().send(fm);
-            } else if (!electionState.ballot.closingTime.isDue()) {
+            } else if (electionState.ballot.closingTime.isDue()) {
                 SubmitFailureMessage fm = new SubmitFailureMessage();
                 fm.reason = "too late to submit vote";
                 getSender().send(fm);
@@ -196,15 +197,17 @@ public class TallyAuthorityDaemon extends Program {
             ElectionState electionState = new ElectionState();
             electionState.tally = new int[b.choices.size()];
             electionState.ballot = b;
+            PeerIdentity[] ids = new PeerIdentity[b.getAuthorities().size()];
+            ids = b.getAuthorities().toArray(ids);
             electionState.consensus = new Consensus(getConfiguration(),
-                    (PeerIdentity[]) b.getAuthorities().toArray(),
+                    ids,
                     b.getBallotGuid());
 
             ConsensusConcludeTask t = new ConsensusConcludeTask(electionState);
             if (b.concludeTime.isDue()) {
                 Scheduler.add(t);
             } else {
-                Scheduler.addDelayed(b.concludeTime.getRemaining(), t);
+                Scheduler.addDelayed(b.closingTime.getRemaining(), t);
             }
             elections.put(guid, electionState);
             BallotRegisterSuccessMessage rm = new BallotRegisterSuccessMessage();
@@ -220,7 +223,12 @@ public class TallyAuthorityDaemon extends Program {
                 rm.reason = "no matching ballot found";
                 getSender().send(rm);
             } else {
-                if (electionState.ballot.queryTime.isDue()) {
+                if (!electionState.consensusDone) {
+                    QueryFailureMessage rm = new QueryFailureMessage();
+                    rm.reason = "consensus not finished (sorry...)";
+                    getSender().send(rm);
+                }
+                else if (electionState.ballot.queryTime.isDue()) {
                     QueryResponseMessage rm = new QueryResponseMessage();
                     rm.results = electionState.tally;
                     getSender().send(rm);
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
index 6e5a345..3409e2b 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
@@ -21,12 +21,17 @@
 package org.gnunet.voting.messages;
 
 
+import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.crypto.EcdsaSignedMessage;
 
 @UnionCase(42010)
 public class SubmitFailureMessage implements GnunetMessage.Body {
     @ZeroTerminatedString
     public String reason;
+    @NestedMessage(optional = true)
+    public EcdsaSignedMessage<AbsoluteTimeMessage> authorityTime;
 }