smart_proxy_dynflow 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9cd93e1cf950c5f7977d700a2d8b307faa98182af93063c55ced580617d054
-  data.tar.gz: 2de7767e855c5914d6db7678ef2c2302c414a20b04cb6dd4df7294263ee00f95
+  metadata.gz: 6444ef5fcad649ae35d106b149f2832ea50c4cbbf9d6a1be7575332e9585fe8b
+  data.tar.gz: 587ed9c21c9c0dd3e320e29c28eb3cf76904aa3222c901979fc8e29023630f16
 SHA512:
-  metadata.gz: b03995ac1c1bf44c900926371d3b42c56f05dc8b994fb07f3c87613e788a990e9ec597d67bb24a97279ae4bc0557fca01dabfbaace26299553467f8173ff8f73
-  data.tar.gz: 0d4737d0298d940988c51ba62e04c45740530660ae76c492e706459965446e984f2ddeb319651a416864636dca407d4f281029bb75da9ad747da7f6b6d71ee42
+  metadata.gz: 4b27f6de4ae4353b6fdb45334b920b66bea2de0dce26af6c4f52855e9e28641acd9ec917e8d313b8aafb9c70f7077fa9223417d943e9ac2a30d6c05995d66e0a
+  data.tar.gz: e0877874c73541ab78d2957693202959bbffce5771ff71c9f1bee0664c5f78bf180addece3668206662e70cf08481d3586ff88f82eef3fc293d9a837ccfca75d

data/lib/smart_proxy_dynflow/api.rb

@@ -36,7 +36,8 @@ module Proxy
 
       post "/tasks/launch/?" do
         params = MultiJson.load(request.body.read)
-        launcher = launcher_class(params).new(world, callback_host(params, request), params.fetch('options', {}))
+        first_params = params['input']&.values&.first || {}
+        launcher = launcher_class(params).new(world, callback_host(first_params, request), params.fetch('options', {}))
         launcher.launch!(params['input'])
         launcher.results.to_json
       end
@@ -72,8 +73,13 @@ module Proxy
       private
 
       def callback_host(params, request)
-        params.fetch('action_input', {})['proxy_url'] ||
-          request.env.values_at('HTTP_X_FORWARDED_FOR', 'HTTP_HOST').compact.first
+        params.fetch('action_input', {})['proxy_url'] || callback_host_from_env(request)
+      end
+
+      def callback_host_from_env(request)
+        protocol = %w[yes on 1].include?(request.env['HTTPS'].to_s) ? 'https' : 'http'
+        host = request.env.values_at('HTTP_X_FORWARDED_FOR', 'HTTP_HOST').compact.first
+        "#{protocol}://#{host}"
       end
 
       def launcher_class(params)

data/lib/smart_proxy_dynflow/core.rb

@@ -28,8 +28,8 @@ module Proxy::Dynflow
 
       db_file = Settings.instance.database
       if db_file.nil? || db_file.empty?
-        Log.instance.warn "Could not open DB for dynflow at '#{db_file}', " \
-                          "will keep data in memory. Restart will drop all dynflow data."
+        Log.instance.info "Using in-memory database (default behaviour). Restart will drop all dynflow data. " \
+                          "To change this behaviour configure setting 'database'."
       else
         FileUtils.mkdir_p(File.dirname(db_file))
         db_conn_string += "/#{db_file}"

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Dynflow
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.8.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy