diff --git a/lib/wpscan/wp_version.rb b/lib/wpscan/wp_version.rb
index cc25da8d..7d4c8cfa 100644
--- a/lib/wpscan/wp_version.rb
+++ b/lib/wpscan/wp_version.rb
@@ -62,16 +62,58 @@ class WpVersion < Vulnerable
target_uri = options[:base_url]
response = Browser.instance.get(target_uri.to_s, {:follow_location => true, :max_redirects => 2})
- response.body[%r{name="generator" content="wordpress (#{WpVersion.version_pattern})"}i, 1]
+ response.body[%r{name="generator" content="wordpress #{WpVersion.version_pattern}"}i, 1]
end
+ # Attempts to find the WordPress version from,
+ # the generator tag in the RSS feed source.
def self.find_from_rss_generator(options)
target_uri = options[:base_url]
response = Browser.instance.get(target_uri.merge("feed/").to_s, {:follow_location => true, :max_redirects => 2})
- response.body[%r{http://wordpress.org/\?v=(#{WpVersion.version_pattern})}i, 1]
+ response.body[%r{http://wordpress.org/\?v=#{WpVersion.version_pattern}}i, 1]
end
+ # Attempts to find WordPress version from,
+ # the generator tag in the RDF feed source.
+ def self.find_from_rdf_generator(options)
+ target_uri = options[:base_url]
+ response = Browser.instance.get(target_uri.merge("feed/rdf/").to_s, {:follow_location => true, :max_redirects => 2})
+
+ response.body[%r{}i, 1]
+ end
+
+ # Attempts to find the WordPress version from,
+ # the generator tag in the RSS2 feed source.
+ #
+ # Have not been able to find an example of this - Ryan
+ #def self.find_from_rss2_generator(options)
+ # target_uri = options[:base_url]
+ # response = Browser.instance.get(target_uri.merge("feed/rss/").to_s, {:follow_location => true, :max_redirects => 2})
+ #
+ # response.body[%r{http://wordpress.org/?v=(#{WpVersion.version_pattern})}i, 1]
+ #end
+
+ # Attempts to find the WordPress version from,
+ # the generator tag in the Atom source.
+ def self.find_from_atom_generator(options)
+ target_uri = options[:base_url]
+ response = Browser.instance.get(target_uri.merge("feed/atom/").to_s, {:follow_location => true, :max_redirects => 2})
+
+ response.body[%r{WordPress}i, 1]
+ end
+
+ # Attempts to find the WordPress version from,
+ # the generator tag in the comment rss source.
+ #
+ # Have not been able to find an example of this - Ryan
+ #def self.find_from_comments_rss_generator(options)
+ # target_uri = options[:base_url]
+ # response = Browser.instance.get(target_uri.merge("comments/feed/").to_s, {:follow_location => true, :max_redirects => 2})
+ #
+ # response.body[%r{}i, 1]
+ #end
+
# Uses data/wp_versions.xml to try to identify a
# wordpress version.
#
@@ -116,23 +158,27 @@ class WpVersion < Vulnerable
nil # Otherwise the data['file'] is returned (issue #107)
end
+ # Attempts to find the WordPress version from the readme.html file.
def self.find_from_readme(options)
target_uri = options[:base_url]
Browser.instance.get(target_uri.merge("readme.html").to_s).body[%r{ \sversion #{WpVersion.version_pattern}}i, 1]
end
- # http://code.google.com/p/wpscan/issues/detail?id=109
+ # Attempts to find the WordPress version from the sitemap.xml file.
+ #
+ # See: http://code.google.com/p/wpscan/issues/detail?id=109
def self.find_from_sitemap_generator(options)
target_uri = options[:base_url]
Browser.instance.get(target_uri.merge("sitemap.xml").to_s).body[%r{generator="wordpress/#{WpVersion.version_pattern}"}i, 1]
end
+ # Attempts to find the WordPress version from the p-links-opml.php file.
def self.find_from_links_opml(options)
target_uri = options[:base_url]
Browser.instance.get(target_uri.merge("wp-links-opml.php").to_s).body[%r{generator="wordpress/#{WpVersion.version_pattern}"}i, 1]
end
- # Used to check if the version is correct : must contain at least one .
+ # Used to check if the version is correct: must contain at least one dot.
def self.version_pattern
'([^\r\n]+[\.][^\r\n]+)'
end
diff --git a/spec/fixtures/wpscan/wp_version/atom-generator/3.3.2.htm b/spec/fixtures/wpscan/wp_version/atom-generator/3.3.2.htm
new file mode 100644
index 00000000..59895743
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/atom-generator/3.3.2.htm
@@ -0,0 +1,33 @@
+
+ Matt Mullenweg
+ Unlucky in Cards
+
+ 2012-10-26T18:25:32Z
+
+
+ http://ma.tt/feed/atom/
+
+
+ WordPress
+
+
+
+ Matt
+ http://ma.tt/
+
+ <![CDATA[New Jetpack]]>
+
+ http://ma.tt/?p=41967
+ 2012-10-26T18:25:32Z
+ 2012-10-26T18:25:32Z
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ 2
+
+
+
diff --git a/spec/fixtures/wpscan/wp_version/atom-generator/3.4-beta4.htm b/spec/fixtures/wpscan/wp_version/atom-generator/3.4-beta4.htm
new file mode 100644
index 00000000..34885b67
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/atom-generator/3.4-beta4.htm
@@ -0,0 +1,33 @@
+
+ Matt Mullenweg
+ Unlucky in Cards
+
+ 2012-10-26T18:25:32Z
+
+
+ http://ma.tt/feed/atom/
+
+
+ WordPress
+
+
+
+ Matt
+ http://ma.tt/
+
+ <![CDATA[New Jetpack]]>
+
+ http://ma.tt/?p=41967
+ 2012-10-26T18:25:32Z
+ 2012-10-26T18:25:32Z
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ 2
+
+
+
diff --git a/spec/fixtures/wpscan/wp_version/atom-generator/invalid_version.htm b/spec/fixtures/wpscan/wp_version/atom-generator/invalid_version.htm
new file mode 100644
index 00000000..eb38e2e7
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/atom-generator/invalid_version.htm
@@ -0,0 +1,33 @@
+
+ Matt Mullenweg
+ Unlucky in Cards
+
+ 2012-10-26T18:25:32Z
+
+
+ http://ma.tt/feed/atom/
+
+
+ WordPress
+
+
+
+ Matt
+ http://ma.tt/
+
+ <![CDATA[New Jetpack]]>
+
+ http://ma.tt/?p=41967
+ 2012-10-26T18:25:32Z
+ 2012-10-26T18:25:32Z
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ 2
+
+
+
diff --git a/spec/fixtures/wpscan/wp_version/atom-generator/no-atom-generator.htm b/spec/fixtures/wpscan/wp_version/atom-generator/no-atom-generator.htm
new file mode 100644
index 00000000..ddbb741c
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/atom-generator/no-atom-generator.htm
@@ -0,0 +1,32 @@
+
+ Matt Mullenweg
+ Unlucky in Cards
+
+ 2012-10-26T18:25:32Z
+
+
+ http://ma.tt/feed/atom/
+
+
+
+
+
+ Matt
+ http://ma.tt/
+
+ <![CDATA[New Jetpack]]>
+
+ http://ma.tt/?p=41967
+ 2012-10-26T18:25:32Z
+ 2012-10-26T18:25:32Z
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ 2
+
+
+
diff --git a/spec/fixtures/wpscan/wp_version/atom-generator/no-version.htm b/spec/fixtures/wpscan/wp_version/atom-generator/no-version.htm
new file mode 100644
index 00000000..e0c1008d
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/atom-generator/no-version.htm
@@ -0,0 +1,33 @@
+
+ Matt Mullenweg
+ Unlucky in Cards
+
+ 2012-10-26T18:25:32Z
+
+
+ http://ma.tt/feed/atom/
+
+
+ WordPress
+
+
+
+ Matt
+ http://ma.tt/
+
+ <![CDATA[New Jetpack]]>
+
+ http://ma.tt/?p=41967
+ 2012-10-26T18:25:32Z
+ 2012-10-26T18:25:32Z
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ 2
+
+
+
diff --git a/spec/fixtures/wpscan/wp_version/rdf-generator/3.3.2.htm b/spec/fixtures/wpscan/wp_version/rdf-generator/3.3.2.htm
new file mode 100644
index 00000000..8bb588ff
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/rdf-generator/3.3.2.htm
@@ -0,0 +1,57 @@
+
+
+ Matt Mullenweg
+ http://ma.tt
+ Unlucky in Cards
+ 2012-10-26T18:25:32Z
+ hourly
+ 1
+ 2000-01-01T12:00+00:00
+
+
+
+
+
+
+
+
+
+
+ New Jetpack
+ http://ma.tt/2012/10/new-jetpack/
+ 2012-10-26T18:25:32Z
+ Matt
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ Pandora and Artist Payments
+ http://ma.tt/2012/10/pandora-and-artist-payments/
+ 2012-10-09T22:55:07Z
+ Matt
+
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+]]>
+
+
+ Bitcoin and decentralization
+ http://ma.tt/2012/10/bitcoin-and-decentralization/
+ 2012-10-06T19:53:54Z
+ Matt
+
+ The value of Bitcoin is in its decentralization.
+ The value of Bitcoin is in its decentralization.
+]]>
+
+
+
\ No newline at end of file
diff --git a/spec/fixtures/wpscan/wp_version/rdf-generator/3.4-beta4.htm b/spec/fixtures/wpscan/wp_version/rdf-generator/3.4-beta4.htm
new file mode 100644
index 00000000..c4fb1787
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/rdf-generator/3.4-beta4.htm
@@ -0,0 +1,57 @@
+
+
+ Matt Mullenweg
+ http://ma.tt
+ Unlucky in Cards
+ 2012-10-26T18:25:32Z
+ hourly
+ 1
+ 2000-01-01T12:00+00:00
+
+
+
+
+
+
+
+
+
+
+ New Jetpack
+ http://ma.tt/2012/10/new-jetpack/
+ 2012-10-26T18:25:32Z
+ Matt
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ Pandora and Artist Payments
+ http://ma.tt/2012/10/pandora-and-artist-payments/
+ 2012-10-09T22:55:07Z
+ Matt
+
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+]]>
+
+
+ Bitcoin and decentralization
+ http://ma.tt/2012/10/bitcoin-and-decentralization/
+ 2012-10-06T19:53:54Z
+ Matt
+
+ The value of Bitcoin is in its decentralization.
+ The value of Bitcoin is in its decentralization.
+]]>
+
+
+
\ No newline at end of file
diff --git a/spec/fixtures/wpscan/wp_version/rdf-generator/invalid_version.htm b/spec/fixtures/wpscan/wp_version/rdf-generator/invalid_version.htm
new file mode 100644
index 00000000..2c3de494
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/rdf-generator/invalid_version.htm
@@ -0,0 +1,57 @@
+
+
+ Matt Mullenweg
+ http://ma.tt
+ Unlucky in Cards
+ 2012-10-26T18:25:32Z
+ hourly
+ 1
+ 2000-01-01T12:00+00:00
+
+
+
+
+
+
+
+
+
+
+ New Jetpack
+ http://ma.tt/2012/10/new-jetpack/
+ 2012-10-26T18:25:32Z
+ Matt
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ Pandora and Artist Payments
+ http://ma.tt/2012/10/pandora-and-artist-payments/
+ 2012-10-09T22:55:07Z
+ Matt
+
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+]]>
+
+
+ Bitcoin and decentralization
+ http://ma.tt/2012/10/bitcoin-and-decentralization/
+ 2012-10-06T19:53:54Z
+ Matt
+
+ The value of Bitcoin is in its decentralization.
+ The value of Bitcoin is in its decentralization.
+]]>
+
+
+
\ No newline at end of file
diff --git a/spec/fixtures/wpscan/wp_version/rdf-generator/no-rdf-generator.htm b/spec/fixtures/wpscan/wp_version/rdf-generator/no-rdf-generator.htm
new file mode 100644
index 00000000..6bb1523c
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/rdf-generator/no-rdf-generator.htm
@@ -0,0 +1,56 @@
+
+
+ Matt Mullenweg
+ http://ma.tt
+ Unlucky in Cards
+ 2012-10-26T18:25:32Z
+ hourly
+ 1
+ 2000-01-01T12:00+00:00
+
+
+
+
+
+
+
+
+
+ New Jetpack
+ http://ma.tt/2012/10/new-jetpack/
+ 2012-10-26T18:25:32Z
+ Matt
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ Pandora and Artist Payments
+ http://ma.tt/2012/10/pandora-and-artist-payments/
+ 2012-10-09T22:55:07Z
+ Matt
+
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+]]>
+
+
+ Bitcoin and decentralization
+ http://ma.tt/2012/10/bitcoin-and-decentralization/
+ 2012-10-06T19:53:54Z
+ Matt
+
+ The value of Bitcoin is in its decentralization.
+ The value of Bitcoin is in its decentralization.
+]]>
+
+
+
\ No newline at end of file
diff --git a/spec/fixtures/wpscan/wp_version/rdf-generator/no-version.htm b/spec/fixtures/wpscan/wp_version/rdf-generator/no-version.htm
new file mode 100644
index 00000000..c7c0610b
--- /dev/null
+++ b/spec/fixtures/wpscan/wp_version/rdf-generator/no-version.htm
@@ -0,0 +1,57 @@
+
+
+ Matt Mullenweg
+ http://ma.tt
+ Unlucky in Cards
+ 2012-10-26T18:25:32Z
+ hourly
+ 1
+ 2000-01-01T12:00+00:00
+
+
+
+
+
+
+
+
+
+
+ New Jetpack
+ http://ma.tt/2012/10/new-jetpack/
+ 2012-10-26T18:25:32Z
+ Matt
+
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+ I’m really excited abou the new Jetpack, it includes toolbar notifications, mobile push for iOS, a new REST API, and fixes to the contact form.
+]]>
+
+
+ Pandora and Artist Payments
+ http://ma.tt/2012/10/pandora-and-artist-payments/
+ 2012-10-09T22:55:07Z
+ Matt
+
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+ Pandora and Artist Payments, about how Pandora is paying out millions of dollars to artists but is only 6.5% of the US radio listening audience, the fees the rest pay are far, far lower.
+]]>
+
+
+ Bitcoin and decentralization
+ http://ma.tt/2012/10/bitcoin-and-decentralization/
+ 2012-10-06T19:53:54Z
+ Matt
+
+ The value of Bitcoin is in its decentralization.
+ The value of Bitcoin is in its decentralization.
+]]>
+
+
+
\ No newline at end of file
diff --git a/spec/lib/wpscan/wp_version_spec.rb b/spec/lib/wpscan/wp_version_spec.rb
index 9ee335bd..c183bfd0 100644
--- a/spec/lib/wpscan/wp_version_spec.rb
+++ b/spec/lib/wpscan/wp_version_spec.rb
@@ -95,6 +95,88 @@ describe WpVersion do
end
end
+ describe "#find_from_rdf_generator" do
+ let(:fixtures_dir) { SPEC_FIXTURES_WPSCAN_WP_VERSION_DIR + "/rdf-generator" }
+
+ after :each do
+ @status_code ||= 200
+ stub_request_to_fixture(:url => @target_uri.merge("feed/rdf/").to_s, :status => @status_code, :fixture => @fixture)
+ WpVersion.find_from_rdf_generator(:base_url => @target_uri).should === @expected
+ end
+
+ it "should return nil on a 404" do
+ @status_code = 404
+ @fixture = SPEC_FIXTURES_WPSCAN_WP_VERSION_DIR + "/404.htm"
+ @expected = nil
+ end
+
+ it "should return nil if the rdf-generator is not found" do
+ @fixture = fixtures_dir + "/no-rdf-generator.htm"
+ @expected = nil
+ end
+
+ it "should return nil if the version is not found (but the rdf-generator is present)" do
+ @fixture = fixtures_dir + "/no-version.htm"
+ @expected = nil
+ end
+
+ it "shuld return 3.3.2" do
+ @fixture = fixtures_dir + "/3.3.2.htm"
+ @expected = "3.3.2"
+ end
+
+ it "should return 3.4-beta4" do
+ @fixture = fixtures_dir + "/3.4-beta4.htm"
+ @expected = "3.4-beta4"
+ end
+
+ it "should return nil if it's not a valid version, must contains at least one '.'" do
+ @fixture = fixtures_dir + "/invalid_version.htm"
+ @expected = nil
+ end
+ end
+
+ describe "#find_from_atom_generator" do
+ let(:fixtures_dir) { SPEC_FIXTURES_WPSCAN_WP_VERSION_DIR + "/atom-generator" }
+
+ after :each do
+ @status_code ||= 200
+ stub_request_to_fixture(:url => @target_uri.merge("feed/atom/").to_s, :status => @status_code, :fixture => @fixture)
+ WpVersion.find_from_atom_generator(:base_url => @target_uri).should === @expected
+ end
+
+ it "should return nil on a 404" do
+ @status_code = 404
+ @fixture = SPEC_FIXTURES_WPSCAN_WP_VERSION_DIR + "/404.htm"
+ @expected = nil
+ end
+
+ it "should return nil if the atom-generator is not found" do
+ @fixture = fixtures_dir + "/no-atom-generator.htm"
+ @expected = nil
+ end
+
+ it "should return nil if the version is not found (but the atom-generator is present)" do
+ @fixture = fixtures_dir + "/no-version.htm"
+ @expected = nil
+ end
+
+ it "shuld return 3.3.2" do
+ @fixture = fixtures_dir + "/3.3.2.htm"
+ @expected = "3.3.2"
+ end
+
+ it "should return 3.4-beta4" do
+ @fixture = fixtures_dir + "/3.4-beta4.htm"
+ @expected = "3.4-beta4"
+ end
+
+ it "should return nil if it's not a valid version, must contains at least one '.'" do
+ @fixture = fixtures_dir + "/invalid_version.htm"
+ @expected = nil
+ end
+ end
+
describe "#find_from_sitemap_generator" do
after :each do
stub_request(:get, @target_uri.merge("sitemap.xml").to_s).