added raw JSON processing for election hash

helios/templates/vote.html

@@ -50,9 +50,11 @@ <h3>Fingerprint: <span id="election_hash"></span></h3>
   });
 };
 
-BOOTH.setup_election = function(election) {
+BOOTH.setup_election = function(election, raw_json) {
   BOOTH.election = HELIOS.Election.fromJSONObject(election);
-  BOOTH.election_hash = BOOTH.election.get_hash();
+
+  // compute the hash from the raw JSON
+  BOOTH.election_hash = b64_sha1(raw_json);
 
   $('#election_hash').html(BOOTH.election_hash);
 
@@ -144,8 +146,8 @@ <h3>Fingerprint: <span id="election_hash"></span></h3>
 
 BOOTH.load_and_setup_election = function() {
     // the hash will be computed within the setup function call now
-    Helios.get_election({'election_id': "{{election.election_id}}"}, function(data) {
-        BOOTH.setup_election(data);
+    Helios.get_election({'election_id': "{{election.election_id}}"}, function(data, raw_json) {
+        BOOTH.setup_election(data, raw_json);
         BOOTH.show_election();
     });    
 };

helios/utils.py

@@ -28,7 +28,8 @@ def hash_b64(s):
   removes the trailing "="
   """
   hasher = sha.new(s)
-  return base64.b64encode(hasher.digest())[:-1]
+  result= base64.b64encode(hasher.digest())[:-1]
+  return result
 
 def do_hmac(k,s):
   """

static/helios-api.js

@@ -34,7 +34,10 @@ _Helios_SameSite = Class.extend({
   },
 
   getJSON: function(url, callback) {
-    $.getJSON(API_PREFIX + url, callback);
+    // get the JSON manually so that the raw source is still accessible
+    $.get(API_PREFIX + url, function(json_str) {
+      callback($.secureEvalJSON(json_str), json_str);
+    });
   },
 
   get_election: function(params, callback) {