conjur-asset-proxy 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c7c309c97f11b81d0ff2279a45cec58f0abef0
-  data.tar.gz: 5c822a7b65fa193fccffc608f9ca3efcbf8c3c2e
+  metadata.gz: 87499320c6f82f4e78d1ca7583d024b4d58b6b1b
+  data.tar.gz: f8c5f5bb289ab695e545192768e45ab799ef1248
 SHA512:
-  metadata.gz: 2cc41fa816077395219eb4f4ec575693dca789a25e5d3c61bd363f239e595182b976036f51d824c65b4be712a372b1571b7d289532dfdad43d3451ae9179ab22
-  data.tar.gz: f2e1905f67c87c30da20df68c12da7a09be88f67af616a4e20e963d194db25539f9d55e31558fc3913079cdd2afc7acef42463e7d35c92afc6dff064aedfb651
+  metadata.gz: 21680df0fe95e83e7f0191fba1a7a5e2e204a8765826dc65419793944e694c7e8c896a1bb0cd923ee20d1e79f831a9962f706bb70e37544af63243ccfba39646
+  data.tar.gz: 9d0c1edb14946d3b3ae074ed02a837af1ca8eb68935163baafac2d1f81918b1d488910058e5df71d353909d6199a58db8a223b2594fc3877e3d60c4e8a5cd8df

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 
+desc "Update copyright headers"
 task :headers do
   require 'rubygems'
   require 'copyright_header'
@@ -17,3 +18,8 @@ task :headers do
   command_line = CopyrightHeader::CommandLine.new( args )
   command_line.execute
 end
+
+task :jenkins do
+  # TODO
+  puts "No tests, maybe add some specs?"
+end

data/conjur-asset-proxy.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rack", "~> 1.5"
   spec.add_runtime_dependency "rack-streaming-proxy", "~> 2.0"
   spec.add_runtime_dependency "thin", "~> 1.6"
+  spec.add_runtime_dependency "escape_utils", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/conjur/asset/proxy/version.rb

@@ -21,7 +21,7 @@
 module Conjur
   module Asset
     module Proxy
-      VERSION = "0.3.2"
+      VERSION = "0.3.3"
     end
   end
 end

data/lib/conjur/command/proxy.rb

@@ -41,7 +41,7 @@ terminated.
 
     c.switch :k,
         desc: "Don't verificate HTTPS certificate"
-        
+
     c.flag :cacert,
         desc: "Verify SSL using the provided cert file"
 
@@ -52,6 +52,18 @@ terminated.
         options[:insecure] = true
       end
 
+      unless url.start_with?('http://') || url.start_with?('https://')
+        url = url.gsub(/^(.+?\:(\/)?(\/)?)?/, 'https://')
+      end
+
+      require 'uri'
+
+      uri = URI.parse(url)
+      uri.path = ''
+      uri.query = nil
+
+      url = uri.to_s
+
       options.slice! :port, :address, :insecure, :cacert
       options.delete :port unless options[:port].respond_to? :to_i
 

data/lib/conjur/proxy.rb

@@ -40,7 +40,14 @@ module Conjur
     attr_reader :proxy, :conjur
 
     def call env
-      env["HTTP_AUTHORIZATION"] = conjur.credentials[:headers][:authorization]
+      env['HTTP_AUTHORIZATION'] = conjur.credentials[:headers][:authorization]
+
+      if (env['REQUEST_METHOD'] == 'POST' || env['REQUEST_METHOD'] == 'PUT')
+        if !env.include?('CONTENT_LENGTH') && (!env.include?('TRANSFER_ENCODING') ||
+            env['TRANSFER_ENCODING'] != 'chunked')
+          env['CONTENT_LENGTH'] = '0'
+        end
+      end
 
       ret = proxy.call env
 
@@ -66,7 +73,7 @@ module Conjur
           end
         end
       end
-      
+
       if options[:cacert]
         OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file options[:cacert]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-proxy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Rafał Rzepecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: escape_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement