ssh_scan 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1066cba29c8d997c6924ebc2155fa4ecc91d382c
-  data.tar.gz: 10880af54befeb4d528e91e15e17d9827578734b
+  metadata.gz: 7f982df7c0d64316e0203e9077176364282019f5
+  data.tar.gz: a1fa12c9549c55e7d8aa83ab04fbd6569340c08b
 SHA512:
-  metadata.gz: 698760530885d0c3288f426d9aa97eb2d84462d636c2509acacdbaaa2e24d9c4c53869abc7cb93d741b9dc16f29df6e18426909e0bc91a6fb70c3387b2a2a3ab
-  data.tar.gz: 683e352aec4ce7c2d7fc90ac56fbb050324017d4b155e690ea5ff92445e34eaba460c31cda5b487cda48a2e1f33b8122af2e6dfac30e65caf4ae147180878a6e
+  metadata.gz: 57b96260be86473b1a9dc3e1f7cb00bc97e2a91c030662b6dc24ea0deeb55dc01dcd0b84254c40f5e72fd965998c1686d5be05cb3c7a82a525f55968539c891a
+  data.tar.gz: 1ea7be3a1fddb6db396bd3f461c5b5fb5c78bea3aa9dbb35852d6bc2f7ed77d6e33fad7da17f61c729fa6def65952f98f67405509d5abc920322efb13d88ff49

data/.travis.yml

@@ -50,7 +50,7 @@ matrix:
     script:
       - docker build -t mozilla/ssh_scan .
       - >
-          if [ [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] ]; then \
+          if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then \
             docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" ;\
             docker push mozilla/ssh_scan:latest ;\
           else \

data/README.md

@@ -96,14 +96,7 @@ If you would like to run ssh_scan as a service, please refer to [the ssh_scan_ap
 
 ## Rubies Supported
 
-This project is integrated with [travis-ci](http://about.travis-ci.org/) and is regularly tested to work with the following rubies:
-
-* [ruby-head](https://github.com/ruby/ruby)
-* [2.3.0](https://github.com/ruby/ruby/tree/ruby_2_1)
-* [2.2.0](https://github.com/ruby/ruby/tree/ruby_2_1)
-* [2.1.3](https://github.com/ruby/ruby/tree/ruby_2_1)
-* [2.1.0](https://github.com/ruby/ruby/tree/ruby_2_1)
-* [2.0.0](https://github.com/ruby/ruby/tree/ruby_2_0_0)
+This project is integrated with [travis-ci](http://about.travis-ci.org/) and is regularly tested to work with multiple rubies.
 
 To checkout the current build status for these rubies, click [here](https://travis-ci.org/#!/mozilla/ssh_scan).
 

data/data/fingerprints.yml

@@ -1,5 +1,5 @@
 ---
-45.55.203.36:
-- 1b:21:eb:44:cd:3c:17:63:fa:6c:b2:58:11:ce:98:f4
-- 88:74:a1:9e:b9:38:a0:a8:ac:2d:bd:82:eb:09:a0:49:84:dc:b8:c6
-- 93:6c:b4:26:21:a8:ff:50:e9:e0:37:7b:2c:71:ea:e2:7e:6f:30:60:2e:8e:d2:b6:d7:8d:0a:78:a5:da:2c:76
+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

data/lib/ssh_scan/client.rb

@@ -44,6 +44,7 @@ module SSHScan
 
       begin
         @sock = Socket.tcp(@ip, @port, connect_timeout: @timeout)
+        @raw_server_banner = @sock.gets
       rescue SocketError => e
         @error = SSHScan::Error::ConnectionRefused.new(e.message)
         @sock = nil
@@ -66,8 +67,6 @@ module SSHScan
         @error = SSHScan::Error::ConnectionRefused.new(e.message)
         @sock = nil
       else
-        @raw_server_banner = @sock.gets
-
         if @raw_server_banner.nil?
           @error = SSHScan::Error::NoBanner.new(
             "service did not respond with an SSH banner"

data/lib/ssh_scan/result.rb

@@ -142,12 +142,8 @@ module SSHScan
     end
 
     def scan_duration
-      if start_time.nil?
-        raise "Cannot calculate scan duration without start_time set"
-      end
-
-      if end_time.nil?
-        raise "Cannot calculate scan duration without end_time set"
+      if start_time.nil? || end_time.nil?
+        return nil
       end
 
       end_time - start_time

data/lib/ssh_scan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata