onering-client 0.1.1 → 0.1.2

data/bin/onering

@@ -16,15 +16,16 @@ Usage:
 where [global] options are:
 EOS
 
-  opt :url,       "The URL of the Onering server to connect to", :short => '-s', :type => :string
-  opt :path,      "The base path to prepend to all requests (default: /api)", :type => :string
-  opt :source,    "Specify the source IP address to use (i.e. which network interface the request should originate from)", :short => '-I', :type => :string
-  opt :param,     "Additional query string parameters to include with the request in the format FIELD=VALUE. Can be specified multiple times.", :short => '-p', :type => :string, :multi => true
-  opt :format,    "The output format for return values (i.e.: json, yaml, text)", :default => 'text', :short => '-t', :type => :string
-  opt :sslkey,    "Location of the SSL client key to use for authentication", :short => '-c', :type => :string
-  opt :apikey,    "The API token to use for authentication", :short => '-k', :type => :string
-  opt :quiet,     "Suppress standard output", :short => '-q'
-  opt :verbosity, "Set the log level (fatal, error, warn, info, debug)", :short => '-v', :type => :string, :default => 'warn'
+  opt :url,         "The URL of the Onering server to connect to", :short => '-s', :type => :string
+  opt :path,        "The base path to prepend to all requests (default: /api)", :type => :string
+  opt :source,      "Specify the source IP address to use (i.e. which network interface the request should originate from)", :short => '-I', :type => :string
+  opt :param,       "Additional query string parameters to include with the request in the format FIELD=VALUE. Can be specified multiple times.", :short => '-p', :type => :string, :multi => true
+  opt :format,      "The output format for return values (i.e.: json, yaml, text)", :default => 'text', :short => '-t', :type => :string
+  opt :sslkey,      "Location of the SSL client key to use for authentication", :short => '-c', :type => :string
+  opt :nosslverify, "Disable verification of the server SSL certificate", :type => :boolean
+  opt :apikey,      "The API token to use for authentication", :short => '-k', :type => :string
+  opt :quiet,       "Suppress standard output", :short => '-q'
+  opt :verbosity,   "Set the log level (fatal, error, warn, info, debug)", :short => '-v', :type => :string, :default => 'warn'
 
   stop_on plugins
 end

data/lib/onering/api.rb

@@ -1,16 +1,4 @@
 require 'openssl'
-
-# This is perhaps the saddest thing I have ever written...
-#
-# Don't cry for me...I'm already dead.
-#
-module OpenSSL
-  module SSL
-    remove_const :VERIFY_PEER
-    VERIFY_PEER = VERIFY_NONE
-  end
-end
-
 require 'yaml'
 require 'hashlib'
 require 'deep_merge'
@@ -58,39 +46,59 @@ module Onering
     # load and merge all config file sources
       Onering::Config.load(@_connection_options[:configfile], @_connection_options.get(:config, {}))
 
-    # source interface specified
-    # !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !!
-    #   Due to certain versions of Ruby's Net::HTTP not allowing you explicitly
-    #   specify the source IP/interface to use, this horrific monkey patch is
-    #   necessary, if not right.
-    #
-    #   If at least some of your code doesn't make you feel bottomless shame
-    #   then you aren't coding hard enough.
-    #
-    if options.get('config.source').is_a?(String)
-      if options.get('config.source') =~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/
-      # insert firing pin into the hack
-        TCPSocket.instance_eval do
-          (class << self; self; end).instance_eval do
-            alias_method :_stock_open, :open
-            attr_writer  :_hack_local_ip
-
-            define_method(:open) do |conn_address, conn_port|
-              _stock_open(conn_address, conn_port, @_hack_local_ip)
-            end
+      if options.get('config.nosslverify', false) == true
+      # deliberately break SSL verification
+        Onering::Logger.warn("Disabling SSL peer verification for #{options.get('config.url')}")
+        OpenSSL::SSL.send(:const_set, :OLD_VERIFY_PEER, OpenSSL::SSL::VERIFY_PEER)
+        OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+        OpenSSL::SSL.send(:const_set, :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
+      else
+      # restore SSL verification if it's currently broken
+        if defined?(OpenSSL::SSL::OLD_VERIFY_PEER)
+          if OpenSSL::SSL::VERIFY_PEER == OpenSSL::SSL::VERIFY_NONE and OpenSSL::SSL::OLD_VERIFY_PEER != OpenSSL::SSL::VERIFY_NONE
+            OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+            OpenSSL::SSL.send(:const_set, :VERIFY_PEER, OpenSSL::SSL::OLD_VERIFY_PEER)
           end
         end
+      end
 
-      # arm the hack
-        TCPSocket._hack_local_ip = options.get('config.source')
+      if OpenSSL::SSL::VERIFY_PEER == OpenSSL::SSL::VERIFY_NONE
+        Onering::Logger.warn("Disabling SSL peer verification for #{options.get('config.url')}")
+      end
 
-      # sound the siren
-        Onering::Logger.info("Using local interface #{options.get('config.source')} to connect", "Onering::API")
+      # source interface specified
+      # !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !!
+      #   Due to certain versions of Ruby's Net::HTTP not allowing you explicitly
+      #   specify the source IP/interface to use, this horrific monkey patch is
+      #   necessary, if not right.
+      #
+      #   If at least some of your code doesn't make you feel bottomless shame
+      #   then you aren't coding hard enough.
+      #
+      if options.get('config.source').is_a?(String)
+        if options.get('config.source') =~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/
+        # insert firing pin into the hack
+          TCPSocket.instance_eval do
+            (class << self; self; end).instance_eval do
+              alias_method :_stock_open, :open
+              attr_writer  :_hack_local_ip
+
+              define_method(:open) do |conn_address, conn_port|
+                _stock_open(conn_address, conn_port, @_hack_local_ip)
+              end
+            end
+          end
 
-      else
-        raise "Invalid source IP address #{options.get('config.source')}"
+        # arm the hack
+          TCPSocket._hack_local_ip = options.get('config.source')
+
+        # sound the siren
+          Onering::Logger.info("Using local interface #{options.get('config.source')} to connect", "Onering::API")
+
+        else
+          raise "Invalid source IP address #{options.get('config.source')}"
+        end
       end
-    end
 
     # set API connectivity details
       Onering::API.base_uri(options.get('config.url', Onering::Config.get(:url, DEFAULT_BASE)))

data/lib/onering/cli.rb

@@ -11,13 +11,14 @@ module Onering
       return Onering::API.new({
         'autoconnect' => cliargs[:autoconnect],
         'config' => {
-          'url'    => cliargs[:url],
-          'path'   => cliargs[:path],
-          'source' => cliargs[:source],
-          'params' => Hash[(cliargs[:param] || []).collect{|i| i.split('=',2) }],
+          'url'            => cliargs[:url],
+          'path'           => cliargs[:path],
+          'source'         => cliargs[:source],
+          'nosslverify'    => cliargs[:nosslverify],
+          'params'         => Hash[(cliargs[:param] || []).collect{|i| i.split('=',2) }],
           'authentication' => {
-            'type'    => (cliargs[:apikey_given] ? :token : nil),
-            'keyfile' => (cliargs[:apikey] || cliargs[:sslkey])
+            'type'         => (cliargs[:apikey_given] ? :token : nil),
+            'keyfile'      => (cliargs[:apikey] || cliargs[:sslkey])
           }.compact
         }.compact
       }.compact)

data/lib/onering/plugins/config.rb

@@ -0,0 +1,27 @@
+module Onering
+  class API
+    class Configuration < API
+      def get(key, options={})
+        get("/config/#{key}").parsed_response
+      end
+
+      def set(key, value)
+        if not value.is_a?(Hash) and not value.is_a?(Array)
+          return save(key, value)
+        end
+
+        return nil
+      end
+
+      def save(key, data=nil, &block)
+        if block_given?
+          post("/config/#{key}", {}, &block)
+        else
+          post("/config/#{key}", {
+            :body => data
+          })
+        end
+      end
+    end
+  end
+end

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
 
     class Error < Exception; end
     class FatalError < Error; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &24589080 !ruby/object:Gem::Requirement
+  requirement: &11003660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *24589080
+  version_requirements: *11003660
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &24588580 !ruby/object:Gem::Requirement
+  requirement: &11019380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24588580
+  version_requirements: *11019380
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &24588080 !ruby/object:Gem::Requirement
+  requirement: &11018780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *24588080
+  version_requirements: *11018780
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &24587560 !ruby/object:Gem::Requirement
+  requirement: &11018280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *24587560
+  version_requirements: *11018280
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &24587060 !ruby/object:Gem::Requirement
+  requirement: &11017620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *24587060
+  version_requirements: *11017620
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &24586560 !ruby/object:Gem::Requirement
+  requirement: &11016940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *24586560
+  version_requirements: *11016940
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &24586080 !ruby/object:Gem::Requirement
+  requirement: &11016220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *24586080
+  version_requirements: *11016220
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &24606560 !ruby/object:Gem::Requirement
+  requirement: &11015380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24606560
+  version_requirements: *11015380
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &24606100 !ruby/object:Gem::Requirement
+  requirement: &11013900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *24606100
+  version_requirements: *11013900
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -117,22 +117,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/onering/config.rb
+- lib/onering.rb
 - lib/onering/logger.rb
 - lib/onering/cli.rb
-- lib/onering/plugins/devices.rb
-- lib/onering/plugins/reporter.rb
+- lib/onering/config.rb
+- lib/onering/api.rb
+- lib/onering/util.rb
 - lib/onering/plugins/authentication.rb
+- lib/onering/plugins/reporter.rb
+- lib/onering/plugins/devices.rb
+- lib/onering/plugins/config.rb
 - lib/onering/plugins/automation.rb
-- lib/onering/cli/devices.rb
 - lib/onering/cli/reporter.rb
+- lib/onering/cli/devices.rb
 - lib/onering/cli/config.rb
-- lib/onering/cli/fact.rb
 - lib/onering/cli/automation.rb
+- lib/onering/cli/fact.rb
 - lib/onering/cli/call.rb
-- lib/onering/api.rb
-- lib/onering/util.rb
-- lib/onering.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []