Merge lp:~joep-moritz-13/study.cs.ucl-password-collection-clients/study.cs.ucl-password-collection-clients into lp:study.cs.ucl-password-collection-clients

[joep.moritz.13]

Now ignores duplicate entry made in last minute (matches pw hash and url).

[Steve Dodier-Lazaro (sidi)]

review: Approve

[Steve Dodier-Lazaro (sidi)]

I am realising now that it would have been important to also match the user id. Turning this into a bug report for the future.

=== modified file 'js/MonitorService.js'
--- js/MonitorService.js	2015-07-01 17:05:08 +0000
+++ js/MonitorService.js	2015-07-02 10:54:52 +0000
@@ -39,7 +39,7 @@
     function getNumCharClasses(password) {
 
         var numCharClasses = 0;
-        angular.forEach([/[A-Z]/, /[a-z]/, /\d/, /[!"#\$%&'()\*\+,-\./:;<=>\?@\[\\\]\^_`{|}~]/], function (expr) {
+        angular.forEach([/[A-Z]/, /[a-z]/, /\d/, /[!"#\$%&'()\*\+,-\./:;<=>\?@\[\\\]\^_`{|}~]/], function (expr) { // "
 
             if (password.match(expr)) {
 
@@ -70,6 +70,10 @@
 
     return {
 
+        lastPasswordHash: '',
+        lastTime: 0,
+        lastURL: '',
+
         newPassword: function (url, username, password, time, timeSpent) {
 
             if (url && username && password && time && timeSpent && !TimerService.isSuspended()) {
@@ -81,7 +85,7 @@
                             }
                         }
                     }
-                    // console.log("Submitting " + username + " // " + password);
+                    console.log("Submitting " + username + " // " + password);
                     var pwdHash, unHash;
                     $q.all({
                         username: HashingService.hashThis(username),
@@ -89,6 +93,17 @@
                     }).then(function (results) {
                         pwdHash = results.password;
                         unHash = (username === 'unknown') ? username : results.username;
+                        
+                        // To prevent duplicate entries
+                        if (this.lastPasswordHash === pwdHash && this.lastTime > time - 60000 && this.lastURL === url)
+                        {
+                            console.log("Skipping duplicate entry for " + url);
+                            return $q.reject();
+                        }
+                        this.lastPasswordHash = pwdHash;
+                        this.lastTime = time;
+                        this.lastURL = url;
+
                         IdbService.insertNewUsageEntry(unHash, pwdHash, url, time, timeSpent);
                         return IdbService.hasPasswordAlready(pwdHash);
                     }).then(function (hasPasswordAlready) {