flexirest 1.11.3 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc3590ed1c31e53df7d8be038fad0a01f66d4d50dd3effbb17f0ed41256e6fa
-  data.tar.gz: 6049f2be6ecb5c921b4c0d10c1e4e3533dc50adaf98d153bae690e1d01413ecb
+  metadata.gz: b36abe5b5b35c85e8705681e6ec68792c20b1ec33e44cd94420e7a49a103fb50
+  data.tar.gz: fa2cf4caa5736b75f53b3bcf7ae61909e448ba75d58c41dfe826a92e616e42ec
 SHA512:
-  metadata.gz: 469d6426f9de8945cc94af7c26e06a88e6b7b570e3c0b72487dd4d940518d54eba224ed522efe8abc12f822d80350b89658ac0cc4d7b7fcdc64c581075f44644
-  data.tar.gz: d6d241da12c0049113e692693a4d98b7cbaa45f7ad06f5733a21eb7c516507e6ae9d513620feca19372f8039a2a9c3019bfb98005b8670a1920a860a363a181d
+  metadata.gz: 6a7b314f07d529deef241d32d750770e51fe2c4fdf32390f3cbbed814d3854d2f1229f6bc138d6b1a6688f7d152ccb330a778dd05298242bae20b9790da09e46
+  data.tar.gz: 3831f016b5b437374f2ba1a7fd9a9568077ffb71c9e1456359244055990dddb0aaf2a0fae0aa506d03bc8a8c5469ef1ae7809e3f6786e4d9b3a93d09937319a5

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.12.1
+
+Bugfix:
+
+- Usernames and passwords for simple authentication should be URL-encoded unless they're actually going in the URL (thanks to Scott Duke for the bug report)
+
+## 1.12.0
+
+Bugfix:
+
+- Add compatibility with Ruby on Rails 7.1 (requires a method on the logger)
+
 ## 1.11.3
 
 Bugfix:

data/lib/flexirest/configuration.rb

@@ -92,7 +92,6 @@ module Flexirest
           if value.respond_to?(:call)
             @username = value
           else
-            value = CGI::escape(value) if value.present? && !value.include?("%")
             @username = value
           end
         end
@@ -100,7 +99,6 @@ module Flexirest
 
       def username=(value)
         Flexirest::Logger.info "\033[1;4;32m#{name}\033[0m Username set to be #{value}"
-        value = CGI::escape(value) if value.present? && !value.include?("%")
         @@username = value
       end
 
@@ -123,7 +121,6 @@ module Flexirest
           if value.respond_to?(:call)
             @password = value
           else
-            value = CGI::escape(value) if value.present? && !value.include?("%")
             @password = value
           end
         end
@@ -131,7 +128,6 @@ module Flexirest
 
       def password=(value)
         Flexirest::Logger.info "\033[1;4;32m#{name}\033[0m Password set..."
-        value = CGI::escape(value) if value.present? && !value.include?("%")
         @@password = value
       end
 

data/lib/flexirest/logger.rb

@@ -16,6 +16,14 @@ module Flexirest
       @messages = []
     end
 
+    def self.level
+      if defined?(Rails) && Rails.logger.present?
+        Rails.logger.level
+      else
+        0
+      end
+    end
+
     def self.debug(message)
       if defined?(Rails) && Rails.logger.present?
         Rails.logger.debug(message)

data/lib/flexirest/request.rb

@@ -129,7 +129,11 @@ module Flexirest
     end
 
     def inject_basic_auth_in_url(url)
-      url.gsub!(%r{//(.)}, "//#{username}:#{password}@\\1") if !url[%r{//[^/]*:[^/]*@}]
+      u = username
+      u = CGI::escape(u) if u.present? && !u.include?("%")
+      p = password
+      p = CGI::escape(p) if p.present? && !p.include?("%")
+      url.gsub!(%r{//(.)}, "//#{u}:#{p}@\\1") if !url[%r{//[^/]*:[^/]*@}]
     end
 
     def using_basic_auth?

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.11.3"
+  VERSION = "1.12.1"
 end

data/spec/lib/request_spec.rb

@@ -78,15 +78,15 @@ describe Flexirest::Request do
 
     class AuthenticatedExampleClient < Flexirest::Base
       base_url "http://www.example.com"
-      username "john"
-      password "smith"
+      username "john@example.com"
+      password "smith?$"
       get :all, "/"
     end
 
     class AuthenticatedBasicHeaderExampleClient < Flexirest::Base
       base_url "http://www.example.com"
-      username "john"
-      password "smith"
+      username "john@example.com"
+      password "smith?$"
       basic_auth_method :header
       get :all, "/"
     end
@@ -97,8 +97,8 @@ describe Flexirest::Request do
 
     class AuthenticatedBasicUrlExampleClient < Flexirest::Base
       base_url "http://www.example.com"
-      username "john"
-      password "smith"
+      username "john@example.com"
+      password "smith?$"
       basic_auth_method :url
       get :all, "/"
     end
@@ -357,14 +357,14 @@ describe Flexirest::Request do
     mocked_response = ::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{}))
 
     connection = double(Flexirest::Connection).as_null_object
-    expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://john:smith@www.example.com").and_return(connection)
+    expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://john%40example.com:smith%3F%24@www.example.com").and_return(connection)
     expect(connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(mocked_response)
     AuthenticatedExampleClient.all
   end
 
   it "should use the headers method for Basic auth when basic_auth_method is set to :header" do
     mocked_response = ::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{}))
-    headers_including_auth = hash_including({ "Authorization" => "Basic am9objpzbWl0aA==" })
+    headers_including_auth = hash_including({ "Authorization" => "Basic am9obkBleGFtcGxlLmNvbTpzbWl0aD8k" })
 
     connection = double(Flexirest::Connection).as_null_object
     expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://www.example.com").and_return(connection)
@@ -382,7 +382,7 @@ describe Flexirest::Request do
 
   it "should use the setting set on the parent class" do
     mocked_response = ::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{}))
-    headers_including_auth = hash_including({ "Authorization" => "Basic am9objpzbWl0aA==" })
+    headers_including_auth = hash_including({ "Authorization" => "Basic am9obkBleGFtcGxlLmNvbTpzbWl0aD8k" })
 
     connection = double(Flexirest::Connection).as_null_object
     expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://www.example.com").and_return(connection)
@@ -394,7 +394,7 @@ describe Flexirest::Request do
     mocked_response = ::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{}))
 
     connection = double(Flexirest::Connection).as_null_object
-    expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://john:smith@www.example.com").and_return(connection)
+    expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://john%40example.com:smith%3F%24@www.example.com").and_return(connection)
     expect(connection).to receive(:get) do |path, options|
       expect(path).to eq("/")
       expect(options[:headers]).to eq({"Accept"=>"application/hal+json, application/json;q=0.5", "Content-Type"=>"application/x-www-form-urlencoded; charset=utf-8"})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.1
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: This gem is for accessing REST services in a flexible way.  ActiveResource