conjur-asset-proxy-api 0.2.1 → 0.3.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/lib/conjur/asset/proxy/version.rb +1 -1
  3. data/lib/conjur/command/proxy.rb +11 -1
  4. data/lib/conjur/proxy.rb +27 -1
  5. metadata +23 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0a43051728b6a2b7842290083963ca7488815ab6
4
- data.tar.gz: a96bef5fa6cb1ec8e83f505820ec11fe92ee739d
3
+ metadata.gz: a8e7e0b0b2b7a1357360253c3caf3395ba4c3f68
4
+ data.tar.gz: 2825110ca638a93a792c4ebecc272db04cbb46c6
5
5
  SHA512:
6
- metadata.gz: 109fd05ecdf3ff633ece68788ee24037e3c302124b42ee66b96498fe9c40acb913c0138d890a2832cdc58a997539a416d239dd9b96d2079502be88ac3921f898
7
- data.tar.gz: ae1bfbb975bdf39feca8dcfee3c863e17c62ffba025723378d7b309fe5a7681c24dc2bf2b396f591e35a45233a1c9ad8f6c699729e2c0b4b84e28c15c98789aa
6
+ metadata.gz: 80d82820a3015da6ff0f12d0f9b47943a0085f1685fff9a0ca28b12f055831b27f00c38e9ea86a088dd53ba22d40e1cb83a553c84ba4a39bd63188e3e085d467
7
+ data.tar.gz: 067c163674e3ff139bbb19979e6ce8b49a974b9e87ef4d205057b712898486a129df16c78c3106ef085e9b8a3c317fe3d28a55c95b1e9624df6dc6e9c454eb10
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.2.1"
24
+ VERSION = "0.3.0"
25
25
  end
26
26
  end
27
27
  end
data/lib/conjur/command/proxy.rb CHANGED
@@ -39,10 +39,20 @@ terminated.
39
39
  desc: "address to bind to",
40
40
  default_value: "127.0.0.1"
41
41
 
42
+ c.switch :k,
43
+ desc: "Don't verificate HTTPS certificate"
44
+
45
+ c.flag :cacert,
46
+ desc: "Verify SSL using the provided cert file"
47
+
42
48
  c.action do |global_options, options, args|
43
49
  url = args.shift or help_now!("missing URL")
44
50
 
45
- options.slice! :port, :address
51
+ if options[:k]
52
+ options[:insecure] = true
53
+ end
54
+
55
+ options.slice! :port, :address, :insecure, :cacert
46
56
  options.delete :port unless options[:port].respond_to? :to_i
47
57
 
48
58
  require 'conjur/proxy'
data/lib/conjur/proxy.rb CHANGED
@@ -35,10 +35,36 @@ module Conjur
35
35
 
36
36
  def call env
37
37
  env["HTTP_AUTHORIZATION"] = conjur.credentials[:headers][:authorization]
38
- proxy.call env
38
+
39
+ ret = proxy.call env
40
+
41
+ # hack for Docker Hub & Registry API
42
+ if ret[1].include?('x-docker-endpoints')
43
+ ret[1]['x-docker-endpoints'] = env['HTTP_HOST']
44
+ end
45
+
46
+ ret
39
47
  end
40
48
 
41
49
  def start options
50
+ if options[:insecure]
51
+ Net::HTTP.class_eval do
52
+ def use_ssl=(flag)
53
+ flag = flag ? true : false
54
+ if started? and @use_ssl != flag
55
+ raise IOError, "use_ssl value changed, but session already started"
56
+ end
57
+ @use_ssl = flag
58
+
59
+ self.verify_mode = OpenSSL::SSL::VERIFY_NONE
60
+ end
61
+ end
62
+ end
63
+
64
+ if options[:cacert]
65
+ OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file options[:cacert]
66
+ end
67
+
42
68
  Rack::Server.start app: self, Port: options[:port] || 8080, Host: options[:address] || '127.0.0.1'
43
69
  end
44
70
  end
metadata CHANGED
@@ -1,125 +1,125 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-asset-proxy-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rafał Rzepecki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-14 00:00:00.000000000 Z
11
+ date: 2014-10-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: gli
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 2.12.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 2.12.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: conjur-cli
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '4.12'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '4.12'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rack
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: '1.5'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: '1.5'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rack-streaming-proxy
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '2.0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: '2.0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: thin
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.6'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.6'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.6'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
96
  version: '1.6'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rake
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: copyright-header
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  description:
@@ -129,8 +129,8 @@ executables: []
129
129
  extensions: []
130
130
  extra_rdoc_files: []
131
131
  files:
132
- - ".gitignore"
133
- - ".project"
132
+ - .gitignore
133
+ - .project
134
134
  - Gemfile
135
135
  - LICENSE.txt
136
136
  - README.md
@@ -150,12 +150,12 @@ require_paths:
150
150
  - lib
151
151
  required_ruby_version: !ruby/object:Gem::Requirement
152
152
  requirements:
153
- - - ">="
153
+ - - '>='
154
154
  - !ruby/object:Gem::Version
155
155
  version: '0'
156
156
  required_rubygems_version: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - ">="
158
+ - - '>='
159
159
  - !ruby/object:Gem::Version
160
160
  version: '0'
161
161
  requirements: []
@@ -165,3 +165,4 @@ signing_key:
165
165
  specification_version: 4
166
166
  summary: Simple HTTP proxy which adds Conjur authentication headers
167
167
  test_files: []
168
+ has_rdoc: