Removed FIELD from aggregation calls.

Author: n1v0lg

client/script/ssCreate.js

@@ -297,8 +297,7 @@ var submitAll = function (sessionstr, emailstr, targetUrl, inputSources, la) {
     );
 
     // Secret-share the value in each key-value pair
-    // Note: FIELD is a global defined and imported from ../shared/mpc.js
-    var secretShared = secretShareValues(keyValuePairs, FIELD),
+    var secretShared = secretShareValues(keyValuePairs),
         serviceShares = secretShared.service,
         analystShares = secretShared.analyst; 
 
@@ -476,8 +475,6 @@ var submissionHandling = function (inputSources, targetUrl) {
 function makeBlank(instance, td, row, col, prop, value, cellProperties) {
   Handsontable.renderers.NumericRenderer.apply(this, arguments);
   td.style.background = '#f3f3f3';
-  //td.style['background-image'] = 'linear-gradient(to right top, transparent 33%, black 33%, black 66%, transparent 66%)';
-  //td.style['background-size'] = '3px 3px';
 }
 
 function outsideRangeRenderer(instance, td, row, col, prop, value, cellProperties) {

server/index.js

@@ -13,7 +13,6 @@
 
 'use strict';
 
-// TODO: check how to chain
 function templateToJoiSchema(template, joiFieldType) {
     var schema = {};
     for (var key in template) {
@@ -357,7 +356,13 @@ app.post('/get_aggregate', function (req, res) {
             // make sure query result is not empty
             if (data.length >= 1) {
                 console.log('Computing share of aggregate.');
-                var serviceShare = mpc.aggregateShares(data, true);
+                
+                var invalidShareCount = mpc.countInvalidShares(data, true),
+                    serviceShare = mpc.aggregateShares(data, true);
+                
+                // TODO: we should set a threshold and abort if there are too
+                // many invalid shares
+                console.log('Invalid share count:', invalidShareCount);
 
                 console.log('Sending aggregate.');
                 res.json(serviceShare);

shared/mpc.js

@@ -6,6 +6,8 @@
  *
  */
 
+'use strict';
+
 var MAX_VALUE = 4294967296; // 2^32
 
 /**
@@ -110,7 +112,7 @@ function countInvalidShares (data, db) {
   }
   else {
     isInvalid = function (x) {
-      var result = parseInt(x, 10);
+      var result = parseInt(x, 10),
           invalid = 0;
       if (isNaN(result) || !_inUint32Range(result)) {
         invalid = 1;
@@ -122,7 +124,7 @@ function countInvalidShares (data, db) {
   // Ensure we are always working with an array.
   if (db) {
     var arr = [];
-    for (row in data) {
+    for (let row in data) {
       arr.push(data[row]);
     }
     data = arr;
@@ -173,7 +175,7 @@ function aggregateShares (data, db) {
   // Ensure we are always working with an array.
   if (db) {
     var arr = [];
-    for (row in data) {
+    for (let row in data) {
       arr.push(data[row]);
     }
     data = arr;
@@ -211,7 +213,7 @@ function recombineValues (serviceTuples, analystTuples) {
 
 if (typeof module !== 'undefined') {
   module.exports = {
-    'FIELD': FIELD,
-    'aggregateShares': aggregateShares
+    'aggregateShares': aggregateShares,
+    'countInvalidShares': countInvalidShares
   };
 }

test/spec/MPCSpec.js

@@ -1,5 +1,7 @@
 // TODO: think about safe integers and overflow
 
+'use strict';
+
 var twoto32 = MAX_VALUE;
 
 describe("Unsigned integer conversion", function () {
@@ -82,7 +84,7 @@ describe("MPC for single values", function () {
     expect(given).toEqual(expected);
   });
 
-  it("should throw when input >= 2^32", function () {
+  it("should throw when input to secret sharing >= 2^32", function () {
     var f = function () {
       _secretShare(twoto32, 2);
     };
@@ -93,7 +95,7 @@ describe("MPC for single values", function () {
     expect(f).toThrow(new Error('Input value outside valid range'));
   });
 
-  it("should throw when input is negative", function () {
+  it("should throw when input to secret sharing is negative", function () {
     var f = function () {
       _secretShare(-1, 2);
     };
@@ -225,6 +227,13 @@ describe("MPC for objects", function () {
     expect(result).toEqual(expected);
   });
 
+  it("should correctly count out-of-bounds in analyst shares", function () {
+    var shares = [{k: '-1'}, {k: '4294967296'}, {k: '4294967297'}, {k: '7'}],
+        result = countInvalidShares(shares),
+        expected = {k: 3};
+    expect(result).toEqual(expected);
+  });
+
   it("should correctly count out-of-bounds in service shares", function () {
     var shares = [{k: -1}, {k: -10}, {k: 10}, {k: twoto32}, {k: twoto32 + 1}],
         wrappedShares = shares.map(function (share) {return {fields: share}}),

unmask/script/unmask.js

@@ -41,6 +41,10 @@ function unmask(mOut, privateKey, session, callback){
 
   // Aggregate decrypted values by key
   var analystResultShare = decrypted.then(function (analystShares) {
+    var invalidShareCount = countInvalidShares(analystShares);
+    // TODO: we should set a threshold and abort if there are too
+    // many invalid shares
+    console.log('Invalid share count:', invalidShareCount);
     return aggregateShares(analystShares); 
   });
 
@@ -51,9 +55,7 @@ function unmask(mOut, privateKey, session, callback){
   .then(function (resultShares) {
     var analystResult = resultShares[0],
         serviceResult = resultShares[1],
-        finalResult = recombineValues(
-            analystResult, serviceResult, FIELD
-          );
+        finalResult = recombineValues(analystResult, serviceResult);
     callback(true, finalResult);
   }).catch(function (err) {
     console.log(err);