conjur-api 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48184760d9c40ab8a43ffeb451c3f733ba23cbe0cdb364efd13ac6183b68055
-  data.tar.gz: e31f3fee9f4f75038da1b3ad3ffcad72e5005c758b2fc1fc52cf00e0bc9deff1
+  metadata.gz: a3a19d6390e7e021ec28db797635aacc7ebbaf3e23a9142cf0fe6a028fefd1bc
+  data.tar.gz: 62f3ea9b7e62e32e69eff388c1d46b7678a5ba715a813a473a82c0d7d1c5fe29
 SHA512:
-  metadata.gz: 7a215e37eda9fb96db4c2554d02fd88a862b7a34865fad86c080314b217bca494b88a0a3b431f49f6b06476c3bd17ab0ed6c678db7ab42c7c5310936fde75361
-  data.tar.gz: 2b381514ef1d02855e6ce96b635738b7ee0bcfc7b12367eca924d8e1cade02d45ebc8f8911cdd7d98b030d772d16b217859badc5885cc37d370829288b52f843
+  metadata.gz: e2343a406b582f16d10eab5f876774fb8dce4376d9c0908599a8ed38f863ac2e36091285cb43f47d361d10cca0362a0e6f22b1ced655521054143fd25d5d82ba
+  data.tar.gz: 5d32c7db4693c2d33460e9932e9521d94751d95d94bb19a494b0b0f5198f674eeefaf5e169eb026f5f2a00388aa449fb19437fe2ae0add72937c7dfa1d0a5e90

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Latest
 
+# v5.3.0
+
+* Add `Conjur::API.ldap_sync_policy` for fetching the LDAP sync policy.
+
 # v5.2.1
 
 * Fix `Conjur::BuildObject#build_object` so it only tries to create

data/README.md

@@ -1,6 +1,8 @@
 # Conjur::API
 
-Programmatic Ruby access to the Conjur API.
+Programmatic Ruby access to the Conjur API. 
+
+RDocs are available from the through the [Ruby Gem details page](https://rubygems.org/gems/conjur-api)
 
 # Server Versions
 
@@ -47,11 +49,7 @@ Connecting to Conjur is a two-step process:
 
 The simplest way to configure the Conjur API is to use the configuration file stored on the machine.
 If you have configured the machine with [conjur init](http://developer.conjur.net/reference/tools/init.html),
-<<<<<<< HEAD
 its default location is `~/.conjurrc`.
-=======
-it's default location is `~/.conjurrc`.
->>>>>>> Added development environment
 
 The Conjur configuration process also checks `/etc/conjur.conf` for global settings. This is typically used
 in server environments.

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "5.2.1"
+    VERSION = "5.3.0"
   end
 end

data/lib/conjur/api.rb

@@ -41,6 +41,7 @@ require 'conjur/api/pubkeys'
 require 'conjur/api/variables'
 require 'conjur/api/policies'
 require 'conjur/api/host_factories'
+require 'conjur/api/ldap_sync'
 require 'conjur/host'
 require 'conjur/group'
 require 'conjur/variable'

data/lib/conjur/api/ldap_sync.rb

@@ -0,0 +1,38 @@
+#
+# Copyright 2013-2018 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
+  class API
+    
+    # Retrieve the policy for the given LDAP sync
+    # configuration. Configurations created through the Conjur UI are
+    # named +default+, so the default value of +config_name+ can be
+    # used.
+    #
+    # For details on the use of LDAP sync, see
+    # https://developer.conjur.net/reference/services/ldap_sync/ .
+    #
+    # @param [String] config_name the name of the LDAP sync configuration.
+    def ldap_sync_policy config_name: 'default'
+      JSON.parse(url_for(:ldap_sync_policy, credentials, config_name).get)
+    end
+  end
+end

data/lib/conjur/api/router/v5.rb

@@ -139,6 +139,10 @@ module Conjur
           end
         end
 
+        def ldap_sync_policy(credentials, config_name)
+          RestClient::Resource.new(Conjur.configuration.core_url, credentials)['ldap-sync']["policy?config_name=#{fully_escape(config_name)}"]
+        end
+        
         private
 
         def resource_annotations resource

data/lib/conjur/has_attributes.rb

@@ -71,11 +71,14 @@ module Conjur
       @attributes = nil
     end
 
-
+    def annotations
+      Hash[(attributes['annotations']||{}).collect {|e| [e['name'],e['value']]}]
+    end
+    
     protected
 
     def annotation_value name
-      HasAttributes.annotation_value attributes['annotations'], name
+      annotations[name]
     end
 
     # @api private
@@ -92,4 +95,4 @@ module Conjur
       end
     end
   end
-end
+end

data/spec/ldap_sync_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Conjur::API, api: :dummy do
+  let(:router) { double('router', :get => "{}") }
+  before do
+    allow_any_instance_of(Conjur::API).to receive(:url_for).with(:ldap_sync_policy, any_args).and_return(router)
+  end
+
+  # verify that the method exists, and takes the correct argument.
+  describe '#ldap_sync_policy' do
+    context 'with default config' do
+      subject { api.ldap_sync_policy }
+      it { is_expected.to eq({})  }
+    end
+
+    context 'with a config specified' do
+      subject { api.ldap_sync_policy config_name: 'non-default-config' }
+      it { is_expected.to eq({}) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -286,6 +286,7 @@ files:
 - lib/conjur/api.rb
 - lib/conjur/api/authn.rb
 - lib/conjur/api/host_factories.rb
+- lib/conjur/api/ldap_sync.rb
 - lib/conjur/api/policies.rb
 - lib/conjur/api/pubkeys.rb
 - lib/conjur/api/resources.rb
@@ -331,6 +332,7 @@ files:
 - spec/has_attributes_spec.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/ldap_sync_spec.rb
 - spec/log_source_spec.rb
 - spec/log_spec.rb
 - spec/roles_spec.rb
@@ -398,6 +400,7 @@ test_files:
 - spec/has_attributes_spec.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/ldap_sync_spec.rb
 - spec/log_source_spec.rb
 - spec/log_spec.rb
 - spec/roles_spec.rb