Fix Javascript code

Author: jvazquez-r7

lib/msf/core/exploit/remote/browser_exploit_server.rb

@@ -408,18 +408,17 @@ def get_detection_html(user_agent)
       }
 
       var flashVersion = "";
-      var doFlashLoop = true;
+      var doInterval = true;
       var maxTimeout = null;
+      var intervalTimeout = null;
 
       function setFlashVersion(ver) {
-        console.log('called! :) ' + ver)
         flashVersion = ver
-        doFlashLoop = false
         if (maxTimeout != null) {
           clearTimeout(maxTimeout);
           maxTimeout = null
         }
-        console.log('flash version after set_version: ' + flashVersion)
+        doInterval = false
         return;
       }
 
@@ -446,8 +445,6 @@ def get_detection_html(user_agent)
         div.innerHTML = html;
         obj = div.firstChild;
         div.removeChild(obj);
-        console.log(obj)
-        alert('check obj')
         return obj;
       }
 
@@ -488,26 +485,30 @@ def get_detection_html(user_agent)
         <% end %>
 
         if (d["flash"] != null && (d["flash"].match(/[\\d]+.[\\d]+.[\\d]+.[\\d]+/)) == null) {
-          alert('flash detection!');
           var flashObject = createFlashObject('<%=get_resource.chomp("/")%>/<%=@flash_swf%>', {width: 1, height: 1}, {allowScriptAccess: 'always', Play: 'True'});
 
-          // After 5s stop waiting and use the version retrieved with JS
-          maxTimeout = setTimeout(function(){ doFlashLoop = false }, 5000);
-
-          // Check every 100 ms
-          (function loop(){
-            console.log('loop: ' + flashVersion)
-            setTimeout(function(){
-              if (doFlashLoop) {
-                loop()
-              }
-              console.log('finally: ' + flashVersion)
+          // After 5s stop waiting and use the version retrieved with JS if there isn't anything
+          maxTimeout = setTimeout(function() {
+            if (intervalTimeout != null) {
+              doInterval = false
+              clearInterval(intervalTimeout)
+            }
+            if (!isEmpty(flashVersion)) {
+              d["flash"] = flashVersion
+            }
+            sendInfo(d);
+          }, 5000);
+
+          // Check if there is a new flash version every 100ms
+          intervalTimeout = setInterval(function() {
+            if (!doInterval) {
+              clearInterval(intervalTimeout);
               if (!isEmpty(flashVersion)) {
                 d["flash"] = flashVersion
               }
-              sendInfo(d)
-            }, 100);
-          })();
+              sendInfo(d);
+            }
+          }, 100);
 
           document.body.appendChild(flashObject)
         } else {