ssh_scan 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f982df7c0d64316e0203e9077176364282019f5
-  data.tar.gz: a1fa12c9549c55e7d8aa83ab04fbd6569340c08b
+  metadata.gz: d24a75be619ed3b8567cce7be9e5ac20b0acd720
+  data.tar.gz: 65d64750b90635a8e146752fc74671150cbfddf0
 SHA512:
-  metadata.gz: 57b96260be86473b1a9dc3e1f7cb00bc97e2a91c030662b6dc24ea0deeb55dc01dcd0b84254c40f5e72fd965998c1686d5be05cb3c7a82a525f55968539c891a
-  data.tar.gz: 1ea7be3a1fddb6db396bd3f461c5b5fb5c78bea3aa9dbb35852d6bc2f7ed77d6e33fad7da17f61c729fa6def65952f98f67405509d5abc920322efb13d88ff49
+  metadata.gz: 699dadeff7f4c746b64f08e9119bc19c2186f79a07843e202b98b7e05178ef10cea6b728e355dab134e2aa33f0c95cb2a4b229a0aa3fa3277f9dc0b1e969fc3b
+  data.tar.gz: 612f62c3345e61807a0fee2a021b3a7f8d83d3e2fb10ad32c7f2acee1929c91f8759e30c46c823c9ea91d9c2390e55e18b0d9989c269ee1b0a7ea3af62fd778c

data/data/fingerprints.yml

@@ -1,5 +1,5 @@
 ---
-45.33.31.58:
-- de:e2:67:eb:fb:57:8e:8d:99:81:7a:e0:5e:ca:d8:31
-- cf:1a:b5:99:49:52:95:1f:ad:c6:b1:73:37:a6:de:ee:8e:40:8c:3f
-- 50:75:0c:b2:91:bd:0c:6c:07:33:5d:5f:fe:44:7c:f7:cf:04:cb:d6:30:4e:1d:bd:eb:4c:dd:81:12:ca:17:79
+45.55.176.164:
+- 4f:17:6e:38:63:0c:af:1c:f4:97:4f:ab:04:b4:47:a0
+- 8c:71:d0:85:e5:2e:4c:24:34:4b:97:0a:af:37:f4:09:41:8d:ae:6d
+- b5:b1:f8:2f:99:4e:88:bc:9d:6c:81:2b:9f:1c:db:44:2d:dd:e5:66:cb:49:bf:7e:e1:1a:a2:5f:d1:39:d2:16

data/lib/ssh_scan/attribute.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+
+module SSHScan
+  # A helper to turn array of strings into arrays of attributes for quick comparison
+  def self.make_attributes(array)
+    array.map {|item| SSHScan::Attribute.new(item)}
+  end
+
+  # A class for making attribute comparison possible beyond simple string comparison
+  class Attribute
+    def initialize(attribute_string)
+      @attribute_string = attribute_string
+    end
+
+    def to_s
+      @attribute_string
+    end
+
+    def base
+      @attribute_string.split("@").first
+    end
+
+    def ==(other)
+      self.base == other.base
+    end
+  end
+end

data/lib/ssh_scan/policy.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'ssh_scan/attribute'
 
 module SSHScan
   # Policy methods that deal with key exchange, macs, encryption methods,
@@ -27,6 +28,22 @@ module SSHScan
       self.new(opts)
     end
 
+    def kex_attributes
+      SSHScan.make_attributes(@kex)
+    end
+
+    def mac_attributes
+      SSHScan.make_attributes(@macs)
+    end
+
+    def encryption_attributes
+      SSHScan.make_attributes(@encryption)
+    end
+
+    def compression_attributes
+      SSHScan.make_attributes(@compression)
+    end
+
     # Generate a {SSHScan::Policy} object from YAML string.
     # @param string [String] YAML string
     # @return [SSHScan::Policy] new instance with parameters loaded

data/lib/ssh_scan/policy_manager.rb

@@ -1,3 +1,5 @@
+require 'ssh_scan/attribute'
+
 module SSHScan
   # Policy management methods, compliance checking and recommendations.
   class PolicyManager
@@ -13,7 +15,7 @@ module SSHScan
         @result.encryption_algorithms_server_to_client
       outliers = []
       target_encryption.each do |target_enc|
-        outliers << target_enc unless @policy.encryption.include?(target_enc)
+        outliers << target_enc unless @policy.encryption_attributes.include?(SSHScan::Attribute.new(target_enc))
       end
       return outliers
     end
@@ -25,7 +27,7 @@ module SSHScan
         @result.encryption_algorithms_server_to_client
       outliers = []
       @policy.encryption.each do |encryption|
-        if target_encryption.include?(encryption) == false
+        if SSHScan.make_attributes(target_encryption).include?(SSHScan::Attribute.new(encryption)) == false
           outliers << encryption
         end
       end
@@ -39,7 +41,7 @@ module SSHScan
         @result.mac_algorithms_client_to_server
       outliers = []
       target_macs.each do |target_mac|
-        outliers << target_mac unless @policy.macs.include?(target_mac)
+        outliers << target_mac unless @policy.mac_attributes.include?(SSHScan::Attribute.new(target_mac))
       end
       return outliers
     end
@@ -52,7 +54,7 @@ module SSHScan
       outliers = []
 
       @policy.macs.each do |mac|
-        if target_macs.include?(mac) == false
+        if SSHScan.make_attributes(target_macs).include?(SSHScan::Attribute.new(mac)) == false
           outliers << mac
         end
       end
@@ -64,7 +66,7 @@ module SSHScan
       target_kexs = @result.key_algorithms
       outliers = []
       target_kexs.each do |target_kex|
-        outliers << target_kex unless @policy.kex.include?(target_kex)
+        outliers << target_kex unless @policy.kex_attributes.include?(SSHScan::Attribute.new(target_kex))
       end
       return outliers
     end
@@ -75,7 +77,7 @@ module SSHScan
       outliers = []
 
       @policy.kex.each do |kex|
-        if target_kex.include?(kex) == false
+        if SSHScan.make_attributes(target_kex).include?(SSHScan::Attribute.new(kex)) == false
           outliers << kex
         end
       end
@@ -90,7 +92,7 @@ module SSHScan
       outliers = []
       target_compressions.each do |target_compression|
         outliers << target_compression unless
-          @policy.compression.include?(target_compression)
+          @policy.compression_attributes.include?(SSHScan::Attribute.new(target_compression))
       end
       return outliers
     end
@@ -103,7 +105,7 @@ module SSHScan
       outliers = []
 
       @policy.compression.each do |compression|
-        if target_compressions.include?(compression) == false
+        if SSHScan.make_attributes(target_compressions).include?(SSHScan::Attribute.new(compression)) == false
           outliers << compression
         end
       end

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.25'
+  VERSION = '0.0.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -340,6 +340,7 @@ files:
 - data/ssh-badkeys/host/zyxel-vmg1312_rsa.pub
 - data/ssh-badkeys/host/zyxel-vmg1312_rsa.yml
 - lib/ssh_scan.rb
+- lib/ssh_scan/attribute.rb
 - lib/ssh_scan/banner.rb
 - lib/ssh_scan/client.rb
 - lib/ssh_scan/constants.rb