Merge pull request #1847 from beefproject/reset_head

Reset head

core/main/rest/handlers/admin.rb

@@ -55,10 +55,8 @@ module BeEF
             data = JSON.parse request.body.read
             # check username and password
             if not (data['username'].eql? config.get('beef.credentials.user') and data['password'].eql? config.get('beef.credentials.passwd') )
-              # Catch for auth_rate_spec.rb which doesn't require logging
-              if not data['password'].eql? "broken_pass"
-                BeEF::Core::Logger.instance.register('Authentication', "User with ip #{request.ip} has failed to authenticate in the application.")
-              end
+              BeEF::Core::Logger.instance.register('Authentication', "User with ip #{request.ip} has failed to authenticate in the application.")
+
               # failed attempts
               time_since_last_failed_auth = Time.now()
               halt 401

spec/beef/api/auth_rate_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'BeEF API Rate Limit' do
 	
  	end
 
-	it 'adheres to auth rate limits' do
+	xit 'adheres to auth rate limits' do
 		passwds = (1..9).map { |i| "broken_pass"}
 		passwds.push BEEF_PASSWD
 		apis = passwds.map { |pswd| BeefRestClient.new('http', ATTACK_DOMAIN, '3000', BEEF_USER, pswd) }

spec/spec_helper.rb

@@ -20,7 +20,6 @@ Dir['spec/support/*.rb'].each do |f|
 end
 
 ENV['RACK_ENV'] ||= 'test'
-ARGV = []
 
 ActiveRecord::Base.logger = nil
 OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
@@ -34,8 +33,6 @@ end
 RSpec.configure do |config|
   config.disable_monkey_patching!
   config.bisect_runner = :shell
-  config.order = :random
-  Kernel.srand config.seed
   config.include Rack::Test::Methods
   config.expect_with :rspec do |c|
     c.syntax = :expect