conjur-api 5.3.0 → 5.3.1

data/spec/api/host_factories_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'conjur/api/host_factories'
+
+describe "Conjur::API.host_factory_create_host", api: :dummy do
+  it "returns a Host instance correctly on v4" do
+    token = "host factory token"
+    id = "test-host"
+
+    allow(Conjur::API).to receive(:url_for)
+      .with(:host_factory_create_host, token).and_return(
+        resource = instance_double(RestClient::Resource, "hosts")
+      )
+
+    allow(resource).to receive(:post).with(id: id).and_return(
+      instance_double(RestClient::Response, "host response", body: '
+        {
+          "id": "test-host",
+          "userid": "hosts",
+          "created_at": "2015-11-13T22:57:14Z",
+          "ownerid": "cucumber:group:ops",
+          "roleid": "cucumber:host:test-host",
+          "resource_identifier": "cucumber:host:test-host",
+          "api_key": "14x82x72syhnnd1h8jj24zj1kqd2j09sjy3tddwxc35cmy5nx33ph7"
+        }
+      ')
+    )
+
+    host = Conjur::API.host_factory_create_host token, id
+
+    expect(host).to be_a Conjur::Host
+  end
+end

data/spec/id_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Conjur::Id do
+  it 'requires the id to be fully qualified' do
+    expect { Conjur::Id.new 'foo:bar' }.to raise_error ArgumentError
+  end
+
+  it 'can be constructed from a string' do
+    id = Conjur::Id.new 'foo:bar:baz'
+    expect(id).to be
+    {
+      account: 'foo',
+      kind: 'bar',
+      identifier: 'baz'
+    }.each { |k, v| expect(id.send(k)).to eq v }
+  end
+
+  it 'can be constructed from an array' do
+    id = Conjur::Id.new %w(foo bar baz)
+    expect(id).to be
+    {
+      account: 'foo',
+      kind: 'bar',
+      identifier: 'baz'
+    }.each { |k, v| expect(id.send(k)).to eq v }
+  end
+end

data/spec/uri_escape_spec.rb

@@ -1,9 +1,21 @@
 require 'spec_helper'
 require 'conjur/id'
+require 'conjur/api/router/v5'
 
 describe 'url escaping' do
   it 'Id to path is escaped' do
-    id = Conjur::Id.new('cucumber:variable:foo bar')
-    expect(id.to_url_path).to eq('cucumber/variable/foo%20bar')
+    id = Conjur::Id.new('cucumber:variable:one two/three')
+    expect(id.to_url_path).to eq('cucumber/variable/one%20two%2Fthree')
+  end
+
+  it 'Resources path is escaped' do
+    request = Conjur::API::Router::V5.resources(nil, 'cucumber/two', 'extended variable', {})
+    expect(request.url).to eq('http://localhost:5000/resources/cucumber%2Ftwo/extended%20variable/')
+  end
+
+  it 'Resource path is escaped' do
+    resource = Conjur::Id.new('cucumber:variable:one two/three')
+    request = Conjur::API::Router::V5.resources_resource(nil, resource)
+    expect(request.url).to eq('http://localhost:5000/resources/cucumber/variable/one%20two%2Fthree')
   end
 end

data/test.sh

@@ -20,7 +20,13 @@ function main() {
 function startConjur() {
   echo 'Starting Conjur environment'
   echo '-----'
-  docker-compose pull
+
+  # We want to pull to make sure we're testing against the newest release;
+  # failing to ensure that has caused many mysterious failures in CI.
+  # However, unconditionally pulling prevents working offline even
+  # with a warm cache. So try to pull, but ignore failures.
+  docker-compose pull --ignore-pull-failures
+
   docker-compose build
   docker-compose up -d pg conjur_4 conjur_5
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -215,9 +215,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".dockerignore"
 - ".gitignore"
+- ".overcommit.yml"
 - ".project"
+- ".rubocop.yml"
+- ".rubocop_settings.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Dockerfile
@@ -298,7 +303,6 @@ files:
 - lib/conjur/base_object.rb
 - lib/conjur/build_object.rb
 - lib/conjur/cache.rb
-- lib/conjur/cast.rb
 - lib/conjur/cert_utils.rb
 - lib/conjur/cidr.rb
 - lib/conjur/configuration.rb
@@ -324,14 +328,15 @@ files:
 - lib/conjur/variable.rb
 - lib/conjur/webservice.rb
 - publish.sh
+- spec/api/host_factories_spec.rb
 - spec/api_spec.rb
-- spec/cast_spec.rb
 - spec/cert_utils_spec.rb
 - spec/cidr_spec.rb
 - spec/configuration_spec.rb
 - spec/has_attributes_spec.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/id_spec.rb
 - spec/ldap_sync_spec.rb
 - spec/log_source_spec.rb
 - spec/log_spec.rb
@@ -362,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Conjur API
@@ -392,14 +397,15 @@ test_files:
 - features/user.feature
 - features/variable_fields.feature
 - features/variable_value.feature
+- spec/api/host_factories_spec.rb
 - spec/api_spec.rb
-- spec/cast_spec.rb
 - spec/cert_utils_spec.rb
 - spec/cidr_spec.rb
 - spec/configuration_spec.rb
 - spec/has_attributes_spec.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/id_spec.rb
 - spec/ldap_sync_spec.rb
 - spec/log_source_spec.rb
 - spec/log_spec.rb

data/lib/conjur/cast.rb

@@ -1,41 +0,0 @@
-#
-# Copyright 2013-2017 Conjur Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module Conjur
-  module Cast
-    protected
-
-    # Convert a value to a role or resource identifier.
-    #
-    # @param obj the value to cast
-    def cast_to_id obj
-      result =if obj.is_a?(String) || obj.is_a?(Id)
-        obj
-      elsif obj.is_a?(Array)
-        obj.join(':')
-      else
-        raise "I don't know how to cast a #{obj.class} to an id"
-      end
-      result = Id.new(result) unless result.is_a?(Id)
-      result
-    end
-  end
-end

data/spec/cast_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Conjur::Cast do
-  let!(:object) {
-    Object.new.tap do |obj|
-      class << obj
-        include Conjur::Cast
-      end
-    end
-  }
-
-  it 'String casts to itself' do
-    expect(object.send(:cast_to_id, "foo")).to eq("foo")
-  end
-  it 'Id casts to to_s' do
-    expect(object.send(:cast_to_id, "foo")).to eq("foo")
-  end
-  it 'Array casts via #join' do
-    expect(object.send(:cast_to_id, [ "foo", "bar" ])).to eq("foo:bar")
-  end
-end