Merge pull request #426 from mozilla/bug_fix_for_grade

Bug fix for grade

Author: Jonathan Claudius

lib/ssh_scan/result.rb

@@ -182,19 +182,19 @@ def set_compliance=(compliance)
     end
 
     def compliance_policy
-      @compliance[:policy]
+      @compliance["policy"]
     end
 
     def compliant?
-      @compliance[:compliant]
+      @compliance["compliant"]
     end
 
     def compliance_references
-      @compliance[:references]
+      @compliance["references"]
     end
 
     def compliance_recommendations
-      @compliance[:recommendations]
+      @compliance["recommendations"]
     end
 
     def set_client_attributes(client)
@@ -220,11 +220,11 @@ def error
     end
 
     def grade=(grade)
-      @compliance[:grade] = grade
+      @compliance["grade"] = grade
     end
 
     def grade
-      @compliance[:grade] 
+      @compliance["grade"] 
     end
 
     def to_hash

spec/ssh_scan/grader_spec.rb

@@ -6,9 +6,9 @@
   it "should provide an F grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
         "Add these Key Exchange Algos: ecdh-sha2-nistp521,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256",
         "Add these MAC Algos: [email protected],[email protected],[email protected],[email protected]",
         "Add these Encryption Ciphers: [email protected],[email protected]",
@@ -24,9 +24,9 @@
   it "should provide an F grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
         "Add these Key Exchange Algos: ecdh-sha2-nistp521,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256",
         "Add these MAC Algos: [email protected],[email protected],[email protected],[email protected]",
         "Add these Encryption Ciphers: [email protected],[email protected]",
@@ -40,9 +40,9 @@
   it "should provide an D grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
         "Add these Key Exchange Algos: ecdh-sha2-nistp521,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256",
         "Add these MAC Algos: [email protected],[email protected],[email protected],[email protected]",
         "Add these Encryption Ciphers: [email protected],[email protected]",
@@ -55,9 +55,9 @@
   it "should provide an C grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
         "Add these Key Exchange Algos: ecdh-sha2-nistp521,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256",
         "Add these MAC Algos: [email protected],[email protected],[email protected],[email protected]",
       ]
@@ -69,9 +69,9 @@
   it "should provide an B grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
         "Add these Key Exchange Algos: ecdh-sha2-nistp521,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256",
       ]
     }
@@ -82,9 +82,9 @@
   it "should provide an A grade" do
     result = SSHScan::Result.new()
     result.set_compliance = {
-      :policy => "Test Result",
-      :compliant => false,
-      :recommendations => [
+      "policy" => "Test Result",
+      "compliant" => false,
+      "recommendations" => [
       ]
     }
     grader = SSHScan::Grader.new(result)

spec/ssh_scan/result_spec.rb

@@ -179,49 +179,49 @@
   context "when setting compliance" do 
     it "should allow setting of the compliance information" do
       compliance = {
-        :policy => "Test Policy",
-        :compliant => true,
-        :recommendations => ["do this", "do that"],
-        :references => ["https://reference.example.com"],
+        "policy" => "Test Policy",
+        "compliant" => true,
+        "recommendations" => ["do this", "do that"],
+        "references" => ["https://reference.example.com"],
       }
       result = SSHScan::Result.new()
       result.set_compliance = compliance
 
-      expect(result.compliance_policy).to eql(compliance[:policy])
-      expect(result.compliant?).to eql(compliance[:compliant])
-      expect(result.compliance_recommendations).to eql(compliance[:recommendations])
-      expect(result.compliance_references).to eql(compliance[:references])
+      expect(result.compliance_policy).to eql(compliance["policy"])
+      expect(result.compliant?).to eql(compliance["compliant"])
+      expect(result.compliance_recommendations).to eql(compliance["recommendations"])
+      expect(result.compliance_references).to eql(compliance["references"])
       expect(result.to_hash).to be_kind_of(Hash)
     end
   end
 
   context "when setting grade" do 
     it "should allow setting of the grade information" do
       compliance = {
-        :policy => "Test Policy",
-        :compliant => true,
-        :recommendations => ["do this", "do that"],
-        :references => ["https://reference.example.com"],
+        "policy" => "Test Policy",
+        "compliant" => true,
+        "recommendations" => ["do this", "do that"],
+        "references" => ["https://reference.example.com"],
       }
       result = SSHScan::Result.new()
       result.set_compliance = compliance
       result.grade = "D"
 
-      expect(result.compliance_policy).to eql(compliance[:policy])
-      expect(result.compliant?).to eql(compliance[:compliant])
-      expect(result.compliance_recommendations).to eql(compliance[:recommendations])
-      expect(result.compliance_references).to eql(compliance[:references])
+      expect(result.compliance_policy).to eql(compliance["policy"])
+      expect(result.compliant?).to eql(compliance["compliant"])
+      expect(result.compliance_recommendations).to eql(compliance["recommendations"])
+      expect(result.compliance_references).to eql(compliance["references"])
       expect(result.grade).to eql("D")
     end
   end
 
   context "when dealing with errors" do 
     it "should append errors " do
       compliance = {
-        :policy => "Test Policy",
-        :compliant => true,
-        :recommendations => ["do this", "do that"],
-        :references => ["https://reference.example.com"],
+        "policy" => "Test Policy",
+        "compliant" => true,
+        "recommendations" => ["do this", "do that"],
+        "references" => ["https://reference.example.com"],
       }
       result = SSHScan::Result.new()
       result.set_compliance = compliance