diff --git a/lib/wpscan/wp_user.rb b/lib/wpscan/wp_user.rb index bae87c8e..2734b9b5 100644 --- a/lib/wpscan/wp_user.rb +++ b/lib/wpscan/wp_user.rb @@ -62,6 +62,10 @@ class WpUser other.name <=> self.name end + def ==(other) + other.name == self.name and other.id == self.id and other.nickname == self.nickname + end + def ===(other) other.name === self.name and other.id === self.id and other.nickname === self.nickname end diff --git a/spec/lib/wpscan/modules/wp_usernames_spec.rb b/spec/lib/wpscan/modules/wp_usernames_spec.rb index 0d05f60a..d666a563 100644 --- a/spec/lib/wpscan/modules/wp_usernames_spec.rb +++ b/spec/lib/wpscan/modules/wp_usernames_spec.rb @@ -58,11 +58,11 @@ shared_examples_for 'WpUsernames' do it 'should return an array with 1 username (from in the body response)' do stub_request(:get, @module.author_url(2)). - to_return(status: 200, body: File.new(@fixtures_dir + '/admin.htm')) + to_return(status: 200, body: File.new(@fixtures_dir + '/test.html')) usernames = @module.usernames(range: (1..2)) usernames.should_not be_empty - usernames.eql?([WpUser.new('admin', 2, 'admin | Wordpress 3.3.2')]).should be_true + usernames.should === ([WpUser.new('test', 2, 'first last | user's Blog!')]) end it 'should return an array with 2 usernames (one is a duplicate and should not be present twice)' do @@ -70,16 +70,16 @@ shared_examples_for 'WpUsernames' do to_return(status: 301, headers: {'location' => '/author/Youhou/'}) stub_request(:get, @module.author_url(2)). - to_return(status: 200, body: File.new(@fixtures_dir + '/admin.htm')) + to_return(status: 200, body: File.new(@fixtures_dir + '/test.html')) usernames = @module.usernames(range: (1..5)) usernames.should_not be_empty expected = [ - WpUser.new('admin', 2, 'admin | Wordpress 3.3.2'), + WpUser.new('test', 2, 'first last | user's Blog!'), WpUser.new('Youhou', 4, 'empty') ] - usernames.sort_by { |u| u.name }.eql?(expected.sort_by { |u| u.name }).should be_true + usernames.sort_by { |u| u.name }.should === expected.sort_by { |u| u.name } end end @@ -202,7 +202,7 @@ shared_examples_for 'WpUsernames' do describe '#remove_junk_from_nickname' do after :each do result = @module.remove_junk_from_nickname(@input) - result.eql?(@expected).should === true + result.should === @expected end it 'should return an empty array' do diff --git a/spec/samples/wpscan/modules/wp_usernames/admin.htm b/spec/samples/wpscan/modules/wp_usernames/admin.htm deleted file mode 100755 index 68837e10..00000000 --- a/spec/samples/wpscan/modules/wp_usernames/admin.htm +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - -admin | Wordpress 3.3.2 - - - - - - - - - - - - - - - -
- - - -
-
-
- - - -
-

Author Archives: admin

-
- - - - - - - - - - - -
-
- - - -
- - -
- - - - \ No newline at end of file diff --git a/spec/samples/wpscan/modules/wp_usernames/test.html b/spec/samples/wpscan/modules/wp_usernames/test.html new file mode 100644 index 00000000..3c63baa0 --- /dev/null +++ b/spec/samples/wpscan/modules/wp_usernames/test.html @@ -0,0 +1,245 @@ + + + + + + + + + +first last | user's Blog! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+ + +
+
+

Nothing Found

+
+ +
+

Apologies, but no results were found. Perhaps searching will help find a related post.

+
+
+ +
+
+ + + +
+ +
+ +
Super Refer-A-Friend Plugin by WPLift
+ + +
+
+ + + + + + \ No newline at end of file