pdc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234203e23bbe2f53796496c2048352e4029c6821
-  data.tar.gz: cd1c02de0fe5905a7312dc5f843b7ca7cc2986a9
+  metadata.gz: fd047fc7a9762e173273f35116a7ba835cdaa219
+  data.tar.gz: 627c88b0bd6f4c5ad0a0192b5e47055fec975499
 SHA512:
-  metadata.gz: a85cc7e23ec88086c115e4071de94266f327ffdb05044205cf469b1c46e9aced707bfc21ab64c642136d59fd5b617e20ff2a6e2569c4e6262eaf8c0816982d0b
-  data.tar.gz: 1f31b025816cebc99da89a81dd768a7fd9741ebcac826f69ced6b2a0a6f27093b0215fd81ff3be743321ea56bdf4fc96b162562e57b0cc89cf60cefbd84a491d
+  metadata.gz: 0d6b3965169451b4903d7e00dda6a067df65eeda6e6c944391db1c159f06953b2ea42ec42c7816125eafe25d3fb5184e8f98f49e5c42cd51fb3650890fff3724
+  data.tar.gz: 00f4ec8818140c9031cd748c1280e60b279724984e5a3fdcc26a1123e4f65cbea714ed5bdadb8e66c6a5a9ffa8b32cfd96432d8eff8d7cfefbab16f6fd5f0cd4

data/examples/test_no_ssl_verification.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'ap'
+require 'pdc'
+
+def main
+  PDC.configure do |config|
+    config.site = 'https://pdc.engineering.redhat.com/'
+    config.log_level = :debug
+    config.ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
+  end
+
+  puts "Release count: #{PDC::V1::Release.count}"
+end
+
+main if __FILE__ == $PROGRAM_NAME

data/lib/pdc/config.rb

@@ -9,7 +9,6 @@ module PDC
   #
   #   :site               => 'http://localhost:2990',
   #   :ssl_verify_mode    => OpenSSL::SSL::VERIFY_PEER,
-  #   :use_ssl            => true,
   #   :username           => nil,
   #   :password           => nil,
   #   :auth_type          => :oauth
@@ -24,7 +23,6 @@ module PDC
       :site,
       :api_root,
 
-      :use_ssl,
       :ssl_verify_mode,
 
       :requires_token,
@@ -42,7 +40,6 @@ module PDC
         # site config
         self.site                = 'http://localhost:8000'
         self.api_root            = 'rest_api/'
-        self.use_ssl             = true
         self.ssl_verify_mode     = OpenSSL::SSL::VERIFY_PEER
 
         # token and authentication
@@ -90,13 +87,15 @@ module PDC
     end
 
     def token
-      config.token || Request::TokenFetcher.fetch(token_url)
+      return unless config.requires_token
+      config.token || Request::TokenFetcher.fetch
     end
 
     private
 
       def apply_config
         reset_logger
+        reset_token_fetcher
         reset_base_connection
       end
 
@@ -105,6 +104,13 @@ module PDC
         logger.level = Logger.const_get(config.log_level.upcase)
       end
 
+      def reset_token_fetcher
+        Request::TokenFetcher.configure do |c|
+          c.url = token_url
+          c.ssl_verify_mode = config.ssl_verify_mode
+        end
+      end
+
       # resets and returns the +Faraday+ +connection+ object
       def reset_base_connection
 
@@ -116,7 +122,7 @@ module PDC
 
         PDC::Base.connection = Faraday.new(faraday_config) do |c|
           c.request   :append_slash_to_path
-          c.request   :pdc_token, token: config.token, token_url: token_url if config.requires_token
+          c.request   :pdc_token, token: config.token if config.requires_token
 
           c.response  :logger, config.logger
           c.response  :pdc_paginator

data/lib/pdc/http/request/pdc_token.rb

@@ -24,7 +24,7 @@ module PDC::Request
 
       # uses the token passed or fetches one only once
       def token
-        @token ||= options[:token] || TokenFetcher.fetch(options[:token_url])
+        @token ||= options[:token] || TokenFetcher.fetch
       end
   end
 end

data/lib/pdc/http/request/token_fetcher.rb

@@ -4,23 +4,30 @@ require 'json'
 module PDC::Request
   module TokenFetcher
 
-    # uses kerberos token to obtain token from pdc
-    def self.fetch(token_url)
-      PDC.logger.debug  "Fetch token from: #{token_url}"
-      curl = Curl::Easy.new(token_url.to_s) do |request|
-        request.headers['Accept'] = 'application/json'
-        request.http_auth_types = :gssnegotiate
+    module Configuration
+      VALID_KEYS = [:ssl_verify_mode, :url].freeze
 
-        # The curl man page (http://curl.haxx.se/docs/manpage.html)
-        # specifes setting a fake username when using Negotiate auth,
-        # and use ':' in their example.
-        request.username = ':'
+      attr_accessor(*VALID_KEYS)
+
+      def options
+        Hash[*VALID_KEYS.map { |k| [k, send(k)] }.flatten]
+      end
+
+      def configure
+        yield self
       end
+    end
+    extend Configuration
 
+    # uses kerberos token to obtain token from pdc
+    def self.fetch
+      PDC.logger.debug "Fetch token from: #{url}"
+
+      curl = curl_easy
       curl.perform
       if curl.response_code != 200
-        PDC.logger.info "Obtain token from #{token_url} failed: #{curl.body_str}"
-        error = { token_url: token_url, body: curl.body, code: curl.response_code }
+        PDC.logger.info "Obtain token from #{url} failed: #{curl.body_str}"
+        error = { url: url, body: curl.body, code: curl.response_code }
         raise PDC::TokenFetchFailed, error
       end
       result = JSON.parse(curl.body_str)
@@ -28,5 +35,17 @@ module PDC::Request
       result['token']
     end
 
+    def self.curl_easy
+      Curl::Easy.new(url.to_s) do |request|
+        request.ssl_verify_peer    = ssl_verify_mode != OpenSSL::SSL::VERIFY_NONE
+        request.headers['Accept']  = 'application/json'
+        request.http_auth_types    = :gssnegotiate
+
+        # The curl man page (http://curl.haxx.se/docs/manpage.html)
+        # specifes setting a fake username when using Negotiate auth,
+        # and use ':' in their example.
+        request.username = ':'
+      end
+    end
   end
 end

data/lib/pdc/version.rb

@@ -1,3 +1,3 @@
 module PDC
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/pdc/config_spec.rb

@@ -57,6 +57,30 @@ describe PDC do
       assert_requested releases, times: 3
     end
 
+    it 'will not cache PDC.token call' do
+      token = stub_request(:get, token_url).to_return_json(token: 'foobar')
+
+      PDC.configure { |pdc| pdc.site = site }
+      assert_not_requested token
+
+      PDC.token.must_equal 'foobar'
+      PDC.token.must_equal 'foobar'
+
+      assert_requested token, times: 2
+    end
+
+    it 'will not fetch token if already set' do
+      token = stub_request(:get, token_url).to_return_json(token: 'foobar')
+
+      PDC.configure do |pdc|
+        pdc.site = site
+        pdc.token = :a_known_token
+      end
+
+      PDC.token.must_equal :a_known_token
+      assert_not_requested token
+    end
+
     it 'raises TokenFetchFailed when fails' do
       token = stub_request(:get, token_url).to_return_json(
         { detail: 'Not found' },
@@ -84,7 +108,6 @@ describe PDC do
     it 'allows default site to be overridden ' do
       PDC.configure do |config|
         config.site = 'http://localhost:8888'
-        config.token = :foo
       end
       PDC.config.site.must_equal 'http://localhost:8888'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sunil Thaha
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,6 +163,7 @@ files:
 - examples/pdc_test_cache.rb
 - examples/prod_failures.rb
 - examples/prod_pdc.rb
+- examples/test_no_ssl_verification.rb
 - lib/pdc.rb
 - lib/pdc/base.rb
 - lib/pdc/config.rb