ritm 1.0.0 → 1.0.1

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ritm/certs/ca.rb +3 -3
  3. data/lib/ritm/helpers/encodings.rb +1 -1
  4. data/lib/ritm/interception/http_forwarder.rb +1 -1
  5. data/lib/ritm/proxy/cert_signing_https_server.rb +17 -1
  6. data/lib/ritm/proxy/proxy_server.rb +1 -1
  7. data/lib/ritm/version.rb +1 -1
  8. metadata +35 -35
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 96ffb4d3b3d3b382171277d5095c9ba57396b6ee
4
- data.tar.gz: ca0cafa22dcd94188702deb3d1ee3c4e3e71ed6a
3
+ metadata.gz: e581e2bbcbe36f92ac28b4d5031f3db1e91adcc3
4
+ data.tar.gz: 0252a1ebae911a7143d830252dd0d3e3cba06ab9
5
5
  SHA512:
6
- metadata.gz: f05d3344d6157f1a2a374818b006019400a30d524d6df3db249abc5c9caaa4a4e494a9637bf784133f1cc92af7d34b47899a67d6ebfb1af1a2dc008747224a1f
7
- data.tar.gz: c0a8e290882acde4b170fd788122186b3499e755395411ae3f35d0d80e5c6ba75546c6bc3c4181f25d24018590b3366850a3bf9fcec598d6a4c0e51edb41df50
6
+ metadata.gz: c311b91818407322ce5abd19a2f3f7c4544f9e1476a314f2e048235a6dadc0e120f26c54d18ca5a4d5cc263166a3656a53116a704f2c17adf3923cc9587428ed
7
+ data.tar.gz: f24a9133457892a8e8fdb24631f3bcbfd4680134d6dc7b98e379de626509f801099f6fb34defa2fb62171da472093d84152c180a309345bbc1835111a04c013d
data/lib/ritm/certs/ca.rb CHANGED
@@ -28,14 +28,14 @@ module Ritm
28
28
  def self.signing_profile
29
29
  {
30
30
  'extensions' => {
31
- 'keyUsage' => { 'usage' => %w(keyEncipherment digitalSignature) },
32
- 'extendedKeyUsage' => { 'usage' => %w(serverAuth clientAuth) }
31
+ 'keyUsage' => { 'usage' => %w[keyEncipherment digitalSignature] },
32
+ 'extendedKeyUsage' => { 'usage' => %w[serverAuth clientAuth] }
33
33
  }
34
34
  }
35
35
  end
36
36
 
37
37
  def self.ca_signing_profile
38
- { 'extensions' => { 'keyUsage' => { 'usage' => %w(critical keyCertSign keyEncipherment digitalSignature) } } }
38
+ { 'extensions' => { 'keyUsage' => { 'usage' => %w[critical keyCertSign keyEncipherment digitalSignature] } } }
39
39
  end
40
40
  end
41
41
  end
data/lib/ritm/helpers/encodings.rb CHANGED
@@ -3,7 +3,7 @@ require 'zlib'
3
3
  module Ritm
4
4
  # ENCODER/DECODER of HTTP content
5
5
  module Encodings
6
- ENCODINGS = [:identity, :gzip, :deflate].freeze
6
+ ENCODINGS = %i[identity gzip deflate].freeze
7
7
 
8
8
  def self.encode(encoding, data)
9
9
  case encoding
data/lib/ritm/interception/http_forwarder.rb CHANGED
@@ -23,7 +23,7 @@ module Ritm
23
23
  # TODO: make SSL verification a configuration setting
24
24
  @client = Faraday.new(ssl: { verify: false }) do |conn|
25
25
  conn.adapter :net_http
26
- conn.proxy @config.misc.upstream_proxy unless @config.misc.upstream_proxy.nil?
26
+ conn.proxy = @config.misc.upstream_proxy unless @config.misc.upstream_proxy.nil?
27
27
  end
28
28
  end
29
29
 
data/lib/ritm/proxy/cert_signing_https_server.rb CHANGED
@@ -1,7 +1,10 @@
1
+ require 'openssl'
1
2
  require 'webrick'
2
3
  require 'webrick/https'
3
4
  require 'ritm/certs/certificate'
4
5
 
6
+ IS_RUBY_2_4_OR_OLDER = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
7
+
5
8
  module Ritm
6
9
  module Proxy
7
10
  # Patches WEBrick::HTTPServer SSL context creation to get
@@ -40,11 +43,24 @@ module Ritm
40
43
  end
41
44
 
42
45
  def context_with_cert(original_ctx, cert)
43
- ctx = original_ctx.dup
46
+ ctx = duplicate_context(original_ctx)
44
47
  ctx.key = cert.private_key
45
48
  ctx.cert = cert.x509
46
49
  ctx
47
50
  end
51
+
52
+ def duplicate_context(original_ctx)
53
+ return original_ctx.dup unless IS_RUBY_2_4_OR_OLDER
54
+
55
+ ctx = OpenSSL::SSL::SSLContext.new
56
+
57
+ original_ctx.instance_variables.each do |variable_name|
58
+ prop_name = variable_name.to_s.sub(/^@/, '')
59
+ set_prop_method = "#{prop_name}="
60
+ ctx.send(set_prop_method, original_ctx.send(prop_name)) if ctx.respond_to? set_prop_method
61
+ end
62
+ ctx
63
+ end
48
64
  end
49
65
  end
50
66
  end
data/lib/ritm/proxy/proxy_server.rb CHANGED
@@ -36,7 +36,7 @@ module Ritm
36
36
  send("do_#{req.request_method}", req, res)
37
37
  rescue NoMethodError
38
38
  raise WEBrick::HTTPStatus::MethodNotAllowed, "unsupported method `#{req.request_method}'."
39
- rescue => err
39
+ rescue StandardError => err
40
40
  raise WEBrick::HTTPStatus::ServiceUnavailable, err.message
41
41
  end
42
42
 
data/lib/ritm/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # Ritm version
2
2
  module Ritm
3
- VERSION = '1.0.0'.freeze
3
+ VERSION = '1.0.1'.freeze
4
4
  end
metadata CHANGED
@@ -1,169 +1,169 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ritm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastián Tello
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-30 00:00:00.000000000 Z
11
+ date: 2017-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: faraday
14
+ name: certificate_authority
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.9'
19
+ version: 0.1.6
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
- version: '0.9'
26
+ version: 0.1.6
27
27
  - !ruby/object:Gem::Dependency
28
- name: webrick
28
+ name: dot_hash
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '1.3'
33
+ version: '0.5'
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
- version: '1.3'
40
+ version: '0.5'
41
41
  - !ruby/object:Gem::Dependency
42
- name: certificate_authority
42
+ name: faraday
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.6
47
+ version: '0.13'
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
- version: 0.1.6
54
+ version: '0.13'
55
55
  - !ruby/object:Gem::Dependency
56
- name: dot_hash
56
+ name: webrick
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0.5'
61
+ version: '1.3'
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
- version: '0.5'
68
+ version: '1.3'
69
69
  - !ruby/object:Gem::Dependency
70
- name: rspec
70
+ name: httpclient
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '3.4'
75
+ version: '2.8'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '3.4'
82
+ version: '2.8'
83
83
  - !ruby/object:Gem::Dependency
84
- name: rubocop
84
+ name: rake
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '0.40'
89
+ version: '12.2'
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
- version: '0.40'
96
+ version: '12.2'
97
97
  - !ruby/object:Gem::Dependency
98
- name: simplecov
98
+ name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '0.11'
103
+ version: '3.7'
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
- version: '0.11'
110
+ version: '3.7'
111
111
  - !ruby/object:Gem::Dependency
112
- name: sinatra
112
+ name: rubocop
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '1.4'
117
+ version: '0.51'
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
- version: '1.4'
124
+ version: '0.51'
125
125
  - !ruby/object:Gem::Dependency
126
- name: thin
126
+ name: simplecov
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '1.6'
131
+ version: '0.15'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '1.6'
138
+ version: '0.15'
139
139
  - !ruby/object:Gem::Dependency
140
- name: rake
140
+ name: sinatra
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '11.1'
145
+ version: '1.4'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '11.1'
152
+ version: '1.4'
153
153
  - !ruby/object:Gem::Dependency
154
- name: httpclient
154
+ name: thin
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: '2.8'
159
+ version: '1.7'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: '2.8'
166
+ version: '1.7'
167
167
  description: HTTP(S) Intercept Proxy
168
168
  email: argos83+ritm@gmail.com
169
169
  executables: []