conjur-api 5.4.0 → 5.4.1.pre.539

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e6e603e128d52fb7d219106d9d9f2a4c302ea3a6ccd943fe424443f5640ff8
-  data.tar.gz: 4c788058b9ce44f5d044ea2635927cbfe31c6739901f514f5d796844bcb26b41
+  metadata.gz: 82ab76771a88091c1d819b35474d59e90ab4f315d53d9cf5cdad37b29d2b5c02
+  data.tar.gz: cb73219fe20674c5a7de24f2c99f9e7b75baa44e1596807f404810ac7456ba3d
 SHA512:
-  metadata.gz: 7c516e5fcdefb9878d33e67addfee81b168721e4e861a8d0eabd25d6452943a35ccd6f0eb0f9701407710de2d8a4919e5259de2590d9ec009c2a6d798e54486e
-  data.tar.gz: 59166c9503087a5f9a81af241efd81c1151d5204aea33aa87bc61aecb003ca81169efac2a4c5ceb29d6d846be4e8d587574095e71277ef889e27a7e215cb90d4
+  metadata.gz: 8789f3ded3ba98012c6af691ef46c9c35701f6e7320206f474e9aa853981d91e68d473efc5b3453d09c020f8fdc61b42e51be16b2460b4d6867c6051ca2f1779
+  data.tar.gz: 5e05f63d1b2a66a0c2fbb55c8bed1458ac9ce86234e57a781e2f6e11d63dfa38eabb8dde5f65460b4e68aa52e365b34d0ddf1a93af01ed93dc892a6ad68d9409

data/CHANGELOG.md

@@ -9,13 +9,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Nothing should go in this section, please add to the latest unreleased version
   (and update the corresponding date), or add a new version.
 
+## [5.4.1] - 2023-03-29
+### Added
+- Added authenticate wrapper to access unparsed response object (including headers).
+  [cyberark/conjur-api-ruby#213](https://github.com/cyberark/conjur-api-ruby/pull/213)
+
 ## [5.4.0] - 2022-08-16
 
 ### Added
 - Added support for OIDC V2 authentication endpoint.
-  [cyberark/cojnur-api-ruby#207](https://github.com/cyberark/conjur-api-ruby/pull/207)
+  [cyberark/conjur-api-ruby#207](https://github.com/cyberark/conjur-api-ruby/pull/207)
 - Added support for OIDC authenticator providers endpoint.
-  [cyberark/cojnur-api-ruby#207](https://github.com/cyberark/conjur-api-ruby/pull/207)
+  [cyberark/conjur-api-ruby#207](https://github.com/cyberark/conjur-api-ruby/pull/207)
 
 ### Changed
 - Remove support for Ruby versions <2.7 which are [end of life](https://endoflife.date/ruby).

data/Jenkinsfile

@@ -44,7 +44,7 @@ pipeline {
     }
     stage('Validate Changelog and set version') {
       steps {
-        sh './bin/parse-changelog.sh'
+        parseChangelog()
         updateVersion("CHANGELOG.md", "${BUILD_NUMBER}")
       }
     }

data/VERSION

@@ -1 +1 @@
-5.4.0
+5.4.1-539

data/conjur-api.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'fakefs'
   gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'nokogiri'
+  gem.add_development_dependency 'webrick'
 end

data/features/authn.feature

@@ -3,8 +3,8 @@ Feature: Authenticate with Conjur
   Background:
     Given I setup a keycloak authenticator
 
-  Scenario: Authenticate with OIDC state and code
-    When I retrieve the login url for OIDC authenticator "keycloak"
+  Scenario: Authenticate with OIDC code
+    When I retrieve the provider details for OIDC authenticator "keycloak"
     And I retrieve auth info for the OIDC provider with username: "alice" and password: "alice"
     And I run the code:
     """
@@ -12,3 +12,14 @@ Feature: Authenticate with Conjur
     Conjur::API.authenticator_authenticate("authn-oidc", "keycloak", options: @auth_body)
     """
     Then the JSON should have "payload"
+
+  Scenario: Authenticate with OIDC code requesting unparsed result
+    When I retrieve the provider details for OIDC authenticator "keycloak"
+    And I retrieve auth info for the OIDC provider with username: "alice" and password: "alice"
+    And I run the code:
+    """
+    $conjur.authenticator_enable "authn-oidc", "keycloak"
+    Conjur::API.authenticator_authenticate_get("authn-oidc", "keycloak", options: @auth_body)
+    """
+    Then the response body contains: "payload"
+    And the response includes headers

data/features/load_policy.feature

@@ -56,6 +56,7 @@ Feature: Load a policy.
     Then the JSON should be:
     """
     [
-      "cucumber:policy:root"
+      "cucumber:policy:root",
+      "cucumber:user:admin"
     ]
     """

data/features/step_definitions/api_steps.rb

@@ -17,9 +17,11 @@ Then(/^this code should fail with "([^"]*)"$/) do |error_msg, code|
   end
 end
 
-Given(/^I retrieve the login url for OIDC authenticator "([^"]+)"$/) do |service_id|
+Given(/^I retrieve the provider details for OIDC authenticator "([^"]+)"$/) do |service_id|
   provider = $conjur.authentication_providers("authn-oidc").select {|provider_details| provider_details["service_id"] == service_id}
   @login_url = provider[0]["redirect_uri"]
+  @nonce = provider[0]["nonce"]
+  @code_verifier = provider[0]["code_verifier"]
   puts @login_url
 end
 
@@ -47,6 +49,14 @@ Given(/^I retrieve auth info for the OIDC provider with username: "([^"]+)" and
 
   if response.is_a?(Net::HTTPRedirection)
     response_details = URI.decode_www_form(URI(response['location']).query)
-    @auth_body = {state: response_details.assoc('state')[1], code: response_details.assoc('code')[1]}
+    @auth_body = {code: response_details.assoc('code')[1], nonce: @nonce, code_verifier: @code_verifier}
   end
 end
+
+Then(/^the response body contains: "([^"]+)"$/) do |element|
+  expect(@result).to include(element)
+end
+
+Then(/^the response includes headers$/) do
+  expect(@result.headers).not_to be_empty
+end

data/lib/conjur/api/authn.rb

@@ -63,10 +63,22 @@ module Conjur
       # @param [Hash] params Additional params to send to authenticator
       # @return [String] A JSON formatted authentication token.
       def authenticator_authenticate authenticator, service_id, account: Conjur.configuration.account, options: {}
+        JSON.parse authenticator_authenticate_get authenticator, service_id, account: account, options: options
+      end
+
+      # Authenticates using a third party authenticator like authn-oidc via GET request.
+      # It will return an response object containing access/refresh token data.
+      #
+      # @param [String] authenticator
+      # @param [String] service_id
+      # @param [String] account The organization account.
+      # @param [Hash] params Additional params to send to authenticator
+      # @return [RestClient::Response] Response object
+      def authenticator_authenticate_get authenticator, service_id, account: Conjur.configuration.account, options: {}
         if Conjur.log
           Conjur.log << "Authenticating to account #{account} using #{authenticator}/#{service_id}\n"
         end
-        JSON.parse url_for(:authenticator_authenticate, account, service_id, authenticator, options).get
+        url_for(:authenticator_authenticate, account, service_id, authenticator, options).get
       end
 
       # Exchanges Conjur the API key (refresh token) for an access token.  The access token can

data/spec/api/host_factories_spec.rb

@@ -13,7 +13,7 @@ describe "Conjur::API.host_factory_create_host", api: :dummy do
         resource = instance_double(RestClient::Resource, "hosts")
       )
 
-    allow(resource).to receive(:post).with(id: id).and_return(
+    allow(resource).to receive(:post).with({id: id}).and_return(
       instance_double(RestClient::Response, "host response", body: '
         {
           "id": "test-host",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1.pre.539
 platform: ruby
 authors:
 - CyberArk Maintainers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -240,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Conjur API
 email:
 - conj_maintainers@cyberark.com
@@ -268,7 +282,6 @@ files:
 - Rakefile
 - SECURITY.md
 - VERSION
-- bin/parse-changelog.sh
 - ci/configure_v4.sh
 - ci/configure_v5.sh
 - ci/oauth/keycloak/create_client
@@ -410,9 +423,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.33
 signing_key:

data/bin/parse-changelog.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -ex
-
-cd "$(dirname "$0")"
-
-docker run --rm \
-  -v "$PWD/..:/work" \
-  -w "/work" \
-  ruby:2.7 bash -ec "
-    gem install -N parse_a_changelog
-    parse ./CHANGELOG.md
-  "
-