proxes 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7b7c52c422b4f1db10219b5d5aa74ad90d01f69
-  data.tar.gz: 82b0e0202f5ebee69d7389471a8fe9194e11d201
+SHA256:
+  metadata.gz: fb51bef1ecbc4b21795b35ab7e832650c7c59be31a53be6d785f3139787b4599
+  data.tar.gz: c0ad7a29e63e7527461857e5319c08e6f3f8f0f0bcdcba04c9b3a973778e7484
 SHA512:
-  metadata.gz: 6956c1f9b7ac1eb8b522f6c84fdbe20eeeb2753ede326505113cca2d21002a1d3601a535ff6276c86bf406cf7900f8a8b4c50e69efeca519552ad73c60a0b866
-  data.tar.gz: 9c2b65a7e400cd672684e4b1f53bbfc8237e0430632384ed5accfb42cce94d0631f4ec7883557d2d56f7f163cf2444b7ac47795a83807f6a4bcffcede9e1849c
+  metadata.gz: f7fdfb074cef3a2eb221b56b272cb1e480eb3578fa52c81d662c151bf7f6aea88b173c5ef620ad4ae4fd66c09629bc2a33dac6e68175d92fda157a638ebda28b
+  data.tar.gz: 99b16d1c4c585dc7260561bea22ee41fcd60cbf62556cdb5f9f23233b3c1bd5d57066cde3e234fa1cc4c37ebc1e9390474c51e36f3bdd18aa5350d137a39be95

data/.travis.yml

@@ -1,29 +1,44 @@
 sudo: false
 language: ruby
 rvm:
-- 2.5.0
-- 2.4.3
-- 2.3.6
-- 2.2.9
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
 gemfile: Gemfile.ci
 env:
-- DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
+  global:
+    - CC_TEST_REPORTER_ID=1f562305f75e169f5f5eca3b738fee879550c98e50099c2b9cd6ae71478007a0
+    - secure: wTIBP3ZtltfLyIFS6p4XgzPff70EZLxIOpzL4tWCsB2XmEMtCBPdfm9CXLw88yxH4mCJbCVljJHRzrav9N5RimVGb3h5AX5ODpqJYO4PWRZzNYGglXM3f/3QWFXExEdJ97y0m2XytOzlVWtYjShqpCq1V9z88XwmJ2YQtiFMma4n2fjW8+WK30eGwNw60GAf7a2IAA2qMSIymEdM0OcRRVjmyWRtdAslnjANQ/m9lRYeNTfwfG5Xw26BRzv46Urmlw9MZsFGV5bG5bAKRFbp3h00UsPjKlAUL22bqEQ5XmRCuXCMzffoPhfJHDao+3iaVZlViwbCmoHRuuwHnTmUBFvvef/MRSUdLLwBsKBeDVofpGhLEInPX+D/kicNEnidYTtz+O8XZ0Hgur+VN+ayItIVZqFyaw96c9n+2H/KR7TG2lsccdFHNgATTX/fVOCc2AuBI84z3qM1LFYpJibwoTktQS1dnlmX6hwwEg+lJFhY0Spr3+aKOHf/zgqK+Q0jrEDQMo0khDTuPaOy2kznzK6ktrZVizw1tZyH80Eop/Yxpx1bIab8CF49pWlMZAkwmTP3e24qewUtgExyxUK1yBZ23L7QDnYLtfwCFfUbiEScjghJ9Aez1yerMCxNUrSOltyk1XxZw9xMrptA8VgN/0sFFmfICTXTZSqJdIGkfGY=
+    - secure: z4AUz0bssd0C7rfPsh71aH6ki8Zp49WZrYNRhj50MytJympFsEOYRVdVKuuAoq7jaD0cahIioDHrTf1J9bIOqMPc3l2lk9RFWA27Qk46C5zNxspnNBin0disEeO/AENlb5Zwe/Cqamg7Sc/NVpELPqUl8gHfX3FVv4Po3dZZWQb1d/pLXBpl84HGLWgFwz6ku+74XW6aqX1Qzd8G0s9gsqsAgUszwEX3ppltBrai1VdtZyFbv0XCOds3F687Ecyht3FJBQCOaTopPQztdmA8rBTPW+ffhfoZuQWfo8aILqmn9xCGr4vhMjwaOP7cVQdXcPs1ecsFBKFS0XRm5kJKBtBPLDfEc4zl6UIIe5xZBh5m0dysxu78ZoNFVui3QszyUP+dARf3AHsy1m3d8iRXMNEqKTTglKdPIdFKZLnWGoVSf+fidR7NIyJH7MGhr4VC8esGFGazzOXBnqVAX+z1tEse6n7llFcy0dREW0FNMpKMSP6TqN4LRiKXtRdSbeSvHXP3UiH6vPjAE/lHhf7qXSNOLkZDtCWrD0us4kT1ACeL2AV2SArJf7pmGdEL9pUyp4jSuStwxtRPhYJj2kuS6op9MYoU6Q8eyXhIw8Uju4SitGtkTnb8t5L50Xw7vUQT9faEah9ewJwB2kxa2RZxCdIzylwuYssCON4xkdXI1fY=
+    - secure: lUfjVwbIxUBQTGkDTOSMNvSYONBwI5yObn8fCByzGkfleddWPjLEeMPjGBZboOu2CVZ/q/FG3xbn63Hmss7CU83FmWRoV5dMP9Yc7X7cHaGmi31mZcaY2Yah+jgx7PcNIdK8LOAB3/zhxDNOcr8U4O9gqxGZWnV2NLR8SB+KiNTg5Hou3nOeVw7l1Iz+h1hXvZfxkMv7aX/3TLMT8j2JMkfgCN8moMlNRAYnvm/B68FPcVs6UFcaZIwg2mBnq3FrARo127jG1Ozms2SOPTqkPY9y8yoGyo3TYH2iQOKdRxCCECBnkSO8HYRYTL9CUoMk/D4ZTp7TGNRIKxjHtlt+9O1WtfmZB2aevZX5c7ChCZ0wNhQpzlsyPDz0GoIOkms5Bfv7nsvbloejr+vsRxe8YsNaVAVG+9RVZziKxGCWsxTopfnFMfFBK7KIoJ4N60ijhtBr3qcYQbSeoZWviwSd/GCjl9I2d2mTPVI0DsiFVt8lP92ZZitPJEhPRcxHdHu47Wu7oftndcVqzhhgdGnOxMchYKgzccR17VWlactGxffJP+ZIUkHaWCkxVR4etcrE753uaUX9x+M1fMoKKrwvycstX/YWLncgsYM1YensRUN7oW87wk216anlKfHubO2aVeDNnXn+wszK87M12o9gFu1khTBowqZpXsVDaUaa+oc=
+  matrix:
+  - DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
 services:
-- elasticsearch
+  - elasticsearch
+before_install:
+  - gem install bundler -v 1.12.5
 before_script:
-- sleep 10
-- bundle exec rake ditty:prep
-before_install: gem install bundler -v 1.12.5
-addons:
-  code_climate:
-    repo_token: 1f562305f75e169f5f5eca3b738fee879550c98e50099c2b9cd6ae71478007a0
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+    > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - "./cc-test-reporter before-build"
+  - sleep 10
+  - bundle exec rake ditty:prep
+after_script:
+  - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 deploy:
-  provider: rubygems
-  api_key:
-    secure: WDO/FSVmUxyz8U6LJyoEEA/Gorw90VbQ8Q4rAu9+L6Lru/PftaVUlcW3ZMATjASHcVX/1KjVJlZNilgMYrV0eayudkeNjWglBozw5FxnhJntgzZAH2Fo/aepF9NHSU29A4SGtl1W0kj8zez9prYn+qcdX/8ei9YMfnP8KkQCKEUeO3/jScHqSZlYZIFI7Ft+QQbJeUTlKc1sJRC5XHG9Oz4lFfSZY0XgZMd5IJsBmwNCGisqgKxBuDEG/9KWwhqops6K6XGPvuhxd8+DFFrDSrI3HR1NsP9RrQxwFc9TnIc+Rzu/FjSF44NJgaiFKKPdZ116w5ChnpY0B59tzOyh/aCwvAl2w7usIqNkhXey0eJ/MZm4S+7l1AoVlxYVujBBl/tRt8PeqlRqjJWAnr1mu/p74cS/jyXhZbHJpNvmv5M7YJzzFIYI12el4Wm05fPo2L605g0c7+pFCW3F+HPAp5qItrjlNx3HoMNNoGDQO+057g3OeVjOivV5Vxjp9IYwZmNCD35IaLFXk+umYD4Jw047rUSGoboc0i/5k6ZYHSBrvIivvRCZNAXSbGi1nLR/lv42Chu2wRCWzMjyPgQQ4I0xGlVwu8kfIQsvPVAM3szNczl9xY8S311eBJforo5prPr6wLaEile0KLmMOai+1n0sr+exy056Z7ttBjwIwoQ=
-  gem: proxes
-  on:
-    tags: true
-    repo: EagerELK/proxes
+  - provider: rubygems
+    api_key:
+      secure: WDO/FSVmUxyz8U6LJyoEEA/Gorw90VbQ8Q4rAu9+L6Lru/PftaVUlcW3ZMATjASHcVX/1KjVJlZNilgMYrV0eayudkeNjWglBozw5FxnhJntgzZAH2Fo/aepF9NHSU29A4SGtl1W0kj8zez9prYn+qcdX/8ei9YMfnP8KkQCKEUeO3/jScHqSZlYZIFI7Ft+QQbJeUTlKc1sJRC5XHG9Oz4lFfSZY0XgZMd5IJsBmwNCGisqgKxBuDEG/9KWwhqops6K6XGPvuhxd8+DFFrDSrI3HR1NsP9RrQxwFc9TnIc+Rzu/FjSF44NJgaiFKKPdZ116w5ChnpY0B59tzOyh/aCwvAl2w7usIqNkhXey0eJ/MZm4S+7l1AoVlxYVujBBl/tRt8PeqlRqjJWAnr1mu/p74cS/jyXhZbHJpNvmv5M7YJzzFIYI12el4Wm05fPo2L605g0c7+pFCW3F+HPAp5qItrjlNx3HoMNNoGDQO+057g3OeVjOivV5Vxjp9IYwZmNCD35IaLFXk+umYD4Jw047rUSGoboc0i/5k6ZYHSBrvIivvRCZNAXSbGi1nLR/lv42Chu2wRCWzMjyPgQQ4I0xGlVwu8kfIQsvPVAM3szNczl9xY8S311eBJforo5prPr6wLaEile0KLmMOai+1n0sr+exy056Z7ttBjwIwoQ=
+    gem: proxes
+    on:
+      tags: true
+      repo: EagerELK/proxes
+  - provider: script
+    script: deploy_docker.sh
+    on:
+      tags: true
+
 after_success:
 - bundle exec codeclimate-test-reporter

data/config.ru

@@ -51,11 +51,6 @@ map '/_proxes' do
   run Rack::URLMap.new Ditty::Components.routes
 end
 
-require 'sidekiq/web'
-map '/_sidekiq' do
-  run Sidekiq::Web
-end
-
 map '/' do
   # Proxy all Elasticsearch requests
   require 'proxes/security'
@@ -66,5 +61,5 @@ map '/' do
   use Rack::ContentLength
 
   # Forward requests to ES
-  run ProxES::Forwarder.new(backend: ENV['ELASTICSEARCH_URL'])
+  run ProxES::Forwarder.instance
 end

data/deploy_docker.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD
+docker build -t proxes-os:$TRAVIS_TAG .
+docker push $DOCKER_HUB_USERNAME/proxes-os:$TRAVIS_TAG

data/lib/proxes/forwarder.rb

@@ -1,54 +1,53 @@
-require 'net/http'
+require 'proxes/services/es'
+require 'net/http/persistent'
+require 'singleton'
 require 'rack'
 
 module ProxES
   # A lot of code in this comes from Rack::Proxy
   class Forwarder
-    attr_reader :backend, :streaming
+    include Singleton
+    include ProxES::Services::ES
 
-    def initialize(opts = {})
-      @backend = URI(opts[:backend]) if opts[:backend]
+    attr_reader :streaming
+
+    def backend
+      @backend ||= URI(ENV['ELASTICSEARCH_URL'])
+    end
+
+    def backend=(var)
+      @backend = URI(var)
     end
 
     def call(env)
-      http = Net::HTTP.new(backend.host, backend.port)
-      http.use_ssl = true if backend.is_a? URI::HTTPS
-      if ENV['SSL_VERIFY_NONE'].to_i == 1
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        store = OpenSSL::X509::Store.new
-        store.set_default_paths
-        http.cert_store = store
-      end
+      forward(env)
+    rescue SocketError
+      headers = { 'Content-Type' => 'application/json' }
+      [500, headers, ['{"error":"Could not connect to Elasticsearch"}']]
+    end
 
-      request = request_from(env)
-      request.basic_auth backend.user, backend.password
-      response = http.request(request)
+    def forward(env)
+      source = Rack::Request.new(env)
+      conn.basic_auth backend.user, backend.password
+      response = conn.send(source.request_method.downcase) do |req|
+        source_body = body_from(source)
+        req.body = source_body if source_body
+        req.url source.fullpath == '' ? URI.parse(env['REQUEST_URI']).request_uri : source.fullpath
+      end
+      mangle response
+    end
 
+    def mangle(response)
       headers = (response.respond_to?(:headers) && response.headers) || self.class.normalize_headers(response.to_hash)
       body    = response.body || ['']
       body    = [body] unless body.respond_to?(:each)
 
       # Not sure where this is coming from, but it causes timeouts on the client
       headers.delete('transfer-encoding')
-
       # Ensure that the content length rack middleware kicks in
       headers.delete('content-length')
 
-      [response.code, headers, body]
-    end
-
-    def request_from(env)
-      source = Rack::Request.new(env)
-      fullpath = source.fullpath == '' ? URI.parse(env['REQUEST_URI']).request_uri : source.fullpath
-      target = Net::HTTP.const_get(source.request_method.capitalize).new(fullpath)
-
-      body = body_from(source)
-      if body
-        target.body = body
-        target.content_length = body.length
-        target.content_type   = source.content_type if source.content_type
-      end
-      target
+      [response.status, headers, body]
     end
 
     def body_from(request)

data/lib/proxes/services/es.rb

@@ -9,13 +9,27 @@ module ProxES
       def client
         @client ||= Elasticsearch::Client.new(
           url: ENV['ELASTICSEARCH_URL'],
+          adapter: :net_http_persistent,
           transport_options: {
-            ssl: { verify: ENV['SSL_VERIFY_NONE'].to_i != 1 }
+            ssl: {
+              verify: ENV['SSL_VERIFY_NONE'].to_i != 1,
+              cert_store: ssl_store
+            }
           },
           logger: Ditty::Services::Logger.instance
         )
       end
 
+      def ssl_store
+        store = OpenSSL::X509::Store.new
+        store.set_default_paths
+        store
+      end
+
+      def conn
+        client.transport.connections.first.connection
+      end
+
       def cluster_health(level = 'cluster')
         client.cluster.health level: level
       end

data/lib/proxes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProxES
-  VERSION = '0.8.6'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/proxes.gemspec

@@ -25,17 +25,19 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'racksh'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'webmock'
 
-  spec.add_dependency 'ditty', '>= 0.2'
   spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'bcrypt', '~> 3.1'
+  spec.add_dependency 'ditty', '>= 0.2'
   spec.add_dependency 'elasticsearch', '>= 2'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'haml', '~> 5.0'
   spec.add_dependency 'highline', '~> 1.7'
   spec.add_dependency 'logger', '~> 1.0'
+  spec.add_dependency 'net-http-persistent'
   spec.add_dependency 'omniauth', '~> 1.0'
   spec.add_dependency 'omniauth-http-basic', '~> 1.0'
   spec.add_dependency 'omniauth-identity', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,47 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ditty
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: ditty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -419,6 +447,7 @@ files:
 - config.ru
 - config/logger.yml
 - config/puma.rb
+- deploy_docker.sh
 - gulpfile.js
 - lib/ditty/components/proxes.rb
 - lib/proxes.rb
@@ -495,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Rack wrapper around Elasticsearch to provide security and management features