ritm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96ffb4d3b3d3b382171277d5095c9ba57396b6ee
-  data.tar.gz: ca0cafa22dcd94188702deb3d1ee3c4e3e71ed6a
+  metadata.gz: e581e2bbcbe36f92ac28b4d5031f3db1e91adcc3
+  data.tar.gz: 0252a1ebae911a7143d830252dd0d3e3cba06ab9
 SHA512:
-  metadata.gz: f05d3344d6157f1a2a374818b006019400a30d524d6df3db249abc5c9caaa4a4e494a9637bf784133f1cc92af7d34b47899a67d6ebfb1af1a2dc008747224a1f
-  data.tar.gz: c0a8e290882acde4b170fd788122186b3499e755395411ae3f35d0d80e5c6ba75546c6bc3c4181f25d24018590b3366850a3bf9fcec598d6a4c0e51edb41df50
+  metadata.gz: c311b91818407322ce5abd19a2f3f7c4544f9e1476a314f2e048235a6dadc0e120f26c54d18ca5a4d5cc263166a3656a53116a704f2c17adf3923cc9587428ed
+  data.tar.gz: f24a9133457892a8e8fdb24631f3bcbfd4680134d6dc7b98e379de626509f801099f6fb34defa2fb62171da472093d84152c180a309345bbc1835111a04c013d

data/lib/ritm/certs/ca.rb

@@ -28,14 +28,14 @@ module Ritm
     def self.signing_profile
       {
         'extensions' => {
-          'keyUsage' => { 'usage' => %w(keyEncipherment digitalSignature) },
-          'extendedKeyUsage' => { 'usage' => %w(serverAuth clientAuth) }
+          'keyUsage' => { 'usage' => %w[keyEncipherment digitalSignature] },
+          'extendedKeyUsage' => { 'usage' => %w[serverAuth clientAuth] }
         }
       }
     end
 
     def self.ca_signing_profile
-      { 'extensions' => { 'keyUsage' => { 'usage' => %w(critical keyCertSign keyEncipherment digitalSignature) } } }
+      { 'extensions' => { 'keyUsage' => { 'usage' => %w[critical keyCertSign keyEncipherment digitalSignature] } } }
     end
   end
 end

data/lib/ritm/helpers/encodings.rb

@@ -3,7 +3,7 @@ require 'zlib'
 module Ritm
   # ENCODER/DECODER of HTTP content
   module Encodings
-    ENCODINGS = [:identity, :gzip, :deflate].freeze
+    ENCODINGS = %i[identity gzip deflate].freeze
 
     def self.encode(encoding, data)
       case encoding

data/lib/ritm/interception/http_forwarder.rb

@@ -23,7 +23,7 @@ module Ritm
       # TODO: make SSL verification a configuration setting
       @client = Faraday.new(ssl: { verify: false }) do |conn|
         conn.adapter :net_http
-        conn.proxy @config.misc.upstream_proxy unless @config.misc.upstream_proxy.nil?
+        conn.proxy = @config.misc.upstream_proxy unless @config.misc.upstream_proxy.nil?
       end
     end
 

data/lib/ritm/proxy/cert_signing_https_server.rb

@@ -1,7 +1,10 @@
+require 'openssl'
 require 'webrick'
 require 'webrick/https'
 require 'ritm/certs/certificate'
 
+IS_RUBY_2_4_OR_OLDER = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
+
 module Ritm
   module Proxy
     # Patches WEBrick::HTTPServer SSL context creation to get
@@ -40,11 +43,24 @@ module Ritm
       end
 
       def context_with_cert(original_ctx, cert)
-        ctx = original_ctx.dup
+        ctx = duplicate_context(original_ctx)
         ctx.key = cert.private_key
         ctx.cert = cert.x509
         ctx
       end
+
+      def duplicate_context(original_ctx)
+        return original_ctx.dup unless IS_RUBY_2_4_OR_OLDER
+
+        ctx = OpenSSL::SSL::SSLContext.new
+
+        original_ctx.instance_variables.each do |variable_name|
+          prop_name = variable_name.to_s.sub(/^@/, '')
+          set_prop_method = "#{prop_name}="
+          ctx.send(set_prop_method, original_ctx.send(prop_name)) if ctx.respond_to? set_prop_method
+        end
+        ctx
+      end
     end
   end
 end

data/lib/ritm/proxy/proxy_server.rb

@@ -36,7 +36,7 @@ module Ritm
           send("do_#{req.request_method}", req, res)
         rescue NoMethodError
           raise WEBrick::HTTPStatus::MethodNotAllowed, "unsupported method `#{req.request_method}'."
-        rescue => err
+        rescue StandardError => err
           raise WEBrick::HTTPStatus::ServiceUnavailable, err.message
         end
 

data/lib/ritm/version.rb

@@ -1,4 +1,4 @@
 # Ritm version
 module Ritm
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,169 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: ritm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sebastián Tello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: certificate_authority
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: dot_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: certificate_authority
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: dot_hash
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '12.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.7'
 description: HTTP(S) Intercept Proxy
 email: argos83+ritm@gmail.com
 executables: []