smart_proxy_dynflow 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb495fc4f587cc0d94521bec26020bad3948109
-  data.tar.gz: 87a7ba0afc1876f92f336edbf5b38e523de11101
+  metadata.gz: 23e6132a792409de0a63851c335a1cbbbbe6c539
+  data.tar.gz: d9eeb7b70c68915fc84b36008e043942cbbcddd9
 SHA512:
-  metadata.gz: 1764f5ec0797cbafa4182dd848f7faffb3aae8cdc6053cf08e127cbd0ff9a654acd6994b985caea64267cceea3cde1256bddfb3d232f359b933c0f546c34ced9
-  data.tar.gz: 65494db608d5c67aed31219afb9c289ca900ed26911b034e1bf55dcb1472f17dab1d7537539f54f28407484d94e7ed27052e0a2a5f007dbc92392662b5641ee2
+  metadata.gz: 38be1713aabfeea11b229752bd65fe925b30bf05f1bf15a9105bc70066f3181bdedef45a966c377874efae42e8fa01abb2aefcc1c6caa93b1ba00ca6365bccca
+  data.tar.gz: 740e626094df5c0f64580bb94159a03dc1b075409f5b602be0dd8ed1490c6a3efe9e79b439c497056bfc4a6ba3998137a7d7edaf8d54a830126e20fd917f01ae

data/Gemfile

@@ -7,16 +7,16 @@ group :development do
 end
 
 group :test do
-  gem 'smart_proxy_dynflow', :path => '.'
   gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
+  gem 'smart_proxy_dynflow', :path => '.'
 
   if RUBY_VERSION < '2.1'
     gem 'public_suffix', '< 3'
-    gem 'rubocop', '< 0.51.0'
     gem 'rainbow', '< 3'
+    gem 'rubocop', '< 0.51.0'
   else
-    gem 'rubocop', '~> 0.52.1'
     gem 'public_suffix'
+    gem 'rubocop', '~> 0.52.1'
   end
 
   if RUBY_VERSION < '2.2'
@@ -27,11 +27,11 @@ group :test do
 end
 
 if RUBY_VERSION < '2.2'
-  gem 'sinatra', '< 2'
   gem 'rack', '>= 1.1', '< 2.0.0'
+  gem 'sinatra', '< 2'
 else
-  gem 'sinatra'
   gem 'rack', '>= 1.1'
+  gem 'sinatra'
 end
 
 # load bundler.d

data/lib/smart_proxy_dynflow/api.rb

@@ -20,7 +20,6 @@ module Proxy
         end
       end
 
-
       # TODO: move this to foreman-proxy to reduce code duplicities
       def do_authorize_with_trusted_hosts
         # When :trusted_hosts is given, we check the client against the list
@@ -28,7 +27,7 @@ module Proxy
         # HTTP: test the reverse DNS entry of the remote IP
         trusted_hosts = Proxy::SETTINGS.trusted_hosts
         if trusted_hosts
-          if [ 'yes', 'on', 1 ].include? request.env['HTTPS'].to_s
+          if ['yes', 'on', 1].include? request.env['HTTPS'].to_s
             fqdn = https_cert_cn
             source = 'SSL_CLIENT_CERT'
           else
@@ -39,13 +38,14 @@ module Proxy
           logger.debug "verifying remote client #{fqdn} (based on #{source}) against trusted_hosts #{trusted_hosts}"
 
           unless Proxy::SETTINGS.trusted_hosts.include?(fqdn)
-            log_halt 403, "Untrusted client #{fqdn} attempted to access #{request.path_info}. Check :trusted_hosts: in settings.yml"
+            log_halt 403, "Untrusted client #{fqdn} attempted " \
+                          "to access #{request.path_info}. Check :trusted_hosts: in settings.yml"
           end
         end
       end
 
       def do_authorize_with_ssl_client
-        if ['yes', 'on', '1'].include? request.env['HTTPS'].to_s
+        if %w[yes on 1].include? request.env['HTTPS'].to_s
           if request.env['SSL_CLIENT_CERT'].to_s.empty?
             log_halt 403, "No client SSL certificate supplied"
           end

data/lib/smart_proxy_dynflow/callback.rb

@@ -10,12 +10,13 @@ module Proxy
 
         def relay(request, from, to)
           path = request.path.gsub(from, to)
-          Proxy::LogBuffer::Decorator.instance.debug "Proxy request from #{request.host_with_port}#{request.path} to #{uri.to_s}#{path}"
+          message = "Proxy request from #{request.host_with_port}#{request.path} to #{uri}#{path}"
+          Proxy::LogBuffer::Decorator.instance.debug message
           req = case request.env['REQUEST_METHOD']
-                  when 'GET'
-                    request_factory.create_get path, request.env['rack.request.query_hash']
-                  when 'POST'
-                    request_factory.create_post path, request.body.read
+                when 'GET'
+                  request_factory.create_get path, request.env['rack.request.query_hash']
+                when 'POST'
+                  request_factory.create_post path, request.body.read
                 end
           req['X-Forwarded-For'] = request.env['HTTP_HOST']
           req['AUTHORIZATION'] = request.env['HTTP_AUTHORIZATION']

data/lib/smart_proxy_dynflow/helpers.rb

@@ -1,7 +1,7 @@
 module Proxy
   class Dynflow
     module Helpers
-      def relay_request(from = /^\/dynflow/, to = '')
+      def relay_request(from = %r{^/dynflow}, to = '')
         response = Proxy::Dynflow::Callback::Core.relay(request, from, to)
         content_type response.content_type
         status response.code

data/lib/smart_proxy_dynflow/http_config.ru

@@ -1,7 +1,7 @@
 require 'smart_proxy_dynflow/api'
 
 map "/dynflow" do
-  map '/'do
+  map '/' do
     run Proxy::Dynflow::Api
   end
 end

data/lib/smart_proxy_dynflow/plugin.rb

@@ -18,13 +18,15 @@ class Proxy::Dynflow
     default_settings :core_url => 'http://localhost:8008'
     plugin :dynflow, Proxy::Dynflow::VERSION
 
+    # rubocop:disable Lint/HandleExceptions
     after_activation do
       begin
         require 'smart_proxy_dynflow_core'
-      rescue LoadError => e
+      rescue LoadError
         # Dynflow core is not available in the proxy, will be handled
         # by standalone Dynflow core
       end
     end
+    # rubocop:enable Lint/HandleExceptions
   end
 end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,75 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: "    Use the Dynflow inside Foreman smart proxy\n"
 email:
 - inecas@redhat.com