oxidized 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25fe620dbb51b1d8dacb76a070dc15a94701276f
-  data.tar.gz: f652f415b1b70df26a440e2afc79f52a911cd113
+  metadata.gz: cba5f31454c2e6512d70c1688f81885e82a97ad9
+  data.tar.gz: 40b8dfe37843039c8fef5cedc443a7101c78ffa1
 SHA512:
-  metadata.gz: 584f5467dc20399b3c81d906e7b8531970d75ae4a04c8d190e999218c78dbfc0b42f31cc3d0913ca10afbadd3f279ff91c702ec2364bf9763c09dceb88ad9e34
-  data.tar.gz: 974ed7ba183e5d91b067d993da98568ba708243df949b18a9c8de4913c0500151b8f4b0cae28720e5e21d56a5e578c0e1109c1a8c59cebb473cb08bb926edf97
+  metadata.gz: 8ca49b2ed227d5526c2d2093c794fd67a796822f7aeb30966060ac7ff46d12446b7c54fc6438b9e54e57d442422d92dccfaf5483e71141de066dfeda5d2726cc
+  data.tar.gz: 2df84d9068fcdebd9c633d627a189ea5eaf915c9e04dc00af03b372dfba944c5ad8e1e0508ab93968295136d69a892b9098dbcc0218e2880558bfccf04bbb119

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.16.3
+- FEATURE: pfsense support (by @stokbaek)
+- BUGFIX: cumulus prompt not working with default switch configs (by @nertwork)
+- BUGFIX: disconnect ssh when prompt wasn't found (by @andir)
+- BUGFIX: saos, asa, acos, timos updates, cumulus
+
 # 0.16.2
 - BUGFIX: when not using git (by @danilopopeye)
 - BUGFIX: screenos update

data/README.md

@@ -1,6 +1,4 @@
-# Oxidized [![Build Status](https://travis-ci.org/Shopify/oxidized.svg)](https://travis-ci.org/Shopify/oxidized)
-
-[![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized)
+# Oxidized [![Build Status](https://travis-ci.org/Shopify/oxidized.svg)](https://travis-ci.org/Shopify/oxidized) [![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized) [![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
 
 Oxidized is a network device configuration backup tool. It's a RANCID replacement!
 
@@ -50,7 +48,6 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * AOS
    * AOS7
    * ISAM
-   * TiMOS
    * Wireless
  * Arista
    * EOS
@@ -118,10 +115,13 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * MasterOS
  * Netonix
    * WISP Switch (As Netonix)
+ * Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)
+   * SR OS (TiMOS)
  * Opengear
    * Opengear
  * Palo Alto
    * PANOS
+ * pfSense
  * Quanta
    * Quanta / VxWorks 6.6 (1.1.0.8)
  * Supermicro
@@ -420,6 +420,8 @@ source:
     url: https://url/api
     scheme: https
     delimiter: !ruby/regexp /:/
+    user: username
+    pass: password
     map:
       name: hostname
       model: os
@@ -510,7 +512,7 @@ output:
 
 ### Output types
 
-If you prefer to have different outputs in different files and/or directories, you can easily do this by modifying the corresponding model. To change the behaviour for IOS, you would edit `lib/oxidized/model/ios.rb`.
+If you prefer to have different outputs in different files and/or directories, you can easily do this by modifying the corresponding model. To change the behaviour for IOS, you would edit `lib/oxidized/model/ios.rb` (run `gem contents oxidized` to find out the full file path).
 
 For example, let's say you want to split out `show version` and `show inventory` into separate files in a directory called `nodiff` which your tools will not send automated diffstats for. You can apply a patch along the lines of
 

data/bin/oxidized

@@ -9,5 +9,6 @@ begin
   Oxidized::CLI.new.run
 rescue => error
   warn "#{error}"
-  raise if Oxidized.config.debug
+  debug = Oxidied.config.debug rescue true
+  raise if debug
 end

data/lib/oxidized.rb

@@ -43,7 +43,7 @@ module Oxidized
                   else
                     require 'logger'
                     if config.has_key?('log')
-                      Logger.new(config.log)
+                      Logger.new(File.expand_path(config.log))
                     else
                       Logger.new(STDERR)
                     end

data/lib/oxidized/input/cli.rb

@@ -14,6 +14,9 @@ module Oxidized
         d = node.model.get
         disconnect
         d
+      rescue PromptUndetect
+        disconnect
+        raise
       end
 
       def connect_cli

data/lib/oxidized/model/acos.rb

@@ -6,6 +6,13 @@ class ACOS < Oxidized::Model
   ##ACOS prompt changes depending on the state of the device
   prompt /^([-\w.\/:?\[\]\(\)]+[#>]\s?)$/
 
+  cmd :secret do |cfg|
+    cfg.gsub!(/community read encrypted (\S+)/, 'community read encrypted <hidden>') # snmp
+    cfg.gsub!(/secret encrypted (\S+)/, 'secret encrypted <hidden>') # tacacs-server
+    cfg.gsub!(/password encrypted (\S+)/, 'password encrypted <hidden>') # user
+    cfg
+  end
+
   cmd 'show version' do |cfg|
     cfg.gsub! /\s(Last configuration saved at).*/, ' \\1 <removed>'
     cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
@@ -22,11 +29,20 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show partition-config all' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
+  end  
+
   cmd 'show running-config all-partitions' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
   end
 
   cmd 'show aflex all-partitions' do |cfg|

data/lib/oxidized/model/asa.rb

@@ -13,6 +13,9 @@ class ASA < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub! /enable password (\S+) (.*)/, 'enable password <secret hidden> \2'
     cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
+    cfg.gsub! /ikev2 pre-shared-key (\S+)/, 'ikev2 pre-shared-key <secret hidden>'
+    cfg.gsub! /ikev2 (remote|local)-authentication pre-shared-key (\S+)/, 'ikev2 \1-authentication pre-shared-key <secret hidden>'
+    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host.*\n\skey) \S+$/mi, '\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/cumulus.rb

@@ -1,6 +1,6 @@
 class Cumulus < Oxidized::Model
   
-  prompt /^((\w*)@(.*)([>#]\s)+)$/
+  prompt /^((\w*)@(.*)):/
   comment  '# '
   
   
@@ -22,7 +22,7 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/hosts'
     
     cfg += add_comment 'THE INTERFACES'
-    cfg += cmd 'cat /etc/network/interfaces'
+    cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
     
     cfg += add_comment 'RESOLV.CONF'
     cfg += cmd 'cat /etc/resolv.conf'
@@ -30,6 +30,9 @@ class Cumulus < Oxidized::Model
     cfg += add_comment 'NTP.CONF'
     cfg += cmd 'cat /etc/ntp.conf'
     
+    cfg += add_comment 'IP Routes'
+    cfg += cmd 'netstat -rn'
+
     cfg += add_comment 'QUAGGA DAEMONS'
     cfg += cmd 'cat /etc/quagga/daemons'
     
@@ -55,10 +58,13 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/cumulus/switchd.conf'
     
     cfg += add_comment 'ACL'
-    cfg += cmd 'iptables -L'
+    cfg += cmd 'iptables -L -n'
     
     cfg += add_comment 'VERSION'
     cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+
+    cfg += add_comment 'License'
+    cfg += cmd 'cl-license'
     
   end
   
@@ -73,4 +79,4 @@ class Cumulus < Oxidized::Model
   end
  
 
-end
+end

data/lib/oxidized/model/datacom.rb

@@ -24,7 +24,12 @@ class DataCom < Oxidized::Model
     cfg.cut_head
   end
 
-  cfg :telnet, :ssh do
+  cfg :ssh do
+    password /^Password:\s$/
+    pre_logout 'exit'
+  end
+
+  cfg :telnet do
     username /login:\s$/
     password /^Password:\s$/
     pre_logout 'exit'

data/lib/oxidized/model/pfsense.rb

@@ -0,0 +1,27 @@
+class PfSense < Oxidized::Model
+
+  # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
+  
+  comment  '# '
+  
+  #add a comment in the final conf
+  def add_comment comment
+    "\n###### #{comment} ######\n" 
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+  
+  #show the persistent configuration
+  pre do
+    cfg = add_comment 'Configuration'
+    cfg += cmd 'cat /cf/conf/config.xml'    
+  end
+  
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+ 
+end

data/lib/oxidized/model/saos.rb

@@ -17,8 +17,10 @@ class SAOS < Oxidized::Model
     username /login:/
     password /assword:/
   end
-  cfg :telnet do
+
+  cfg :telnet, :ssh do
+    post_login 'system shell set more off'
     post_login 'system shell session set more off'
     pre_logout 'exit'
   end
-end
+end

data/lib/oxidized/model/timos.rb

@@ -1,8 +1,10 @@
 class TiMOS < Oxidized::Model
 
-  # Alcatel-Lucent TiMOS (Timetra)
-  # used in SR/ESS/SAS routers
- 
+  #
+  # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent).
+  # Used in 7705 SAR, 7210 SAS, 7450 ESS, 7750 SR, 7950 XRS, and NSP.
+  #
+
   comment  '# '
 
   prompt /^([-\w\.:>\*]+\s?[#>]\s?)$/
@@ -12,26 +14,81 @@ class TiMOS < Oxidized::Model
     new_cfg << cfg.each_line.to_a[1..-2].join
   end
 
+  #
+  # Show the boot options file.
+  #
   cmd 'show bof' do |cfg|
     comment cfg
   end
 
+  #
+  # Show the system information.
+  #
   cmd 'show system information' do |cfg|
-    # strip uptime
+    #
+    # Strip uptime.
+    #
     cfg.sub! /^System Up Time.*\n/, ''
     comment cfg
   end
 
+  #
+  # Show the card state.
+  #
   cmd 'show card state' do |cfg|
     comment cfg
   end
 
-  cmd 'show boot-messages' do |cfg|
-    cfg.gsub! /\r/, ""
+  #
+  # Show the boot log.
+  #
+  cmd 'file type bootlog.txt' do |cfg|
+    #
+    # Strip carriage returns and backspaces.
+    #
+    cfg.gsub! /\r/, ''
+    cfg.gsub! /[\b][\b][\b]/, "\n"
+    comment cfg
+  end
+
+  #
+  # Show the running debug configuration.
+  #
+  cmd 'show debug' do |cfg|
     comment cfg
   end
 
-  cmd 'admin display-config'
+  #
+  # Show the saved debug configuration (admin debug-save).
+  #
+  cmd 'file type config.dbg' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+    comment cfg
+  end
+
+  #
+  # Show the running persistent indices.
+  #
+  cmd 'admin display-config index' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+    comment cfg
+  end
+
+  #
+  # Show the running configuration.
+  #
+  cmd 'admin display-config' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+  end
 
   cfg :telnet do
     username /^Login: /

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.16.2'
+  VERSION = '0.16.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -256,6 +256,7 @@ files:
 - lib/oxidized/model/opengear.rb
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/panos.rb
+- lib/oxidized/model/pfsense.rb
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
 - lib/oxidized/model/quantaos.rb