fix issue #266 - passive detection regex

This commit is contained in:
Christian Mehlmauer
2013-08-17 11:33:25 +02:00
parent 9015834b15
commit 7acea5f4b2
8 changed files with 28 additions and 5 deletions

View File

@@ -90,7 +90,7 @@ class WpItems < Array
# @return [ Regex ]
def passive_detection_pattern(wp_target)
type = self.to_s.gsub(/Wp/, '').downcase
regex1 = %r{(?:[^=:]+)\s?(?:=|:)\s?(?:"|')[^"']+\\?/}
regex1 = %r{(?:[^=:\(]+)\s?(?:=|:|\()\s?(?:"|')[^"']+\\?/}
regex2 = %r{\\?/}
regex3 = %r{\\?/([^/\\"']+)\\?(?:/|"|')}

View File

@@ -22,7 +22,9 @@ describe WpItems do
WpItem.new(uri, name: 'escaped-url') <<
WpItem.new(uri, name: 'link-tag') <<
WpItem.new(uri, name: 'script-tag') <<
WpItem.new(uri, name: 'style-tag')
WpItem.new(uri, name: 'style-tag'),
passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
}
end
end

View File

@@ -23,7 +23,9 @@ describe WpPlugins do
WpPlugin.new(uri, name: 'escaped-url') <<
WpPlugin.new(uri, name: 'link-tag') <<
WpPlugin.new(uri, name: 'script-tag') <<
WpPlugin.new(uri, name: 'style-tag')
WpPlugin.new(uri, name: 'style-tag'),
passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
}
end
end

View File

@@ -21,7 +21,9 @@ describe WpThemes do
passive_detection: WpThemes.new << WpTheme.new(uri, name: 'theme1') <<
WpTheme.new(uri, name: 'theme 2') <<
WpTheme.new(uri, name: 'theme-3')
WpTheme.new(uri, name: 'theme-3'),
passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
}
end
end

View File

@@ -0,0 +1,4 @@
/* <![CDATA[ */
@import url("https://site.com/wp-content/items/wp-table-reloaded/css/plugin.css?ver=1.9.4");
@import url("https://site.com/wp-content/items/wp-table-reloaded/css/datatables.css?ver=1.9.4");
/* ]]> */

View File

@@ -0,0 +1,4 @@
/* <![CDATA[ */
@import url("https://blog.mozilla.org/wp-content/plugins/wp-table-reloaded/css/plugin.css?ver=1.9.4");
@import url("https://blog.mozilla.org/wp-content/plugins/wp-table-reloaded/css/datatables.css?ver=1.9.4");
/* ]]> */

View File

@@ -0,0 +1,4 @@
/* <![CDATA[ */
@import url("https://blog.mozilla.org/wp-content/themes/wp-table-reloaded/css/plugin.css?ver=1.9.4");
@import url("https://blog.mozilla.org/wp-content/themes/wp-table-reloaded/css/datatables.css?ver=1.9.4");
/* ]]> */

View File

@@ -151,10 +151,15 @@ shared_examples 'WpItems::Detectable' do
end
context 'when items are present' do
it 'returns the excpected items' do
it 'returns the expected items' do
@fixture = fixtures_dir + '/passive_detection.html'
@expected = expected[:passive_detection]
end
it 'returns the expected items' do
@fixture = fixtures_dir + '/passive_detection_2.html'
@expected = expected[:passive_detection2]
end
end
end