better spec coverage

Author: David Maloney

lib/rex/sslscan/result.rb

@@ -5,7 +5,7 @@
 module Rex::SSLScan
 class Result
 
-	attr_accessor :sslv2
+	attr_accessor :openssl_sslv2
 
 	attr_reader :ciphers
 	attr_reader :supported_versions
@@ -201,7 +201,9 @@ def to_s
 		if @cert
 			text <<" \n\n #{@cert.to_text}"
 		end
-		text << "\n\n *** WARNING: Your OS hates freedom! Your OpenSSL libs are compiled without SSLv2 support!"
+		if openssl_sslv2 == false
+			text << "\n\n *** WARNING: Your OS hates freedom! Your OpenSSL libs are compiled without SSLv2 support!"
+		end
 		text
 	end
 end

lib/rex/sslscan/scanner.rb

@@ -51,7 +51,7 @@ def valid?
 	# @return [Result] object containing the details of the scan
 	def scan
 		scan_result = Rex::SSLScan::Result.new
-		scan_result.sslv2 = sslv2
+		scan_result.openssl_sslv2 = sslv2
 		# If we can't get any SSL connection, then don't bother testing
 		# individual ciphers.
 		if test_ssl == :rejected and test_tls == :rejected

spec/lib/rex/sslscan/result_spec.rb

@@ -46,7 +46,7 @@
 		end
 
 		it "should return an empty array for #tlsv1" do
-			subject.sslv2.should == []
+			subject.tlsv1.should == []
 		end
 
 		it "should return an empty array for #weak_ciphers" do
@@ -469,16 +469,58 @@
 		end
 	end
 
-	context "when OpenSSL is compiled without SSLv2" do
-		before(:each) do
-			subject.add_cipher(:SSLv3, "AES256-SHA", 256, :accepted)
-			subject.add_cipher(:TLSv1, "AES256-SHA", 256, :accepted)
-			subject.add_cipher(:SSLv3, "AES128-SHA", 128, :accepted)
-			subject.sslv2 = false
+	context "when printing the results" do
+		context "when OpenSSL is compiled without SSLv2" do
+			before(:each) do
+				subject.add_cipher(:SSLv3, "AES256-SHA", 256, :accepted)
+				subject.add_cipher(:TLSv1, "AES256-SHA", 256, :accepted)
+				subject.add_cipher(:SSLv3, "AES128-SHA", 128, :accepted)
+				subject.openssl_sslv2 = false
+			end
+			it "should warn the user" do
+				subject.to_s.should include "*** WARNING: Your OS hates freedom! Your OpenSSL libs are compiled without SSLv2 support!"
+			end
 		end
-		it "should warn the user" do
-			subject.to_s.should include "*** WARNING: Your OS hates freedom! Your OpenSSL libs are compiled without SSLv2 support!"
+
+		context "when we have SSL results" do
+			before(:each) do
+				subject.add_cipher(:SSLv3, "AES256-SHA", 256, :accepted)
+				subject.add_cipher(:TLSv1, "AES256-SHA", 256, :accepted)
+				subject.add_cipher(:SSLv3, "AES128-SHA", 128, :accepted)
+				subject.add_cipher(:SSLv3, "EXP-RC2-CBC-MD5", 40, :accepted)
+
+				cert = OpenSSL::X509::Certificate.new
+				key = OpenSSL::PKey::RSA.new 2048 
+				cert.version = 2 #
+				cert.serial = 1
+				cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby CA"
+				cert.issuer = cert.subject 
+				cert.public_key = key.public_key
+				cert.not_before = Time.now
+				cert.not_after = cert.not_before + 2 * 365 * 24 * 60 * 60 # 2 
+
+				subject.cert = cert
+			end
+
+			it "should contain the certificate" do
+				subject.to_s.should include "Issuer: DC=org, DC=ruby-lang, CN=Ruby CA"
+				subject.to_s.should include "Subject: DC=org, DC=ruby-lang, CN=Ruby CA"
+			end
+
+			it "should have a table with our SSL Cipher Results" do
+				subject.to_s.should include "Accepted  *     SSLv3        40          EXP-RC2-CBC-MD5"
+				subject.to_s.should include "Accepted        SSLv3        128         AES128-SHA"
+				subject.to_s.should include "Accepted        SSLv3        256         AES256-SHA"
+				subject.to_s.should include "Accepted        TLSv1        256         AES256-SHA"
+			end
+		end
+
+		it "should return an appropriate message when SSL is not supported" do
+			subject.stub(:supports_ssl?).and_return(false)
+			subject.to_s.should == "Server does not appear to support SSL on this port!"
 		end
+
+
 	end
 
 end

spec/spec_helper.rb

@@ -1,7 +1,9 @@
+require 'simplecov'
 require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :test)
 
+SimpleCov.start
 # add project lib directory to load path
 spec_pathname = Pathname.new(__FILE__).dirname
 root_pathname = spec_pathname.join('..').expand_path