Implements Firefart solution to avoid mandatory blank newline at the end of the wordlist

README

@@ -198,13 +198,13 @@ You should have received a copy of the GNU General Public License along with thi
 
 --basic-auth <username:password>  Set the HTTP Basic authentication.
 
---wordlist | -w <wordlist>  Supply a wordlist (with a newline at the end) for the password brute forcer.
+--wordlist | -w <wordlist>  Supply a wordlist for the password brute forcer.
 
 --threads  | -t <number of threads>  The number of threads to use when multi-threading requests.
 
 --username | -U <username>  Only brute force the supplied username.
 
---usernames  <path-to-file>  Only brute force the usernames from the file (which need to have a newline at the end).
+--usernames  <path-to-file>  Only brute force the usernames from the file.
 
 --cache-ttl <cache-ttl>  Typhoeus cache TTL.
 

README.md

@@ -199,13 +199,13 @@ Apple Xcode, Command Line Tools and the libffi are needed (to be able to install
 
     --basic-auth <username:password>  Set the HTTP Basic authentication.
 
-    --wordlist | -w <wordlist>  Supply a wordlist (with a newline at the end) for the password brute forcer.
+    --wordlist | -w <wordlist>  Supply a wordlist for the password brute forcer.
 
     --threads  | -t <number of threads>  The number of threads to use when multi-threading requests.
 
     --username | -U <username>  Only brute force the supplied username.
 
-    --usernames  <path-to-file>  Only brute force the usernames from the file (which need to have a newline at the end).
+    --usernames  <path-to-file>  Only brute force the usernames from the file.
 
     --cache-ttl <cache-ttl>  Typhoeus cache TTL.
 

lib/common/models/wp_user/brute_forcable.rb

@@ -25,7 +25,7 @@ class WpUser < WpItem
       hydra        = browser.hydra
       queue_count  = 0
       found        = false
-      progress_bar = self.progress_bar(count_file_lines(wordlist), options)
+      progress_bar = self.progress_bar(count_file_lines(wordlist)+1, options)
 
       File.open(wordlist).each do |password|
         password.chomp!

lib/wpscan/wpscan_helper.rb

@@ -97,9 +97,9 @@ def help
   puts '                                    If no protocol is given (format host:port), HTTP will be used.'
   puts '--proxy-auth <username:password>    Supply the proxy login credentials.'
   puts '--basic-auth <username:password>    Set the HTTP Basic authentication.'
-  puts '--wordlist | -w <wordlist>          Supply a wordlist (with a newline at the end) for the password brute forcer.'
+  puts '--wordlist | -w <wordlist>          Supply a wordlist for the password brute forcer.'
   puts '--username | -U <username>          Only brute force the supplied username.'
-  puts '--usernames     <path-to-file>      Only brute force the usernames from the file (which need to have a newline at the end).'
+  puts '--usernames     <path-to-file>      Only brute force the usernames from the file.'
   puts '--threads  | -t <number of threads> The number of threads to use when multi-threading requests.'
   puts '--cache-ttl       <cache-ttl>       Typhoeus cache TTL.'
   puts '--request-timeout <request-timeout> Request Timeout.'