netdot-restclient 1.0 → 1.1

data/lib/netdot/restclient.rb

@@ -10,12 +10,15 @@ module Netdot
     #
     # Arguments (hash):
     #
-    # server   - Netdot server URL
-    # username - Netdot Username
-    # password - Netdot password
-    # retries  - Number of attempts
-    # timeout  - Timeout in seconds
-    # format   - Content format <xml>
+    # server          - Netdot server URL
+    # username        - Netdot Username
+    # password        - Netdot password
+    # retries         - Number of attempts
+    # timeout         - Timeout in seconds
+    # format          - Content format <xml>
+    # ssl_verify      - Verify server cert (default: yes)
+    # ssl_ca_file     - Path to SSL CA cert file 
+    # ssl_ca_dir      - Path to SSL CA cert directory
     #
     # Returns:
     #   Netdot::RestClient object
@@ -30,10 +33,11 @@ module Netdot
       
       argv.each { |k,v| instance_variable_set("@#{k}", v) }
       
-      @timeout ||= 10
-      @retries ||= 3
-      @format  ||= 'xml'
-      
+      @timeout    ||= 10
+      @retries    ||= 3
+      @format     ||= 'xml'
+      defined?(@ssl_verify) or @ssl_verify = true
+
       if ( @format == 'xml' ) 
         begin
           require 'xmlsimple'
@@ -49,6 +53,20 @@ module Netdot
       ua = HTTPClient.new(:agent_name => "Netdot::RestClient/#{self.version}")
       ua.set_cookie_store("cookie.dat")
 
+      # SSL stuff
+      if ( @ssl_verify )
+        if ( @ssl_ca_dir )
+          # We are told to add a certs path
+          # We'll want to clear the default cert store first
+          ua.ssl_config.clear_cert_store
+          ua.ssl_config.set_trust_ca(@ssl_ca_dir)
+        elsif ( @ssl_ca_file )
+          ua.ssl_config.set_trust_ca(@ssl_ca_file)            
+        end
+      else
+        ua.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
       login_url = @server + '/NetdotLogin'
       
       resp = nil
@@ -60,17 +78,20 @@ module Netdot
           'credential_1'      => @password,
           'permanent_session' => 1,
         }
-        if resp 
+
+        if ( resp.status == 302 )
           ua.save_cookie_store
           @ua = ua
           @base_url = @server + '/rest'
           break
         else
-          $stderr.puts "Connection attempt to #{@server} failed"
+          $stderr.puts "Warning: Connection attempt to #{@server} failed"
         end
       end
-      
-      raise "Could not log into #{@server}" unless resp
+
+      unless ( resp.status == 302 )
+        raise "Could not log into #{@server}. Status Code: '#{resp.status}'"
+      end
 
     end
     

data/lib/netdot/restclient/version.rb

@@ -1,6 +1,6 @@
 module Netdot
   class RestClient
-    VERSION = "1.0"
+    VERSION = "1.1"
 
     def version
       VERSION

data/spec/restclient_spec.rb

@@ -10,7 +10,25 @@ describe Netdot::RestClient do
       Netdot::RestClient.new(args)
     }.to raise_error(ArgumentError)
     
+    args[:password] = 'this-is-not-the-password'
+    expect {
+      Netdot::RestClient.new(args)
+    }.to raise_error
+
     args[:password] = 'admin'
+
+    # The following two assume that local server has SSL
+    # enabled with a self-signed cert
+    args[:server] = 'https://localhost/netdot'
+    expect {
+      Netdot::RestClient.new(args)
+    }.to raise_error
+
+    args[:ssl_verify] = false
+    @netdot = Netdot::RestClient.new(args)
+    expect(@netdot).to be_an_instance_of(Netdot::RestClient)
+
+    args[:server] = 'http://localhost/netdot'
     @netdot = Netdot::RestClient.new(args)
     expect(@netdot).to be_an_instance_of(Netdot::RestClient)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdot-restclient
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &83415360 !ruby/object:Gem::Requirement
+  requirement: &80662530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *83415360
+  version_requirements: *80662530
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83414820 !ruby/object:Gem::Requirement
+  requirement: &80662030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83414820
+  version_requirements: *80662030
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83414210 !ruby/object:Gem::Requirement
+  requirement: &80661390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *83414210
+  version_requirements: *80661390
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &83413860 !ruby/object:Gem::Requirement
+  requirement: &80660500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83413860
+  version_requirements: *80660500
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &83413340 !ruby/object:Gem::Requirement
+  requirement: &80659760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83413340
+  version_requirements: *80659760
 description: Talk to Netdot via REST with Ruby
 email:
 - cvicente@gmail.com