data_collector 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8065c0d1b54cf1c39be5cfcb70a4fae1f33b02021182c75538ed03e73393d35a
-  data.tar.gz: 879054ad24b178f08bfea7914c5fbc593c32c611bd4e3ad833869a3e5b36d5b1
+  metadata.gz: 057dac92f5a83458b244a962ef0518fa093365a38c2388582de0556ac7b884ca
+  data.tar.gz: 9aebb908d52dda01dc3efce7dcda3e40c8b4f45e718cef94052c9d37fca604eb
 SHA512:
-  metadata.gz: 390ac889c52055cfd8f5326c6e7c1549faee6b8c41af4535b9fc5d3038701f62c441caaf41895d7ad64b4941e609fdee32ac745255b9cb2fbc0981d787b00847
-  data.tar.gz: dbc57c97f30e5659ccfebba0850e99eee24ecada4a5e9a136ae6b036f19b587a4d66460e509c32d36be13cd4d745ed89f9a73e11a32b1b15fe800036c1836bea
+  metadata.gz: aa91e78ec3aef0010553886539284af4aafb3ed7014ef35e6f7094377bf9ad2efb7f6025bc7f8715d4558d8a5a1242325761a12a6e696590828fa1752c579198
+  data.tar.gz: 7309cc34f3d022d212ab9870558909ab84be3c6550160ce822808f98edb259c96669899247a7faefec6365068ac5aa68a6d5b43f279591156f47c9f02d0e182c

data/lib/data_collector/input/rpc.rb

@@ -55,7 +55,7 @@ module DataCollector
           parse_uri
           server.rabbitmq_url = @bunny_uri.to_s
           server.rabbitmq_exchange = @bunny_channel
-          server.logger = DataCollector::Core.logger
+          #server.logger = DataCollector::Core.logger
         end
       end
 

data/lib/data_collector/input.rb

@@ -31,7 +31,7 @@ module DataCollector
       raise DataCollector::Error 'from_uri expects a scheme like file:// of https://' unless source =~ /:\/\//
 
       scheme, path = source.split('://')
-      source="#{scheme}://#{URI.encode_uri_component(path)}"
+      source="#{scheme}://#{URI.encode_www_form_component(path)}"
       uri = URI(source)
       begin
         data = nil
@@ -41,7 +41,7 @@ module DataCollector
         when 'https'
           data = from_https(uri, options)
         when 'file'
-          absolute_path = File.absolute_path("#{URI.decode_uri_component("#{uri.host}#{uri.path}")}")
+          absolute_path = File.absolute_path("#{URI.decode_www_form_component("#{uri.host}#{uri.path}")}")
           if File.directory?(absolute_path)
             #raise DataCollector::Error, "#{uri.host}/#{uri.path} not found" unless File.exist?("#{uri.host}/#{uri.path}")
             return from_dir(uri, options)
@@ -80,7 +80,7 @@ module DataCollector
     end
 
     def from_https(uri, options = {})
-      uri = URI.decode_uri_component("#{uri.to_s}")
+      uri = URI.decode_www_form_component("#{uri.to_s}")
       data = nil
       if options.with_indifferent_access.include?(:logging) && options.with_indifferent_access[:logging]
         HTTP.default_options = HTTP::Options.new(features: { logging: { logger: @logger } })
@@ -102,6 +102,16 @@ module DataCollector
         http = HTTP.auth(bearer)
       end
 
+      if options.key?(:cookies) 
+        @logger.debug  "Set cookies"
+        http = http.cookies( options[:cookies] )
+      end
+
+      if options.key?(:headers) 
+        @logger.debug  "Set http headers"
+        http = http.headers( options[:headers] )
+      end
+          
       if options.key?(:verify_ssl) && uri.scheme.eql?('https')
         @logger.warn "Disabling SSL verification. "
         #shouldn't use this but we all do ...
@@ -109,10 +119,11 @@ module DataCollector
         ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
         http_response = http.follow.get(escape_uri(uri), ssl_context: ctx)
+
       else
         http_response = http.follow.get(escape_uri(uri))
       end
-
+ 
       case http_response.code
       when 200..299
         @raw = data = http_response.body.to_s
@@ -235,7 +246,7 @@ module DataCollector
     end
 
     def normalize_uri(uri)
-      "#{URI.decode_uri_component(uri.host)}#{URI.decode_uri_component(uri.path)}"
+      "#{URI.decode_www_form_component(uri.host)}#{URI.decode_www_form_component(uri.path)}"
     end
   end
 end

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.25.0"
+  VERSION = "0.26.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport