issue #16: add request limits

octopot · Mar 30, 2018 · 35c4aa7 · 35c4aa7
1 parent 56949ce
commit 35c4aa7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/public/demo.html b/public/demo.html
@@ -7,7 +7,7 @@
 <body>
 <script src="http://localhost:8080/demo/js/jquery.min.js"></script>
 <script src="http://localhost:8080/demo/js/fingerprint2.min.js"></script>
-<script src="http://localhost:8080/demo/js/passport.js"></script>
+<script src="http://localhost:8080/demo/js/passport.js" data-compressed-by="https://jscompress.com/"></script>
 <script type="snippet/go">
 	r.Get("/demo/*", func(rw http.ResponseWriter, req *http.Request) {
 		path := strings.Trim(strings.TrimPrefix(req.URL.Path, "/demo"), "/")

diff --git a/public/js/passport.js b/public/js/passport.js
@@ -27,6 +27,13 @@
         });
     }
 
+    function stop() {
+        if (!synced && payload.counter > 5) {
+            logger('passport: critical: payload was not be sent');
+        }
+        return synced || payload.counter > 5;
+    }
+
     var corrector = setInterval(function () {
         !lock && new signer().get(function(result, components) {
             if (result !== payload.fingerprint) {
@@ -35,20 +42,21 @@
                 payload.counter = 0;
                 log('corrector has made a correction')
             }
-            if (synced) {
+            payload.counter++;
+            if (stop()) {
                 clearInterval(corrector);
                 log('corrector is done');
                 return;
             }
-            if (++payload.counter >= 3) {
+            if (payload.counter >= 3) {
                 lock = true;
                 notify(corrector, 'corrector');
             }
         })
     }, 100);
 
     var watcher = setInterval(function () {
-        if (synced)  {
+        if (stop())  {
             clearInterval(watcher);
             log('watcher is done');
             return

diff --git a/server/server.go b/server/server.go
@@ -52,17 +52,19 @@ func (s *Server) GetTrackerInstructionV1(rw http.ResponseWriter, req *http.Reque
 	s.template.Execute(rw, struct {
 		BaseURL   *url.URL
 		Endpoint  string
+		Limit     uint8
 		Threshold uint8
 		Correct   int
 		Watch     int
 		Debug     bool
 	}{
 		BaseURL:   s.baseURL,
 		Endpoint:  "/api/v1/tracker/fingerprint",
+		Limit:     5,
 		Threshold: 3,
 		Correct:   100,  // Milliseconds
 		Watch:     1000, // Milliseconds
-		Debug:     false,
+		Debug:     true,
 	})
 }
 

diff --git a/static/bindata.go b/static/bindata.go
diff --git a/static/scripts/passport.min.js b/static/scripts/passport.min.js