conjur-api 4.28.0 → 4.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038dcc4d85e30d07b34ca84dda11196b3cbc8a98
-  data.tar.gz: 7b47721f2a9af64c512c6c2fbc5a5644aa5d98e5
+  metadata.gz: f57acfdd94157de9609e46b399c12484591d13c2
+  data.tar.gz: a4ecc120203d25a8cfd56d9b01894a61e71d13cd
 SHA512:
-  metadata.gz: 9d4dc629522aa37aeea760aa16ec9d9df7694754fe5490f45530de68bcba544a9b35de834288dd4576920a92b800be71fe3a03414397be0e24bd06a954929fe0
-  data.tar.gz: dafee7953f111a1723a22f9cc0b2a2dacd970e6c10fad46f20458380fb14951ff7ef0e83a09027aa9e3cb20d0fc993a39e6872bfce2fc46e536879ab356f2c73
+  metadata.gz: ff668011c790785e3c80eeeccac8a85ee22e6337030f96c58bb69f9c012bce35044c96d33b47ea52ee8d203c65c79f2aebaf5e24355c7f1646eef93cbd947f1c
+  data.tar.gz: 547ae4223549ecf0150f861ec7e6736e90933219d9f22f122573f7745dedee3218ebf911b36eb44523bcfd3acad0ca99677582262ee3b27ab7fff9d97e7aa432

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.28.1
+
+* `Conjur::API#ldap_sync_policy` now returns log events generated when
+  showing a policy.
+
 # v4.28.0
 
 * Add `Conjur::API#ldap_sync_policy` to fetch the policy to use to

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "4.28.0"
+    VERSION = "4.28.1"
   end
 end

data/lib/conjur/api/ldapsync.rb

@@ -43,13 +43,7 @@ module Conjur
       # chunks doesn't buy us much of anything except more complicated
       # client code.
       response = RestClient::Resource.new(url, headers).get
-
-      json = if response.headers[:content_type] == 'text/event-stream'
-               find_policy_event(response) || find_error_events(response)
-             else
-               %Q({"error": {"message": "Unexpected response from server: #{response.body}"}})
-             end
-      JSON.parse(json)
+      JSON.parse(get_json("policy", response)).merge('events' => find_log_events(response))
     end
 
     # @api private
@@ -58,7 +52,8 @@ module Conjur
     # @param [String] profile name 
     # @param [Hash] options reserved
     def ldap_sync_show_profile(profile, options = {})
-      resp = RestClient::Resource.new(Conjur.configuration.appliance_url, credentials)['ldap-sync']['config'].get(options)
+      url = Conjur.configuration.appliance_url
+      resp = RestClient::Resource.new(url, credentials)['ldap-sync']['config'][profile].get(options)
       JSON.parse(resp.body)
     end
 
@@ -70,22 +65,51 @@ module Conjur
     #
     # @param [Hash] profile a hash containing the LDAP sync configuration
     # @param [Hash] options reserved
-    def ldap_sync_update_profile(profile, options = {})
+    def ldap_sync_update_profile(profile_name, profile, options = {})
       options[:json_config] = profile.to_json
-      resp = RestClient::Resource.new(Conjur.configuration.appliance_url, credentials)['ldap-sync']['config'].put(options.to_json, :content_type => 'application/json')
+      resp = RestClient::Resource.new(Conjur.configuration.appliance_url, credentials)['ldap-sync']['config'][profile_name].put(options.to_json, :content_type => 'application/json')
       JSON.parse(resp.body)
     end
 
+    # @api private
+    # Search using an LDAP sync profile
+    #
+    # @param [String] profile name
+    # @param [Hash] options reserved
+    def ldap_sync_search(profile, options = {})
+      headers = credentials.dup.tap {|h|
+        h[:headers][:accept] = 'text/event-stream'
+      }
+
+      response = RestClient::Resource.new(Conjur.configuration.appliance_url, headers)['ldap-sync']['search'].post(options.merge(:config_name => profile))
+      JSON.parse(get_json("groups", response)).merge('events' => find_log_events(response))
+    end
+
     # @!endgroup
     
     private
-    def find_policy_event(response)
-      response.body.lines.find {|l| l =~ /^data: {"policy":/}.try(:[], 6..-1)
+    def get_json(key, response)
+      if response.headers[:content_type] == 'text/event-stream'
+        find_event_by_key(key, response) || find_error_events(response)
+      else
+        %Q({"error": {"message": "Unexpected response from server: #{response.body}"}})
+      end    
+    end
+
+    def find_event_by_key(key, response)
+      response.body.lines.find {|l| l =~ %r(^data: {"#{key}":) }.try(:[], 6..-1)
+    end
+
+    def find_log_events(response)
+      find_events(response, 'log').collect { |e| JSON.parse(e)['log'] }
     end
 
     def find_error_events(response)
-      response.body.lines.collect {|l| l.match(/^data: ({"error":.*)/).try(:[], 1)}.compact.join("\n")
+      find_events(response, "error").join("\n")
     end
 
+    def find_events(response, key)
+      response.body.lines.collect {|l| l.match(/^data: ({"#{key}":.*)/).try(:[], 1)}.compact
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.28.0
+  version: 4.28.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client