conjur-api 4.20.0 → 4.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb00e2f94e68846848adb5a2cd1ab57ac5fc1a6
-  data.tar.gz: 56489be115c5c8204ab84fd2985e6041384af5be
+  metadata.gz: 499e973eac8164648777759b0128f502ad692bb6
+  data.tar.gz: 6d85fe429b8d77cb7aaca33370c0bc48179e5345
 SHA512:
-  metadata.gz: e03d90f9779f73f2fcdb366f72b5f23266072121a69e03c480be29796822e5048fb580fddb56a9b57c44c0a7084cd60de22b21f185f8e4c881aa1e1c678c05fd
-  data.tar.gz: 40b2f4d6c81f5c38a97917526e8dd8fd6176fb53d1bf53deaddd902ac59d264dafdb8c30449c3f95c397964cef18ba722ca897685b025132702b35010303d10d
+  metadata.gz: fa2d3a7024f3d41e6e87f81873179a1528b5d9b6d0a5657a8e8c281d8368189b3db301d3b525d88697d049d44868bac8df6b26aa026d2da48e785ed62d4ab843
+  data.tar.gz: 301f2f79b84e3c8a3f13a2cdb21666d33e3cc80bc0e5144aa8974e19a248070d49c081d6ffaabc41c4b06925cbfce7b637a4b30a91b3aba36e94e12927a0c160

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.20.1
+
+* BUGFIX: Better handling for unicode and special characters in user ids.
+
 # v4.20.0
 
 * Add support for Host Factory functionality (replaces conjur-asset-host-factory plugin).

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "4.20.0"
+    VERSION = "4.20.1"
   end
 end

data/lib/conjur/annotations.rb

@@ -33,7 +33,7 @@ module Conjur
   #
   class Annotations
     include Enumerable
-
+    include Conjur::Escape
     # Create an `Annotations` instance for the given {Conjur::Resource}.
     #
     # Note that you will generally use the {Conjur::Resource#annotations} method to get
@@ -161,7 +161,9 @@ module Conjur
     def update_annotation name, value
       @resource.invalidate do
         @annotations_hash = nil
-        path = [@resource.account,'annotations', @resource.kind, @resource.identifier].join '/'
+        path = [@resource.account,'annotations', @resource.kind, @resource.identifier].map do |seg|
+          fully_escape(seg)
+        end.join('/')
         RestClient::Resource.new(Conjur::Authz::API.host, @resource.options)[path].put name: name, value: value
       end
     end

data/spec/lib/annotations_spec.rb

@@ -3,8 +3,9 @@ require 'helpers/request_helpers'
 
 describe Conjur::Annotations do
   include RequestHelpers
+  include Conjur::Escape
 
-  let(:identifier){ 'the-resource-id' }
+  let(:identifier){ 'the-r{source}&^-id' }
   let(:kind){ 'some-kind' }
   let(:account){ 'the-account' }
   let(:resourceid){ [account, kind, identifier].join ':'}
@@ -23,7 +24,7 @@ describe Conjur::Annotations do
   
   subject { annotations }
 
-  let(:url){ "#{Conjur::Authz::API.host}/#{account}/annotations/#{kind}/#{identifier}" }
+  let(:url){ "#{Conjur::Authz::API.host}/#{account}/annotations/#{kind}/#{fully_escape identifier}" }
 
   def expect_put_request url, payload
     expect_request(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.20.0
+  version: 4.20.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client