diff --git a/README b/README index 47e74bb5..cc50a01a 100644 --- a/README +++ b/README @@ -198,13 +198,13 @@ You should have received a copy of the GNU General Public License along with thi --basic-auth Set the HTTP Basic authentication. ---wordlist | -w Supply a wordlist (with a newline at the end) for the password brute forcer. +--wordlist | -w Supply a wordlist for the password brute forcer. --threads | -t The number of threads to use when multi-threading requests. --username | -U Only brute force the supplied username. ---usernames Only brute force the usernames from the file (which need to have a newline at the end). +--usernames Only brute force the usernames from the file. --cache-ttl Typhoeus cache TTL. diff --git a/README.md b/README.md index a9baa2ad..ec932c22 100644 --- a/README.md +++ b/README.md @@ -199,13 +199,13 @@ Apple Xcode, Command Line Tools and the libffi are needed (to be able to install --basic-auth Set the HTTP Basic authentication. - --wordlist | -w Supply a wordlist (with a newline at the end) for the password brute forcer. + --wordlist | -w Supply a wordlist for the password brute forcer. --threads | -t The number of threads to use when multi-threading requests. --username | -U Only brute force the supplied username. - --usernames Only brute force the usernames from the file (which need to have a newline at the end). + --usernames Only brute force the usernames from the file. --cache-ttl Typhoeus cache TTL. diff --git a/lib/common/models/wp_user/brute_forcable.rb b/lib/common/models/wp_user/brute_forcable.rb index effd86a0..2cc5f70e 100644 --- a/lib/common/models/wp_user/brute_forcable.rb +++ b/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! diff --git a/lib/wpscan/wpscan_helper.rb b/lib/wpscan/wpscan_helper.rb index 508cc49e..71ef20a9 100644 --- a/lib/wpscan/wpscan_helper.rb +++ b/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 Supply the proxy login credentials.' puts '--basic-auth Set the HTTP Basic authentication.' - puts '--wordlist | -w Supply a wordlist (with a newline at the end) for the password brute forcer.' + puts '--wordlist | -w Supply a wordlist for the password brute forcer.' puts '--username | -U Only brute force the supplied username.' - puts '--usernames Only brute force the usernames from the file (which need to have a newline at the end).' + puts '--usernames Only brute force the usernames from the file.' puts '--threads | -t The number of threads to use when multi-threading requests.' puts '--cache-ttl Typhoeus cache TTL.' puts '--request-timeout Request Timeout.'