conjur-asset-proxy 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87499320c6f82f4e78d1ca7583d024b4d58b6b1b
-  data.tar.gz: f8c5f5bb289ab695e545192768e45ab799ef1248
+  metadata.gz: 5df78db3b4c1a551a17540a93e3c03d1cd67b2e6
+  data.tar.gz: 61a56163c17874be43dd194734f92533bf5dd0ef
 SHA512:
-  metadata.gz: 21680df0fe95e83e7f0191fba1a7a5e2e204a8765826dc65419793944e694c7e8c896a1bb0cd923ee20d1e79f831a9962f706bb70e37544af63243ccfba39646
-  data.tar.gz: 9d0c1edb14946d3b3ae074ed02a837af1ca8eb68935163baafac2d1f81918b1d488910058e5df71d353909d6199a58db8a223b2594fc3877e3d60c4e8a5cd8df
+  metadata.gz: bf8c4991e832f7ddc96aee537a5bb4983fa895c2ec0fa00ad18b6e893ba90231f9183f59bf87ecfe6dace18815ff62b10cb4d869739db00c91668abc1c65ec2a
+  data.tar.gz: 421a0b9c0a3bfa07c32f72572fa6179a61de8333640fd7e606cc0798f47b9df7daeb358b55514657889066a2404319acbb3433dc2e9dbe9ba859deb817021d4f

data/conjur-asset-proxy.gemspec

@@ -6,10 +6,10 @@ require 'conjur/asset/proxy/version'
 Gem::Specification.new do |spec|
   spec.name          = "conjur-asset-proxy"
   spec.version       = Conjur::Asset::Proxy::VERSION
-  spec.authors       = ["Rafał Rzepecki"]
-  spec.email         = ["rafal@conjur.net"]
+  spec.authors       = ["Rafał Rzepecki", "Mikalai Sevastsyanau"]
+  spec.email         = ["rafal@conjur.net", "mikalai@conjur.net"]
   spec.summary       = %q{Simple HTTP proxy which adds Conjur authentication headers}
-  spec.homepage      = "https://github.com/conjurinc/conjur-asset-host-factory"
+  spec.homepage      = "https://github.com/conjurinc/conjur-asset-proxy"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "conjur-cli", "~> 4.12"
   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 "unicorn", "~> 4.8.3"
+  spec.add_runtime_dependency "unicorn-rails", "~> 2.2.0"
   spec.add_runtime_dependency "escape_utils", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"

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

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

data/lib/conjur/proxy.rb

@@ -21,6 +21,7 @@
 
 require 'rack'
 require 'rack/streaming_proxy'
+require 'unicorn-rails'
 
 module Conjur
   class Proxy
@@ -78,6 +79,15 @@ module Conjur
         OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file options[:cacert]
       end
 
+      Rack::StreamingProxy::Session.class_eval do
+        # set timeout to 30 min, 30 seconds is not enought for uploading
+        def start
+          @piper = Servolux::Piper.new 'r', timeout: 1600
+          @piper.child  { child }
+          @piper.parent { parent }
+        end
+      end
+
       Rack::Server.start app: self, Port: options[:port] || 8080, Host: options[:address] || '127.0.0.1'
     end
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-proxy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Rafał Rzepecki
+- Mikalai Sevastsyanau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -67,19 +68,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 4.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 4.8.3
+- !ruby/object:Gem::Dependency
+  name: unicorn-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: escape_utils
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +154,7 @@ dependencies:
 description: 
 email:
 - rafal@conjur.net
+- mikalai@conjur.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -154,7 +170,7 @@ files:
 - lib/conjur/asset/proxy/version.rb
 - lib/conjur/command/proxy.rb
 - lib/conjur/proxy.rb
-homepage: https://github.com/conjurinc/conjur-asset-host-factory
+homepage: https://github.com/conjurinc/conjur-asset-proxy
 licenses:
 - MIT
 metadata: {}