corona 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a58477906743f5fac988279012b93487a41bab83
-  data.tar.gz: 0b29989d94860c8dc7ad9115af8ca054dee38866
+SHA256:
+  metadata.gz: 2d9958f5986616d7963e265e51f778b6cf4e2a9822594a7e76dfac83cac2e51b
+  data.tar.gz: 99e860c73a163ebd88da7a03dc218fb081662395a856318b3e6dcfbd4fb5692d
 SHA512:
-  metadata.gz: 3de9ea50f8b4df65e3690219c6ac078c9ee2ab3af19286dda0ab0593b4f5a85790b371aaa95233723acdb61e2811dbd8bf3926249293bc836675be0e056df8cc
-  data.tar.gz: 78c5edd96e99b229212fd02b2c783251d5045be295d7db0ed5d2a846c89af575a5360ef6417ad5063093320acc3bbfc1666b168b2e112201af7c09690ab1d716
+  metadata.gz: c17550ebabd3b8df53695fa5312316b49cf232caf6510bcee1cffd29446a16a522d75a7e68a2929d76bc2d8365a8557886312105f55c83f8dbc3005e3a6fcf04
+  data.tar.gz: e011e02ae3492638948f527d4422daba7187d557aed334d442f840b07c9712c87e49e5c0c4024a325f30869c5d5d5ec13e8f1a08be38556cf8d850031fa0008c

data/.gitignore

@@ -0,0 +1 @@
+gems

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 0.2.0
+  - move to use newer sequel gem
+    * this drops support for schema plugin
+  - refresh other dependencies as well
+
+# 0.1.10
+  - FIX: check error_status from snmp_response and act based on that
+
+# 0.1.9
+  - FEATURE: Aruba switch support (rebranded HP Procurve)
+
+# 0.1.8
+  - FEATURE: Huawei MA5800 support (HIAS)
+  - FIX: SSR's sysObjectID was changed in IPOS-16.1.1.8.29
+
+# 0.1.7
+  - bugfix
+
+# 0.1.6
+  - FIX: match older SSRs as well
+
+# 0.1.5
+  - FEATURE: Ericsson SSR support
+
 # 0.1.2
   - FEATURE: Alcatel ISAM support
   - FEATURE: Huawei VRP support

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    corona (0.0.12)
-      asetus
-      sequel
-      slop
-      snmp
-      sqlite3
+    corona (0.2.0)
+      asetus (~> 0.3)
+      sequel (~> 5.10)
+      slop (~> 3.6)
+      snmp (~> 1.2)
+      sqlite3 (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    asetus (0.0.7)
-      slop
-    sequel (4.9.0)
-    slop (3.5.0)
-    snmp (1.1.1)
-    sqlite3 (1.3.9)
+    asetus (0.3.0)
+    sequel (5.24.0)
+    slop (3.6.0)
+    snmp (1.3.2)
+    sqlite3 (1.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   corona!
+
+BUNDLED WITH
+   2.0.2

data/bin/corona

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'corona/cli'
+  require_relative '../lib/corona/cli'
   Corona::CLI.new.run
 rescue => error
   warn "#{error}"

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.1.2'
+  s.version           = '0.2.0'
   s.licenses          = %w( 'Apache-2.0' )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.executables       = %w( corona )
   s.require_path      = 'lib'
 
-  s.add_runtime_dependency 'sequel',  '~> 4.12'
-  s.add_runtime_dependency 'sqlite3', '~> 1.3'
+  s.add_runtime_dependency 'sequel',  '~> 5.10'
+  s.add_runtime_dependency 'sqlite3', '~> 1.4'
   s.add_runtime_dependency 'snmp',    '~> 1.2'
-  s.add_runtime_dependency 'slop',    '~> 3.5'
-  s.add_runtime_dependency 'asetus',  '~> 0.1'
+  s.add_runtime_dependency 'slop',    '~> 3.6'
+  s.add_runtime_dependency 'asetus',  '~> 0.3'
 end

data/lib/corona/cli.rb

@@ -1,8 +1,9 @@
 module Corona
   class CLI
     MAX_DELETE = 1
-    require 'corona'
+    gem 'slop', "=3.6.0"
     require 'slop'
+    require_relative '../corona'
     class NoConfig < CoronaError; end
 
     def run

data/lib/corona/core.rb

@@ -1,8 +1,8 @@
-require 'corona/log'
-require 'corona/config'
-require 'corona/snmp'
-require 'corona/db/db'
-require 'corona/model'
+require_relative 'log'
+require_relative 'config'
+require_relative 'snmp'
+require_relative 'db/db'
+require_relative 'model'
 require 'ipaddr'
 require 'resolv'
 
@@ -56,6 +56,7 @@ module Corona
       snmp = SNMP.new ip.to_s, @community
       oids = snmp.dbget
       if oids
+        return nil if oids[:sysDescr] == ::SNMP::NoSuchObject
         result = {:oids=>oids, :ip=>ip, :int=>'n/a'}
         if index = snmp.ip2index(ip.to_s)
           if int = snmp.ifdescr(index)

data/lib/corona/db/db.rb

@@ -3,8 +3,8 @@ module Corona
     require 'sequel'
     require 'sqlite3'
     def initialize
-      Sequel::Model.plugin :schema
       @db = Sequel.sqlite(CFG.db, :max_connections => 1, :pool_timeout => 60)
+      create_table #unless @db.table_exists?(:devices)
       require_relative 'model'
     end
 
@@ -27,5 +27,25 @@ module Corona
       sysName  = Device[:oid_sysName => oid_sysName]
       [ip, sysName]
     end
+
+    private
+    
+    def create_table
+      @db.create_table? :devices do
+        primary_key :id
+        String      :ip
+        String      :ptr
+        String      :model
+        String      :oid_ifDescr
+        Boolean     :active
+        Time        :first_seen
+        Time        :last_seen
+        String      :oid_sysName
+        String      :oid_sysLocation
+        String      :oid_sysDescr
+        String      :oid_sysObjectID
+      end
+    end
+
   end
 end

data/lib/corona/db/model.rb

@@ -1,21 +1,6 @@
 module Corona
   class DB
     class Device < Sequel::Model
-      set_schema do
-        primary_key :id
-        String      :ip
-        String      :ptr
-        String      :model
-        String      :oid_ifDescr
-        Boolean     :active
-        Time        :first_seen
-        Time        :last_seen
-        String      :oid_sysName
-        String      :oid_sysLocation
-        String      :oid_sysDescr
-        String      :oid_sysObjectID
-      end
-      create_table unless table_exists?
     end
   end
 end

data/lib/corona/model.rb

@@ -50,6 +50,10 @@ module Corona
         'isam'
       when /^\d+[A-Z]\sEthernet Switch$/
         'powerconnect'
+      when /Ericsson IPOS/
+        'ssr'
+      when /Huawei Integrated Access Software/
+        'hias'
       else
         case sysObjectID
         when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.12356.'))
@@ -76,6 +80,18 @@ module Corona
           'xos'          # 1.3.6.1.4.1.1916.2.76 (X450a-48t)
         when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.9.1.745'))
           'asa'          # 1.3.6.1.4.1.9.1.745
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.20858.2.600'))
+          'casa'         # 1.3.6.1.4.1.20858.2.600
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.2011.2.169'))
+          'hias'         # 1.3.6.1.4.1.2011.2.169
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.2011.2.300'))
+          'hias'         # 1.3.6.1.4.1.2011.2.300 (MA5800 OLT)
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.2352.1'))
+          'ssr'          # 1.3.6.1.4.1.2352.1.17 and .18
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.193.218.1'))
+          'ssr'          # 1.3.6.1.4.1.193.218.1.17 and .18
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.11.2.3.7.11'))
+          'procurve'     # Aruba switches are really HP Procurve
         else
           'unsupported'
         end

data/lib/corona/snmp.rb

@@ -1,5 +1,6 @@
 module Corona
   class SNMP
+  class InvalidResponse < StandardError; end
     DB_OID = {
       :sysDescr     => '1.3.6.1.2.1.1.1.0',
       :sysObjectID  => '1.3.6.1.2.1.1.2.0',
@@ -35,7 +36,9 @@ module Corona
     def mget oids=DB_OID
       result = {}
       begin
-        @snmp.get(oids.map{|_,oid|oid}).each_varbind do |vb|
+        res = @snmp.get(oids.map{|_,oid|oid})
+        raise InvalidResponse, "#{res.error_status} from #{@snmp.config[:host]}" unless res.error_status == :noError
+        res.each_varbind do |vb|
           oids.each do |name,oid|
             if vb.name.to_str == oid
               result[name] = vb.value
@@ -45,6 +48,8 @@ module Corona
         end
       rescue ::SNMP::RequestTimeout, Errno::EACCES
         return false
+      rescue InvalidResponse => e
+        return false
       end
       result
     end

data/lib/corona.rb

@@ -1,4 +1,4 @@
 module Corona
   class CoronaError < StandardError; end
-  require 'corona/core'
+  require_relative 'corona/core'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: snmp
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: asetus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 description: Threaded SNMP poll based network discovery. Devices are stored in SQL
 email:
 - saku@ytti.fi
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
@@ -125,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: corona
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: device discovery via snmp polls