ibm_cloud_sdk_core 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b18d557fd57fed55fa59dc6be40502ed3cd5cb5dd38927b1e0086191056412a1
-  data.tar.gz: 5d4a983f01f4d9eeaa10dc6970683048ef7b3a0996f9f6de43c1832f04618a4f
+  metadata.gz: 98e7c5e7a5e78cc4f561a8b7fddbe026b201d5c18365354236f8b7cd185e2e2e
+  data.tar.gz: 97490e5521edbc772cd9a1932099ac4243ed70a2b712813e9cd4d1ef65e77073
 SHA512:
-  metadata.gz: 95eb85a507326b86317e5a3209e3086ce1e27f6a849d0d19148b83847da61d71227f12f66268f540b55d0c90c55e052739dc29eb8a86e331a9b783c43062e4ee
-  data.tar.gz: ca617c999050ed7e2dca0583e1d62ae018b898ec46feb021875c916433d390a351f1448fbb9d310baa57dc2dfda95ad889c205663ffe4619913a771305d46735
+  metadata.gz: e6bb9065154371294ed94a910c3e3400f8b41723f4fcee4f6656f8ab8e015c5a2817ff9503e23176ab59ee9d7e92e530274c94f4a8cb376e1293aec6ac681a45
+  data.tar.gz: 177559d12ccfe34ad297774558e1c6d2ac2139a97fd66f71ece0c736b61a1806b12f4a60ca9fc3008957ada9a2b81e0b050e7cf01f8aeb8362e795b291ef18bc

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -243,6 +243,8 @@ module IBMCloudSdkCore
         ssl_context = OpenSSL::SSL::SSLContext.new
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
         @conn.default_options = { ssl_context: ssl_context }
+
+        @token_manager&.ssl_verification(true)
       end
       add_proxy(proxy) unless proxy.empty? || !proxy.dig(:address).is_a?(String) || !proxy.dig(:port).is_a?(Integer)
       add_timeout(timeout) unless timeout.empty? || (!timeout.key?(:per_operation) && !timeout.key?(:global))

data/lib/ibm_cloud_sdk_core/iam_token_manager.rb

@@ -17,6 +17,7 @@ module IBMCloudSdkCore
     DEFAULT_CLIENT_SECRET = "bx"
     REQUEST_TOKEN_GRANT_TYPE = "urn:ibm:params:oauth:grant-type:apikey"
     REQUEST_TOKEN_RESPONSE_TYPE = "cloud_iam"
+    TOKEN_NAME = "access_token"
 
     attr_accessor :token_info, :user_access_token
     def initialize(iam_apikey: nil, iam_access_token: nil, iam_url: nil,
@@ -24,7 +25,7 @@ module IBMCloudSdkCore
       @iam_apikey = iam_apikey
       @user_access_token = iam_access_token
       @iam_url = iam_url.nil? ? DEFAULT_IAM_URL : iam_url
-      super(url: iam_url, access_token: iam_access_token)
+      super(url: iam_url, access_token: iam_access_token, token_name: TOKEN_NAME)
 
       # Both the client id and secret should be provided or neither should be provided.
       if !iam_client_id.nil? && !iam_client_secret.nil?

data/lib/ibm_cloud_sdk_core/icp4d_token_manager.rb

@@ -9,13 +9,14 @@ require_relative("./jwt_token_manager")
 module IBMCloudSdkCore
   # Class to manage ICP4D Token Authentication
   class ICP4DTokenManager < JWTTokenManager
+    TOKEN_NAME = "accessToken"
     def initialize(url: nil, username: nil, password: nil, access_token: nil)
       raise ArgumentError.new("The url is mandatory for ICP4D.") if url.nil? && access_token.nil?
 
       url += "/v1/preauth/validateAuth"
       @username = username
       @password = password
-      super(url: url, user_access_token: access_token)
+      super(url: url, user_access_token: access_token, token_name: TOKEN_NAME)
     end
 
     def request_token

data/lib/ibm_cloud_sdk_core/jwt_token_manager.rb

@@ -6,8 +6,6 @@ require("jwt")
 require("rbconfig")
 require_relative("./version.rb")
 
-TOKEN_NAME = "access_token"
-
 module IBMCloudSdkCore
   # Class to manage JWT Token Authentication
   class JWTTokenManager
@@ -22,6 +20,7 @@ module IBMCloudSdkCore
       @url = vars[:url]
       @token_info = vars[:token_info]
       @user_access_token = vars[:access_token]
+      @token_name = vars[:token_name]
       @time_to_live = nil
       @expire_time = nil
       @disable_ssl_verification = false
@@ -33,9 +32,9 @@ module IBMCloudSdkCore
       elsif @token_info.nil? || token_expired?
         token_info = request_token
         save_token_info(token_info: token_info)
-        @token_info[TOKEN_NAME]
+        @token_info[@token_name]
       elsif !@token_info.nil?
-        @token_info[TOKEN_NAME]
+        @token_info[@token_name]
       end
     end
 
@@ -43,6 +42,10 @@ module IBMCloudSdkCore
       @user_access_token = access_token
     end
 
+    def ssl_verification(disable_ssl_verification)
+      @disable_ssl_verification = disable_ssl_verification
+    end
+
     private
 
     # Check if currently stored token is expired.
@@ -59,7 +62,7 @@ module IBMCloudSdkCore
     end
 
     def save_token_info(token_info: nil)
-      access_token = token_info[TOKEN_NAME]
+      access_token = token_info[@token_name]
       decoded_response = JWT.decode access_token, nil, false, {}
       exp = decoded_response[0]["exp"]
       iat = decoded_response[0]["iat"]
@@ -69,13 +72,26 @@ module IBMCloudSdkCore
     end
 
     def request(method:, url:, headers: nil, params: nil, data: nil, username: nil, password: nil)
-      response = HTTP.basic_auth(user: username, pass: password).request(
-        method,
-        url,
-        body: data,
-        headers: headers,
-        params: params
-      )
+      if @disable_ssl_verification
+        ssl_context = OpenSSL::SSL::SSLContext.new
+        ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        response = HTTP.basic_auth(user: username, pass: password).request(
+          method,
+          url,
+          body: data,
+          headers: headers,
+          params: params,
+          ssl_context: ssl_context
+        )
+      else
+        response = HTTP.basic_auth(user: username, pass: password).request(
+          method,
+          url,
+          body: data,
+          headers: headers,
+          params: params
+        )
+      end
       return JSON.parse(response.body.to_s) if (200..299).cover?(response.code)
 
       require_relative("./api_exception.rb")

data/lib/ibm_cloud_sdk_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMCloudSdkCore
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/unit/test_base_service.rb

@@ -351,4 +351,27 @@ class BaseServiceTest < Minitest::Test
     token_manager = service.instance_variable_get(:@token_manager)
     assert_equal(token_manager.instance_variable_get(:@user_access_token), "new_token")
   end
+
+  def test_icp4d_disable_ssl
+    service = IBMCloudSdkCore::BaseService.new(
+      authentication_type: "icp4d",
+      icp4d_url: "https://the.sixth.one",
+      icp4d_access_token: "token",
+      url: "http://the.com"
+    )
+    stub_request(:get, "http://the.com/music")
+      .with(
+        headers: {
+          "Authorization" => "Basic Og==",
+          "Host" => "the.com"
+        }
+      ).to_return(status: 200, body: {}.to_json, headers: {})
+    assert_equal(service.instance_variable_get(:@icp4d_access_token), "token")
+    service.send :icp4d_token_manager, icp4d_access_token: "new_token", icp4d_url: "the.url"
+    token_manager = service.instance_variable_get(:@token_manager)
+    service.configure_http_client(disable_ssl_verification: true)
+    assert_equal(token_manager.instance_variable_get(:@disable_ssl_verification), true)
+    service_response = token_manager.send :request, method: "GET", url: "http://the.com/music", headers: {}
+    assert_equal({}, service_response)
+  end
 end

data/test/unit/test_jwt_token_manager.rb

@@ -85,7 +85,7 @@ class JWTTokenManagerTest < Minitest::Test
     access_token = JWT.encode(access_token_layout, "secret", "HS256", "kid": "230498151c214b788dd97f22b85410a5")
 
     token = {
-      "access_token" => access_token,
+      "accessToken" => access_token,
       "token_type" => "Bearer",
       "expires_in" => 3600,
       "expiration" => Time.now.to_i + (6 * 3600),
@@ -95,7 +95,8 @@ class JWTTokenManagerTest < Minitest::Test
     token_manager = IBMCloudSdkCore::JWTTokenManager.new(
       icp4d_url: "https://the.sixth.one",
       username: "you",
-      password: "me"
+      password: "me",
+      token_name: "accessToken"
     )
     token_manager.send(:save_token_info, token_info: token)
     token_response = token_manager.send(:token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mamoon Raja