Fixes wpscanteam#1154

sudhirpoodar · Dec 11, 2017 · 54c0e79 · 54c0e79
1 parent 859d7f1
commit 54c0e79
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/lib/common/models/wp_theme/findable.rb b/lib/common/models/wp_theme/findable.rb
@@ -30,7 +30,7 @@ def find_from_css_link(target_uri)
       response = Browser.get_and_follow_location(target_uri.to_s)
 
       # https + domain is optional because of relative links
-      return unless response.body =~ %r{(?:https?://[^"']+/)?([^/\s]+)/themes/([^"'/]+)[^"']*/style.css}i
+      return unless response.body =~ %r{(?:https?://[^"']+/)?([^"'/\s]+)/themes/([^"'/]+)[^"']*/style\.css}i
 
       new(
         target_uri,

diff --git a/spec/lib/common/models/wp_theme/findable_spec.rb b/spec/lib/common/models/wp_theme/findable_spec.rb
@@ -45,9 +45,18 @@
 
     # FIXME: the style_url should be checked in WpTheme for absolute / relative
     context 'when relative url is used' do
-      it 'returns the WpTheme' do
-        @file = 'relative_urls.html'
-        @expected = WpTheme.new(uri, name: 'theme_name')
+      context 'when leading slash' do
+        it 'returns the WpTheme' do
+          @file = 'relative_urls.html'
+          @expected = WpTheme.new(uri, name: 'theme_name')
+        end
+      end
+
+      context 'when no leading slash' do
+        it 'returns the WpTheme' do
+          @file = 'relative_urls_missing_slash.html'
+          @expected = WpTheme.new(uri, name: 'theme_name')
+        end
       end
     end
 

diff --git a/spec/samples/common/models/wp_theme/findable/css_link/relative_urls.html b/spec/samples/common/models/wp_theme/findable/css_link/relative_urls.html
@@ -1 +1 @@
-<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="/wp-content/themes/theme_name/style.css" /></head><body></body></html>
+<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="/wp-content/themes/theme_name/style.css" /></head><body></body></html>
diff --git a/spec/samples/common/models/wp_theme/findable/css_link/relative_urls_missing_slash.html b/spec/samples/common/models/wp_theme/findable/css_link/relative_urls_missing_slash.html
@@ -0,0 +1 @@
+<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="wp-content/themes/theme_name/style.css" /></head><body></body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="/wp-content/themes/theme_name/style.css" /></head><body></body></html>
		<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="/wp-content/themes/theme_name/style.css" /></head><body></body></html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<html><head><title>Test</title><link rel="stylesheet" type="text/css" href="wp-content/themes/theme_name/style.css" /></head><body></body></html>