From 96ae8ade5d76749efa940bab7479348ffa294eb1 Mon Sep 17 00:00:00 2001
From: erwanlr <erwan.lr@gmail.com>
Date: Tue, 2 Sep 2014 18:34:01 +0200
Subject: [PATCH] Fixes the remove_conditional_comments function

---
 lib/common/common_helper.rb                   |  2 +-
 spec/lib/common/collections/wp_items_spec.rb  |  2 +-
 .../detectable/passive_detection.html         | 21 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/common/common_helper.rb b/lib/common/common_helper.rb
index 22fad14c..3ccfd97e 100644
--- a/lib/common/common_helper.rb
+++ b/lib/common/common_helper.rb
@@ -74,7 +74,7 @@ def add_trailing_slash(url)
 end
 
 def remove_conditional_comments(text)
-  text.gsub(/<!--\[if[^>]+>(.*)<!\[end[^>]+>/im, '\1')
+  text.gsub(/\<\!--\[if[^>]+>(.*?)\<\!\[end[^>]+>/im, '\1')
 end
 
 # loading the updater
diff --git a/spec/lib/common/collections/wp_items_spec.rb b/spec/lib/common/collections/wp_items_spec.rb
index 92ccda06..a1c7414a 100644
--- a/spec/lib/common/collections/wp_items_spec.rb
+++ b/spec/lib/common/collections/wp_items_spec.rb
@@ -18,7 +18,7 @@ describe WpItems do
         vulnerable_targets_items: [ WpItem.new(uri, name: 'mr-smith'),
                                     WpItem.new(uri, name: 'neo')],
 
-        passive_detection: (1..14).reduce(WpItems.new) { |o, i| o << WpItem.new(uri, name: "detect-me-#{i}") }
+        passive_detection: (1..15).reduce(WpItems.new) { |o, i| o << WpItem.new(uri, name: "detect-me-#{i}") }
       }
     end
   end
diff --git a/spec/samples/common/collections/wp_items/detectable/passive_detection.html b/spec/samples/common/collections/wp_items/detectable/passive_detection.html
index 81f362c2..0332f74f 100644
--- a/spec/samples/common/collections/wp_items/detectable/passive_detection.html
+++ b/spec/samples/common/collections/wp_items/detectable/passive_detection.html
@@ -22,31 +22,36 @@
   <!--[if lt IE 9]>
     <script src="http://example.com/wp-content/items/detect-me-6/assets/js/vendor/html5shiv.js"></script>
   <![endif]-->
+  <!--[if IE 8]>
+    <link rel="stylesheet" type="text/css" href="https://example.com/wp-content/items/detect-me-7/" />
+  <![endif]-->
 
   <style type="text/css">
     #fancybox-loading.fancybox-ie div {
       background: transparent;
-      filter: AlphaImageLoader(src='http://example.com/wp-content/items/detect-me-7/fancybox/fancy_loading.png', sizingMethod='scale');
+      filter: AlphaImageLoader(src='http://example.com/wp-content/items/detect-me-8/fancybox/fancy_loading.png', sizingMethod='scale');
     }
   </style>
 
   <style type="text/css" media="all">
     /* <![CDATA[ */
-    @import url("https://example.com/wp-content/items/detect-me-8/css/plugin.css?ver=1.9.4");
-    @import url('/wp-content/items/detect-me-9/css/datatables.css?ver=1.9.4');
-    @import url(/wp-content/items/detect-me-10/css/datatables.css?ver=1.9.4);
-    @import url(//wp-content/items/detect-me-11/css/datatables.css?ver=1.9.4);
+    @import url("https://example.com/wp-content/items/detect-me-9/css/plugin.css?ver=1.9.4");
+    @import url('/wp-content/items/detect-me-10/css/datatables.css?ver=1.9.4');
+    @import url(/wp-content/items/detect-me-11/css/datatables.css?ver=1.9.4);
+    @import url(//wp-content/items/detect-me-12/css/datatables.css?ver=1.9.4);
     /* ]]> */
   </style>
 
   <script type='text/javascript'>
     /* <![CDATA[ */
-    var poll1 = {"ajax_url": "http:\/\/example.com\/wp-content\/items\/detect-me-12\/wp-polls.php", "text_wait": "Please wait a while ..."};
-    var poll2 = {"ajax_url": "\/wp-content\/items\/detect-me-13\/wp-polls.php", "text_wait": "Please wait a while ..."};
-    var poll3 = {"ajax_url": "\/\/wp-content\/items\/detect-me-14\/wp-polls.php", "text_wait": "Please wait a while ..."};
+    var poll1 = {"ajax_url": "http:\/\/example.com\/wp-content\/items\/detect-me-13\/wp-polls.php", "text_wait": "Please wait a while ..."};
+    var poll2 = {"ajax_url": "\/wp-content\/items\/detect-me-14\/wp-polls.php", "text_wait": "Please wait a while ..."};
+    var poll3 = {"ajax_url": "\/\/wp-content\/items\/detect-me-15\/wp-polls.php", "text_wait": "Please wait a while ..."};
     /* ]]> */
   </script>
 
+  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="https://example.com/ie8.css" /><![endif]-->
+
   <!-- Items that should not be detected -->
   http://example.com/wp-content/items/this-should-not-match/sub.css
   href="http://example.com/wp-content/items/this-should-not-match/sub.css"