wovn-reverse_proxy 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d99f8d53470e7b5ad071bddb7e0ac891ffe0fe0
-  data.tar.gz: a0977a817a0a4fef91b1275b38ea3a48df6c4984
+  metadata.gz: fc87c6ae79f9a411089e3a048db2d601c31dfe7d
+  data.tar.gz: 0a25d465588fd8ac086c4a49293b7865df282f0f
 SHA512:
-  metadata.gz: 554d1acada20cbed5883364d7dd26b9f5d6174ffcb596dc948ae6553ae96d4793b7ca65673f43b1226d1559e57df5c0457377fc50cf57d2d4ec7794eeb6e4793
-  data.tar.gz: 8913412a1167ec711cc51b43bba83203ba86982d335ae3691f6280b3b4171e7e1fb5e20fe462248800abab7b841698fd6d5754b4475b4e7cd3015d4a31ec9846
+  metadata.gz: 8f29943e3a1799a383a87ff9d48a7a4ce404d4abb7acfaf41fe3af7fa60ce0e445207b490abdc49c4220fd4cfbe2b9f810f0da50eac5f2b70a3a2c7260b6b26e
+  data.tar.gz: bc4ec5dd95bc1ff85d366c5fc18353fab562b7de3a8e2e1d8f0ddde6892cc6dbf905c620e9bfad25efff4d33d50f09109b1e1ea78101b0185f7d67885f12b658

data/.gitignore

@@ -10,3 +10,4 @@
 /wovn_error.log
 *.swp
 *.gem
+/.ruby-version

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in wovn-reverse_proxy.gemspec
 gemspec
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create('2.2.2')
+  gem 'rack', '>= 1.6.4', '< 2.0.0'
+end

data/README.md

@@ -19,6 +19,7 @@ ProxyPreserveHost on
 RequestHeader set X_WOVN_HOST       http://localhost:3000
 RequestHeader set X_WOVN_USER_TOKEN IRb6-
 RequestHeader set X_WOVN_SECRET_KEY secret
+RequestHeader set X_WOVN_USE_PROXY  true
 ```
 
 ### nginx
@@ -30,6 +31,7 @@ proxy_set_header X-Forwarded-Host $host;
 proxy_set_header X-Wovn-Host       http://localhost:3000;
 proxy_set_header X-Wovn-User-Token IRb6-;
 proxy_set_header X-Wovn-Secret-Key secret;
+proxy_set_header X-Wovn-Use-Proxy  true;
 ```
 
 ## Contributing

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "wovn/reverse_proxy"
+require 'bundler/setup'
+require 'wovn/reverse_proxy'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "wovn/reverse_proxy"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/circle.yml

@@ -1,3 +1,10 @@
 machine:
   ruby:
     version: 2.3.1
+
+test:
+  pre:
+    - gem install rubocop
+  override:
+    - bundle exec rake
+    - rubocop

data/exe/wovnrp

@@ -3,6 +3,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+require 'rack'
 require 'wovn/reverse_proxy'
 
-Wovn::ReverseProxy::Application.run!
+Rack::Server.start(
+  app: Wovn::ReverseProxy::Wovnrb.new(
+    Wovn::ReverseProxy::RackReverseProxy.new
+  ),
+  Port: 4567
+)

data/lib/wovn/reverse_proxy.rb

@@ -1,2 +1,3 @@
-require 'wovn/reverse_proxy/application'
+require 'wovn/reverse_proxy/rack_reverse_proxy'
+require 'wovn/reverse_proxy/wovnrb'
 require 'wovn/reverse_proxy/version'

data/lib/wovn/reverse_proxy/rack_reverse_proxy.rb

@@ -0,0 +1,29 @@
+require 'rack/reverse_proxy'
+
+module Wovn
+  module ReverseProxy
+    # Rack::ReverseProxy for wovn-reverse_proxy.
+    class RackReverseProxy < Rack::ReverseProxy
+      def call(env)
+        host = env['HTTP_X_WOVN_HOST'] || env['HTTP_HOST']
+        host = host.to_s
+        return invalid_host if host.empty?
+
+        env['SERVER_NAME'] = env['HTTP_HOST'] = env['HTTP_X_FORWARDED_HOST']
+
+        @rules = []
+        reverse_proxy '/', host
+        reverse_proxy_options preserve_host: false
+
+        status, headers, body = super
+        [status, headers, [body.to_s]]
+      end
+
+      private
+
+      def invalid_host
+        [400, { 'Content-Type' => 'text/plain' }, ['Invalid host parameter.']]
+      end
+    end
+  end
+end

data/lib/wovn/reverse_proxy/version.rb

@@ -1,5 +1,5 @@
 module Wovn
   module ReverseProxy
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/lib/wovn/reverse_proxy/wovnrb.rb

@@ -19,23 +19,29 @@ module Wovn
       private
 
       def get_wovn_settings(env)
-        settings = @setting_keys.each_with_object({}) do |key, params|
+        @setting_keys.each_with_object({}) do |key, params|
           env_key = "HTTP_X_WOVN_#{key.upcase}"
           value = env[env_key]
           next unless value
           params[key] = get_appropriate_value(key, value)
         end
-        settings.merge('use_proxy' => true)
       end
 
       def get_appropriate_value(key, value)
         if key == 'query' || key == 'supported_langs'
           value = value.split(/,/)
         elsif key == 'test_mode' || key == 'use_proxy'
-          value = false if value.casecmp 'false'
+          value = true? value
         end
         value
       end
+
+      def true?(value)
+        return true if value.to_s.casecmp('true').zero?
+        return true if value.to_s.casecmp('on').zero?
+        return true if value.to_s == '1'
+        false
+      end
     end
   end
 end

data/wovn-reverse_proxy.gemspec

@@ -14,19 +14,21 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/masiuchi/wovn-reverse_proxy'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^test/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^test/})
+  end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'sinatra', '~> 1.4'
+  spec.add_dependency 'rack', '>= 1.6.4'
+  spec.add_dependency 'rack-reverse-proxy', '~> 0.11'
   spec.add_dependency 'wovnrb', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'minitest', '~> 5.9'
   spec.add_development_dependency 'rack-test', '~> 0.6'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'webmock', '~> 2.1'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wovn-reverse_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Masahiro Iuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: rack-reverse-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: wovnrb
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 description: Translation proxy by wovnrb and WOVN.io.
 email:
 - masahiro.iuchi@gmail.com
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -126,7 +127,7 @@ files:
 - circle.yml
 - exe/wovnrp
 - lib/wovn/reverse_proxy.rb
-- lib/wovn/reverse_proxy/application.rb
+- lib/wovn/reverse_proxy/rack_reverse_proxy.rb
 - lib/wovn/reverse_proxy/version.rb
 - lib/wovn/reverse_proxy/wovnrb.rb
 - wovn-reverse_proxy.gemspec

data/lib/wovn/reverse_proxy/application.rb

@@ -1,41 +0,0 @@
-require 'net/http'
-require 'sinatra/base'
-require 'uri'
-require 'wovn/reverse_proxy/wovnrb'
-
-module Wovn
-  module ReverseProxy
-    # Reverse proxy implemented by Sinatra.
-    class Application < Sinatra::Base
-      use Wovn::ReverseProxy::Wovnrb
-
-      get '*' do
-        # Get url parameter.
-        host = env['HTTP_X_WOVN_HOST']
-
-        # Check url parameter.
-        if host.nil? || host.empty?
-          status 400
-          return 'Invalid host parameter.'
-        end
-
-        # Generate URL of original content.
-        request_uri = env['REQUEST_URI']
-        request_uri.sub!(%r{^https?://[^/]+/}, '/')
-        uri = URI.parse(host + request_uri)
-
-        # Retrieve original content.
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true if uri.scheme == 'https'
-        res = http.start { http.get(uri.request_uri) }
-
-        # Pass original content to wovnrb.
-        status       res.code
-        content_type res.content_type
-        res.body
-      end
-
-      run! if app_file == $PROGRAM_NAME
-    end
-  end
-end