conjur-cli 5.2.4 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465b9de6e8a2c63bfc0ff50a4f421beac585e858
-  data.tar.gz: 1fa9c46b64f9029a34bc37ea50492c5a14866be7
+  metadata.gz: 3e4d7900d35da02505f1bfb843f9f79414fc49b5
+  data.tar.gz: 4c382758571b68d6de8c2e501c81726179cc987c
 SHA512:
-  metadata.gz: 908d69e05ec7941e47e724b484a828ce20e316c1abc4f9241d3c81cc9c5b6d09371a1e79b0ef2fe76608aa9af04728b884356191348e0e30f954555cfaa9bfa8
-  data.tar.gz: 43a250909cbdef74620981d1a2b437117b2f74c19bfb146297b0ec50aaba6108b434cbea226329a75d755033ab1d21814665063cb853f4010ae4a8caac07cc94
+  metadata.gz: 48fa15fa3e402e2d72bfffb14b8e895f5078ca2de8840abad219a76d65e07e64fd0e4c30dc7f78a16e24717738c0dc1dd31718d95ec9dd96e7c5655788df4512
+  data.tar.gz: 27f5ef9102d531e69a8d8821d71678914632ab4a398ff00ce934b968916709194bbb0d2b2467d6723087f61220132d6af2c059ca7c1fa9f548c8663f37495c56

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.2.5
+
+* Fix behavior of `conjur env` when [policy plugin](https://github.com/conjurinc/conjur-asset-policy) is installed.
+
 # 5.2.4
 
 * Fix behavior of `conjur env`, when detecting variables vs literals

data/lib/conjur/conjurenv.rb

@@ -21,6 +21,7 @@
 require 'conjur/api'
 require 'yaml'
 
+
 module Conjur
   class Env
 
@@ -82,6 +83,9 @@ module Conjur
     def parse(yaml, substitutions = {})
       YAML.add_tag("!var", ConjurVariable)
       YAML.add_tag("!tmp", ConjurTempfile)
+
+      fix_safeyaml! %w(!tmp !var)
+
       definition = YAML.load(yaml)
       raise "Definition should be a Hash" unless definition.kind_of?(Hash)
       # convert fixnums to literals -- to make definitions of e.g. ports more convenient
@@ -130,5 +134,15 @@ module Conjur
       ]
     end
 
+
+    private
+    def fix_safeyaml! tags
+      # Including `conjur-asset-policy` adds the safe_yaml gem, which patches
+      # YAML.load to do so without deserializing objects with custom tags.
+      if defined?(SafeYAML)
+        SafeYAML::OPTIONS[:whitelisted_tags] =
+            SafeYAML::OPTIONS[:whitelisted_tags].concat(tags).uniq
+      end
+    end
   end
 end

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = '5.2.4'
+  VERSION = '5.2.5'
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.2.5
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport