conjur-asset-proxy 0.3.3 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/conjur-asset-proxy.gemspec +5 -4
  3. data/lib/conjur/asset/proxy/version.rb +1 -1
  4. data/lib/conjur/proxy.rb +10 -0
  5. metadata +22 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 87499320c6f82f4e78d1ca7583d024b4d58b6b1b
4
- data.tar.gz: f8c5f5bb289ab695e545192768e45ab799ef1248
3
+ metadata.gz: 5df78db3b4c1a551a17540a93e3c03d1cd67b2e6
4
+ data.tar.gz: 61a56163c17874be43dd194734f92533bf5dd0ef
5
5
  SHA512:
6
- metadata.gz: 21680df0fe95e83e7f0191fba1a7a5e2e204a8765826dc65419793944e694c7e8c896a1bb0cd923ee20d1e79f831a9962f706bb70e37544af63243ccfba39646
7
- data.tar.gz: 9d0c1edb14946d3b3ae074ed02a837af1ca8eb68935163baafac2d1f81918b1d488910058e5df71d353909d6199a58db8a223b2594fc3877e3d60c4e8a5cd8df
6
+ metadata.gz: bf8c4991e832f7ddc96aee537a5bb4983fa895c2ec0fa00ad18b6e893ba90231f9183f59bf87ecfe6dace18815ff62b10cb4d869739db00c91668abc1c65ec2a
7
+ data.tar.gz: 421a0b9c0a3bfa07c32f72572fa6179a61de8333640fd7e606cc0798f47b9df7daeb358b55514657889066a2404319acbb3433dc2e9dbe9ba859deb817021d4f
data/conjur-asset-proxy.gemspec CHANGED
@@ -6,10 +6,10 @@ require 'conjur/asset/proxy/version'
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = "conjur-asset-proxy"
8
8
  spec.version = Conjur::Asset::Proxy::VERSION
9
- spec.authors = ["Rafał Rzepecki"]
10
- spec.email = ["rafal@conjur.net"]
9
+ spec.authors = ["Rafał Rzepecki", "Mikalai Sevastsyanau"]
10
+ spec.email = ["rafal@conjur.net", "mikalai@conjur.net"]
11
11
  spec.summary = %q{Simple HTTP proxy which adds Conjur authentication headers}
12
- spec.homepage = "https://github.com/conjurinc/conjur-asset-host-factory"
12
+ spec.homepage = "https://github.com/conjurinc/conjur-asset-proxy"
13
13
  spec.license = "MIT"
14
14
 
15
15
  spec.files = `git ls-files -z`.split("\x0")
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
22
22
  spec.add_runtime_dependency "conjur-cli", "~> 4.12"
23
23
  spec.add_runtime_dependency "rack", "~> 1.5"
24
24
  spec.add_runtime_dependency "rack-streaming-proxy", "~> 2.0"
25
- spec.add_runtime_dependency "thin", "~> 1.6"
25
+ spec.add_runtime_dependency "unicorn", "~> 4.8.3"
26
+ spec.add_runtime_dependency "unicorn-rails", "~> 2.2.0"
26
27
  spec.add_runtime_dependency "escape_utils", "~> 1.0"
27
28
 
28
29
  spec.add_development_dependency "bundler", "~> 1.6"
data/lib/conjur/asset/proxy/version.rb CHANGED
@@ -21,7 +21,7 @@
21
21
  module Conjur
22
22
  module Asset
23
23
  module Proxy
24
- VERSION = "0.3.3"
24
+ VERSION = "0.4.0"
25
25
  end
26
26
  end
27
27
  end
data/lib/conjur/proxy.rb CHANGED
@@ -21,6 +21,7 @@
21
21
 
22
22
  require 'rack'
23
23
  require 'rack/streaming_proxy'
24
+ require 'unicorn-rails'
24
25
 
25
26
  module Conjur
26
27
  class Proxy
@@ -78,6 +79,15 @@ module Conjur
78
79
  OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file options[:cacert]
79
80
  end
80
81
 
82
+ Rack::StreamingProxy::Session.class_eval do
83
+ # set timeout to 30 min, 30 seconds is not enought for uploading
84
+ def start
85
+ @piper = Servolux::Piper.new 'r', timeout: 1600
86
+ @piper.child { child }
87
+ @piper.parent { parent }
88
+ end
89
+ end
90
+
81
91
  Rack::Server.start app: self, Port: options[:port] || 8080, Host: options[:address] || '127.0.0.1'
82
92
  end
83
93
  end
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-asset-proxy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rafał Rzepecki
8
+ - Mikalai Sevastsyanau
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-10-08 00:00:00.000000000 Z
12
+ date: 2014-12-12 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: gli
@@ -67,19 +68,33 @@ dependencies:
67
68
  - !ruby/object:Gem::Version
68
69
  version: '2.0'
69
70
  - !ruby/object:Gem::Dependency
70
- name: thin
71
+ name: unicorn
71
72
  requirement: !ruby/object:Gem::Requirement
72
73
  requirements:
73
74
  - - ~>
74
75
  - !ruby/object:Gem::Version
75
- version: '1.6'
76
+ version: 4.8.3
76
77
  type: :runtime
77
78
  prerelease: false
78
79
  version_requirements: !ruby/object:Gem::Requirement
79
80
  requirements:
80
81
  - - ~>
81
82
  - !ruby/object:Gem::Version
82
- version: '1.6'
83
+ version: 4.8.3
84
+ - !ruby/object:Gem::Dependency
85
+ name: unicorn-rails
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - ~>
89
+ - !ruby/object:Gem::Version
90
+ version: 2.2.0
91
+ type: :runtime
92
+ prerelease: false
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - ~>
96
+ - !ruby/object:Gem::Version
97
+ version: 2.2.0
83
98
  - !ruby/object:Gem::Dependency
84
99
  name: escape_utils
85
100
  requirement: !ruby/object:Gem::Requirement
@@ -139,6 +154,7 @@ dependencies:
139
154
  description:
140
155
  email:
141
156
  - rafal@conjur.net
157
+ - mikalai@conjur.net
142
158
  executables: []
143
159
  extensions: []
144
160
  extra_rdoc_files: []
@@ -154,7 +170,7 @@ files:
154
170
  - lib/conjur/asset/proxy/version.rb
155
171
  - lib/conjur/command/proxy.rb
156
172
  - lib/conjur/proxy.rb
157
- homepage: https://github.com/conjurinc/conjur-asset-host-factory
173
+ homepage: https://github.com/conjurinc/conjur-asset-proxy
158
174
  licenses:
159
175
  - MIT
160
176
  metadata: {}