1 files changed, 200 insertions, 20 deletions

diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
index 49f1465..0d8de27 100644
--- a/src/main/java/org/gnunet/voting/Ballot.java
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -24,7 +24,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Maps;
+import com.google.common.primitives.Longs;
 import org.gnunet.util.*;
 
 import java.security.MessageDigest;
@@ -38,18 +38,22 @@ import java.util.regex.Pattern;
 public class Ballot {
 
     String topic;
+    String group;
     List<String> choices;
-    AbsoluteTime electionStartTime;
-    AbsoluteTime electionEndTime;
+    AbsoluteTime startTime;
+    AbsoluteTime closingTime;
+    AbsoluteTime queryTime;
+    AbsoluteTime endTime;
     BiMap<String,PeerIdentity> authorities;
     SortedMap<String,CryptoECC.Signature> registrationSigs;
-    CryptoECC.PublicKey caPub;
-    CryptoECC.PublicKey issuerPub;
+    CryptoECC.PublicSignKey caPub;
+    CryptoECC.PublicSignKey issuerPub;
     CryptoECC.Signature issuerSig;
-    CryptoECC.PublicKey voter_pub;
+    CryptoECC.PublicSignKey voterPub;
+    CryptoECC.Signature voterGroupCert;
     CryptoECC.Signature permission;
-    CryptoECC.PublicKey voter_sig;
-    SortedMap<String,CryptoECC.Signature> vouchers;
+    CryptoECC.PublicSignKey voterSig;
+    SortedMap<String,CryptoECC.Signature> voucherSigs;
 
     /**
      * Choice in plaintext.
@@ -60,8 +64,8 @@ public class Ballot {
     /**
      * Load a ballot from file.
      *
+     * @param filename name of file to load ballot from
      * @throws InvalidBallotException
-     * @param filename
      */
     public Ballot(String filename) {
         Configuration cfg = new Configuration();
@@ -69,10 +73,49 @@ public class Ballot {
         fillBallot(cfg);
     }
 
+    /**
+     * Load a ballot from a configuration.
+     *
+     * @param cfg configuration to load ballot from
+     * @throws InvalidBallotException
+     */
     public Ballot(Configuration cfg) {
         fillBallot(cfg);
     }
 
+    /**
+     * Parse the specified time value from the ballot,
+     * converting a human-readable time value to human time when no
+     * timestamp is given.
+     * @param cfg configuration to read the value from
+     * @param timeValueName name suffix of the time option
+     * @return the time value
+     */
+    private AbsoluteTime getTime(Configuration cfg, String timeValueName) {
+        Optional<String> optTimeHuman = cfg.getValueString("election", "TIME_" + timeValueName);
+        Optional<String> optTimeStamp = cfg.getValueString("election", "TIMESTAMP_" + timeValueName);
+        if (optTimeStamp.isPresent()) {
+            try {
+                long stamp = Long.parseLong(optTimeStamp.get());
+                return AbsoluteTime.fromSeconds(stamp);
+            } catch (NumberFormatException e) {
+                throw new InvalidBallotException("time value " + timeValueName + " malformed");
+            }
+        } else if (optTimeHuman.isPresent()) {
+            AbsoluteTime time = AbsoluteTime.fromString(optTimeHuman.get());
+            if (null == time) {
+                throw new InvalidBallotException("timestamp value " + timeValueName + " malformed");
+            }
+            return time;
+        }
+        throw new InvalidBallotException("time value " + timeValueName + " missing");
+    }
+
+    /**
+     * Fill the ballot with information from the given configuration.
+     *
+     * @param cfg configuration to read from
+     */
     private void fillBallot(Configuration cfg) {
         Optional<String> optTopic = cfg.getValueString("election", "TOPIC");
         if (!optTopic.isPresent()) {
@@ -87,6 +130,11 @@ public class Ballot {
         if (choices.size() < 2) {
             throw new InvalidBallotException("less than two choices present");
         }
+        Optional<String> optGroup = cfg.getValueString("election", "GROUP");
+        if (!optGroup.isPresent()) {
+            throw new InvalidBallotException("ballot must have elegibility group");
+        }
+        group = optGroup.get();
         authorities = HashBiMap.create();
         for (Map.Entry<String,String> e : cfg.getSection("authorities").entrySet()) {
             String alias = e.getKey();
@@ -104,13 +152,13 @@ public class Ballot {
         if (!optCaPub.isPresent()) {
             throw new InvalidBallotException("no CA pub key given");
         }
-        caPub = CryptoECC.PublicKey.fromString(optCaPub.get());
+        caPub = CryptoECC.PublicSignKey.fromString(optCaPub.get());
         if (null == caPub) {
             throw new InvalidBallotException("CA pub key invalid");
         }
         Optional<String> optIssuerPub = cfg.getValueString("election", "ISSUER_PUB");
         if (optIssuerPub.isPresent()) {
-            issuerPub = CryptoECC.PublicKey.fromString(optIssuerPub.get());
+            issuerPub = CryptoECC.PublicSignKey.fromString(optIssuerPub.get());
             Optional<String> optIssuerSig = cfg.getValueString("election", "ISSUER_SIG");
             if (!optIssuerSig.isPresent()) {
                 throw new InvalidBallotException("issuer public key present, but no signature");
@@ -128,6 +176,17 @@ public class Ballot {
             }
             registrationSigs.put(e.getKey(), sig);
         }
+        voucherSigs = new TreeMap<String, CryptoECC.Signature>();
+        for (Map.Entry<String,String> e : cfg.getSection("vouchers").entrySet()) {
+            CryptoECC.Signature sig = CryptoECC.Signature.fromString(e.getValue());
+            if (null == sig) {
+                throw new InvalidBallotException("voucher signature has invalid format");
+            }
+            if (!authorities.containsKey(e.getKey())) {
+                throw new InvalidBallotException("ballot contains superfluous voucher signature");
+            }
+            voucherSigs.put(e.getKey(), sig);
+        }
         Optional<String> optChoiceId = cfg.getValueString("vote", "CHOICE_ID");
         if (optChoiceId.isPresent()) {
             choiceId = Integer.parseInt(optChoiceId.get());
@@ -137,11 +196,27 @@ public class Ballot {
         } else {
             choiceId = -1;
         }
+
+        Optional<String> optVoterPub = cfg.getValueString("vote", "VOTER_PUB");
+        if (optVoterPub.isPresent()) {
+            voterPub = CryptoECC.PublicSignKey.fromString(optVoterPub.get());
+        }
+
+        startTime = getTime(cfg, "START");
+        closingTime = getTime(cfg, "CLOSING");
+        queryTime = getTime(cfg, "QUERY");
+        endTime = getTime(cfg, "END");
     }
 
+    /**
+     * Get a hash code that uniquely defines the election information of
+     * the ballot.
+     *
+     * @return GUID of this ballot
+     */
     public HashCode getBallotGuid() {
-        if (issuerSig == null) {
-            throw new InvalidBallotException("can't compute GUID of non-issued ballot");
+        if (issuerPub == null) {
+            throw new InvalidBallotException("can't compute GUID of a ballot without issuer");
         }
         MessageDigest digest;
         try {
@@ -150,8 +225,6 @@ public class Ballot {
             throw new RuntimeException("crypto algorithm required but not provided");
         }
         digest.update(topic.getBytes());
-        //digest.update(Longs.toByteArray(electionStartTime.getSeconds()));
-        //digest.update(Longs.toByteArray(electionEndTime.getSeconds()));
         for (String choice : choices) {
             digest.update(choice.getBytes());
         }
@@ -163,11 +236,16 @@ public class Ballot {
         digest.update(issuerPub.y);
         digest.update(caPub.x);
         digest.update(caPub.y);
+        digest.update(Longs.toByteArray(startTime.getSeconds()));
+        digest.update(Longs.toByteArray(endTime.getSeconds()));
+        digest.update(Longs.toByteArray(closingTime.getSeconds()));
+        digest.update(Longs.toByteArray(queryTime.getSeconds()));
         return new HashCode(digest.digest());
     }
 
     /**
      * Encode the given choice permanently in the ballot.
+     * Also encodes the voter's public key.
      *
      * @param choice the choice to encode the ballot
      * @param privateKey the private key to use for encoding
@@ -181,21 +259,39 @@ public class Ballot {
             }
             i++;
         }
+        voterPub = CryptoECC.computePublicKey(privateKey);
         if (choiceId == -1) {
             throw new InvalidBallotException(String.format("choice '%s' not valid", choice));
         }
     }
 
+    /**
+     * Write the current state of the ballot to a configuration.
+     *
+     * @return a configuration with the state of this ballot
+     */
     public Configuration toConfiguration() {
         Configuration cfg = new Configuration();
         cfg.setValueString("election", "TOPIC", topic);
+        cfg.setValueString("election", "GROUP", group);
         cfg.setValueString("election", "CHOICES", Joiner.on("//").join(choices));
         cfg.setValueString("election", "CA_PUB", caPub.toString());
+        cfg.setValueNumber("election", "TIMESTAMP_START", startTime.getSeconds());
+        cfg.setValueNumber("election", "TIMESTAMP_CLOSING", startTime.getSeconds());
+        cfg.setValueNumber("election", "TIMESTAMP_QUERY", startTime.getSeconds());
+        cfg.setValueNumber("election", "TIMESTAMP_END", startTime.getSeconds());
         for (Map.Entry<String, PeerIdentity> e : authorities.entrySet()) {
             cfg.setValueString("authorities", e.getKey(), e.getValue().toString());
         }
-        for (Map.Entry<String, CryptoECC.Signature> e : registrationSigs.entrySet()) {
-            cfg.setValueString("registration-signatures", e.getKey(), e.getValue().toString());
+        if (null != registrationSigs) {
+            for (Map.Entry<String, CryptoECC.Signature> e : registrationSigs.entrySet()) {
+                cfg.setValueString("registration-signatures", e.getKey(), e.getValue().toString());
+            }
+        }
+        if (null != voucherSigs) {
+            for (Map.Entry<String, CryptoECC.Signature> e : voucherSigs.entrySet()) {
+                cfg.setValueString("vouchers", e.getKey(), e.getValue().toString());
+            }
         }
         if (null != issuerPub) {
             cfg.setValueString("election", "ISSUER_PUB", issuerPub.toString());
@@ -204,19 +300,52 @@ public class Ballot {
         if (-1 != choiceId) {
             cfg.setValueNumber("vote", "CHOICE_ID", choiceId);
         }
+        if (null != voterPub) {
+            cfg.setValueString("vote", "VOTER_PUB", voterPub.toString());
+        }
         return cfg;
     }
 
+    /**
+     * Serialize the ballot to a string
+     *
+     * @return the serialized ballot
+     */
     public String serialize() {
         return toConfiguration().serialize();
     }
 
+
+    /**
+     * Get a human readable description of the ballot's current state.
+     *
+     * @return the ballot description
+     */
     public String describe() {
         StringBuilder buf = new StringBuilder();
+
         buf.append("Topic: ");
         buf.append("'");
         buf.append(topic);
         buf.append("'\n");
+
+        buf.append("Voter Group: ");
+        buf.append(group);
+        buf.append("\n");
+
+        buf.append("Start Time: ");
+        buf.append(startTime.toFancyString());
+        buf.append("\n");
+        buf.append("Closing Time: ");
+        buf.append(closingTime.toFancyString());
+        buf.append("\n");
+        buf.append("Query Time: ");
+        buf.append(queryTime.toFancyString());
+        buf.append("\n");
+        buf.append("End Time: ");
+        buf.append(endTime.toFancyString());
+        buf.append("\n");
+
         buf.append("Choices:\n");
         for (int i = 0; i < choices.size(); i++) {
             buf.append(""+(i+1));
@@ -247,6 +376,14 @@ public class Ballot {
             }
             buf.append("\n");
         }
+        if (!voucherSigs.isEmpty()) {
+            buf.append("ballot's vote has been submitted to with the following authorities:\n");
+            for (Map.Entry<String, CryptoECC.Signature> e : voucherSigs.entrySet()) {
+                buf.append(e.getKey());
+                buf.append(" ");
+            }
+            buf.append("\n");
+        }
         else {
             buf.append("ballot not registered\n");
         }
@@ -258,12 +395,27 @@ public class Ballot {
         return buf.toString();
     }
 
+
+    /**
+     * Get the list of authorities that did not yet receive the ballot's vote.
+     *
+     * @return list of unsubmitted-to authorities
+     */
     public List<PeerIdentity> getRemainingSubmitAuthorities() {
-        // FIXME: only return remaining authorities
-        return new ArrayList<PeerIdentity>(authorities.values());
+        LinkedList<PeerIdentity> remaining = new LinkedList<PeerIdentity>();
+        for (SortedMap.Entry<String,PeerIdentity> x : authorities.entrySet()) {
+            if (!voucherSigs.containsKey(x.getKey()))
+                remaining.add(x.getValue());
+        }
+        return remaining;
     }
 
-
+    /**
+     * Get a list of authorities that did not receive the registration for this
+     * ballot yet.
+     *
+     * @return list of authorities that don't know about this ballot
+     */
     public List<PeerIdentity> getRemainingRegisterAuthorities() {
         LinkedList<PeerIdentity> remaining = new LinkedList<PeerIdentity>();
         for (SortedMap.Entry<String,PeerIdentity> x : authorities.entrySet()) {
@@ -273,16 +425,44 @@ public class Ballot {
         return remaining;
     }
 
+    /**
+     * Add the issuer to the ballot, and sign the election information in the ballot.
+     *
+     * @param privateKey private key of the issuer
+     */
     public void issue(CryptoECC.PrivateKey privateKey) {
         issuerPub = CryptoECC.computePublicKey(privateKey);
         issuerSig = CryptoECC.sign(getBallotGuid().data, privateKey, issuerPub);
     }
 
+    /**
+     * Add an authorities registration signature to the list of known registrations.
+     *
+     * @param currentAuthority authority we registered with
+     * @param registrationSignature signature over this ballot's GUID from the authority
+     */
     public void addRegistrationSignature(PeerIdentity currentAuthority, CryptoECC.Signature registrationSignature) {
         String alias = authorities.inverse().get(currentAuthority);
         registrationSigs.put(alias, registrationSignature);
     }
 
+    /**
+     * Add a voucher, that is, a signature about the fact that an authority received a vote,
+     * to the list of vouchers
+     *
+     * @param currentAuthority authority that received the vote
+     * @param voucherSignature signature from the authority
+     */
+    public void addVoucher(PeerIdentity currentAuthority, CryptoECC.Signature voucherSignature) {
+        String alias = authorities.inverse().get(currentAuthority);
+        voucherSigs.put(alias, voucherSignature);
+    }
+
+    /**
+     * Get a list of all authorities.
+     *
+     * @return list of all authorities
+     */
     public List<PeerIdentity> getAuthorities() {
         return new ArrayList<PeerIdentity>(authorities.values());
     }