Merge branch 'master' of https://github.com/rapid7/metasploit-framework

spec/lib/active_record/connection_adapters/abstract_adapter/connection_pool_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 # helps with environment configuration to use for connection to database

spec/lib/fastlib_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core'
@@ -228,4 +229,4 @@ describe FastLib do
 			end
 		end
 	end
-end
+end

spec/lib/msf/core/data_store_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/data_store'

spec/lib/msf/core/exploit/http/client_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core'

spec/lib/msf/core/module_manager_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 #
@@ -37,4 +38,4 @@ describe Msf::ModuleManager do
   it_should_behave_like 'Msf::ModuleManager::Cache'
   it_should_behave_like 'Msf::ModuleManager::Loading'
   it_should_behave_like 'Msf::ModuleManager::ModulePaths'
-end
+end

spec/lib/msf/core/modules/error_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 describe Msf::Modules::Error do
@@ -98,4 +99,4 @@ describe Msf::Modules::Error do
 
 		end
 	end
-end
+end

spec/lib/msf/core/modules/loader/archive_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core'
@@ -272,4 +273,4 @@ describe Msf::Modules::Loader::Archive do
 			end
 		end
 	end
-end
+end

spec/lib/msf/core/modules/loader/base_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core'

spec/lib/msf/core/modules/loader/directory_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 require 'msf/core'
 require 'msf/core/modules/loader/directory'

spec/lib/msf/core/modules/metasploit_class_compatibility_error_spec.rb

@@ -1,7 +1,8 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core/modules/metasploit_class_compatibility_error'
 
 describe Msf::Modules::MetasploitClassCompatibilityError do
 	it_should_behave_like 'Msf::Modules::Error subclass #initialize'
-end
+end

spec/lib/msf/core/modules/namespace_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'msf/core'
@@ -264,4 +265,4 @@ describe Msf::Modules::Namespace do
 			end
 		end
 	end
-end
+end

spec/lib/msf/core/modules/version_compatibility_error_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 describe Msf::Modules::VersionCompatibilityError do
@@ -59,4 +60,4 @@ describe Msf::Modules::VersionCompatibilityError do
 			end
 		end
 	end
-end
+end

spec/lib/msf/core/option_container_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_address_range_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_address_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_bool_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_int_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_path_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/options/opt_port_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'spec_helper'
 require 'msf/core/option_container'

spec/lib/msf/core/task_manager_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'msf/core'
 require 'msf/core/task_manager'

spec/lib/msf/util/exe_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'msf/core'
 require 'msf/base/simple'
@@ -97,6 +98,6 @@ describe Msf::Util::EXE do
     end
 
   end
-  
+
 end
 

spec/lib/rex/encoding/xor/byte_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/byte'
 require 'spec_helper'

spec/lib/rex/encoding/xor/dword_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/dword'
 require 'spec_helper'

spec/lib/rex/encoding/xor/qword_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/qword'
 require 'spec_helper'

spec/lib/rex/encoding/xor/word_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/word'
 require 'spec_helper'

spec/lib/rex/parser/nmap_xml_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 require 'rex/parser/nmap_xml'
 

spec/lib/rex/post/meterpreter/packet_parser_spec.rb

@@ -1,9 +1,10 @@
+# -*- coding:binary -*-
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/packet_parser'
 
 
 describe Rex::Post::Meterpreter::PacketParser do
-  subject{
+  subject(:parser){
     Rex::Post::Meterpreter::PacketParser.new
   }
   before(:each) do
@@ -17,41 +18,17 @@ describe Rex::Post::Meterpreter::PacketParser do
     end
   end
 
-  it "should respond to cipher" do
-    subject.should respond_to :cipher
-  end
-
-  it "should respond to raw" do
-    subject.should respond_to :raw
-  end
-
-  it "should respond to reset" do
-    subject.should respond_to :reset
-  end
-
-  it "should respond to recv" do
-    subject.should respond_to :recv
-  end
-
-  it "should respond to hdr_length_left" do
-    subject.should respond_to :hdr_length_left
-  end
-
-  it "should respond to payload_length_left" do
-    subject.should respond_to :payload_length_left
-  end
-
   it "should initialise with expected defaults" do
-    subject.send(:raw).should == ""
+    parser.send(:raw).should == ""
-    subject.send(:hdr_length_left).should == 8
+    parser.send(:hdr_length_left).should == 8
-    subject.send(:payload_length_left).should == 0
+    parser.send(:payload_length_left).should == 0
   end
 
   it "should parse valid raw data into a packet object" do
     while @raw.length >0
-      parsed_packet = subject.recv(@sock)
+      parsed_packet = parser.recv(@sock)
     end
-    parsed_packet.class.should == Rex::Post::Meterpreter::Packet
+    parsed_packet.should be_a Rex::Post::Meterpreter::Packet
     parsed_packet.type.should == Rex::Post::Meterpreter::PACKET_TYPE_REQUEST
     parsed_packet.method?("test_method").should == true
   end

spec/lib/rex/post/meterpreter/packet_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rex/post/meterpreter/packet'
 
 describe Rex::Post::Meterpreter::Tlv do

spec/lib/rex/proto/http/client_request_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'spec_helper'
 
 require 'rex/proto/http/client_request'

spec/lib/rex/proto/http/client_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rex/proto/http/client'
 
 # Note: Some of these tests require a failed

spec/lib/rex/socket/range_walker_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rex/socket/range_walker'
 
 describe Rex::Socket::RangeWalker do

spec/lib/rex/sslscan/result_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rex/sslscan/result'
 
 describe Rex::SSLScan::Result do

spec/lib/rex/sslscan/scanner_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rex/sslscan/scanner'
 require 'rex/thread_factory'
 require 'rex/text'
@@ -103,4 +104,4 @@ describe Rex::SSLScan::Scanner do
 		end
 	end
 
-end
+end

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'rubygems'
 require 'bundler'
 Bundler.require(:default, :test, :db)

spec/support/shared/contexts/database_cleaner.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'metasploit/framework/database'
 
 shared_context 'DatabaseCleaner' do
@@ -33,4 +34,4 @@ shared_context 'DatabaseCleaner' do
 			DatabaseCleaner.clean_with(:deletion)
 		end
 	end
-end
+end

spec/support/shared/contexts/msf/modules/error_attributes.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_context 'Msf::Modules::Error attributes' do
 	let(:causal_message) do
 		'rspec'
@@ -10,4 +11,4 @@ shared_context 'Msf::Modules::Error attributes' do
 	let(:module_reference_name) do
 		'module/reference/name'
 	end
-end
+end

spec/support/shared/contexts/msf/modules/loader_base.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_context "Msf::Modules::Loader::Base" do
 	let(:parent_path) do
 		parent_pathname.to_s
@@ -10,4 +11,4 @@ shared_context "Msf::Modules::Loader::Base" do
 	let(:root_pathname) do
 		Pathname.new(Msf::Config.install_root)
 	end
-end
+end

spec/support/shared/contexts/msf/simple/framework.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'msf/base/simple/framework'
 require 'metasploit/framework'
 

spec/support/shared/examples/msf/db_manager/import_msf_xml.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 require 'builder'
 
 shared_examples_for 'Msf::DBManager::ImportMsfXml' do

spec/support/shared/examples/msf/db_manager/import_msf_xml/check_msf_xml_version_with_root_tag.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'Msf::DBManager::ImportMsfXml#check_msf_xml_version! with root tag' do |root_tag, options={}|
 	options.assert_valid_keys(:allow_yaml)
 	allow_yaml = options.fetch(:allow_yaml)

spec/support/shared/examples/msf/db_manager/import_msf_xml/import_msf_web_element_specialization.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'Msf::DBManager::ImportMsfXml#import_msf_web_element specialization' do
 	it 'should call #import_msf_web_element with element' do
 		db_manager.should_receive(:import_msf_web_element).with(element, anything)

spec/support/shared/examples/msf/modules/error_subclass_initialize.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'Msf::Modules::Error subclass #initialize' do
 	context 'instance methods' do
 		context '#initialize' do
@@ -23,4 +24,4 @@ shared_examples_for 'Msf::Modules::Error subclass #initialize' do
 			end
 		end
 	end
-end
+end

spec/support/shared/examples/msf/modules/loader_archive_read_module_content.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'Msf::Modules::Loader::Archive#read_module_content' do
 	it 'should be able to read the module content' do
 		archived_module_content = subject.send(:read_module_content, @parent_path, type, module_reference_name)
@@ -10,4 +11,4 @@ shared_examples_for 'Msf::Modules::Loader::Archive#read_module_content' do
 		unarchived_module_content.should_not be_empty
 		archived_module_content.should == unarchived_module_content
 	end
-end
+end

spec/support/shared/examples/msf/modules/version_compatibility_error.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'Msf::Modules::VersionCompatibilityError' do
 	let(:error) do
 		begin
@@ -29,4 +30,4 @@ shared_examples_for 'Msf::Modules::VersionCompatibilityError' do
 	it 'should include module reference name' do
 		error.to_s.should include(module_reference_name)
 	end
-end
+end

spec/support/shared/examples/options.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 
 shared_examples_for "an option" do |valid_values, invalid_values|
   subject do

spec/support/shared/examples/typed_path.rb

@@ -1,3 +1,4 @@
+# -*- coding:binary -*-
 shared_examples_for 'typed_path' do |map|
 	map ||= {}
 	if map.length < 1

spec/support/shared/examples/xor_encoder.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 shared_examples_for 'an xor encoder' do |keysize|
 
 	it "should encode one block" do