baza.rb 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61125f85202d4fff1512986b6d908cddf4d34154b7d0251808aed552e3710fe4
-  data.tar.gz: d7f2af72be1e37db02b235ee251b53c2a6f005fdb52bed0020a389027800c62a
+  metadata.gz: aece820f0bfcb187819d97ca24d4585f7831c6f48a1548bff802b7a504f760b5
+  data.tar.gz: 03d8f7403e8c590224d3bbdae1ed90ed7149d6210750718fa644b0d56807796a
 SHA512:
-  metadata.gz: ad169d4883e99abacc56de890cde937e6faeff3fd690aa370584b63c10987aa8804ac6c7b15df86de39580b3e55d498bf2834c522b0d8fe58e6fa87add564220
-  data.tar.gz: 35f78d75de7e884d880ac85a56928596bad609c29211b8ec13bf6fa1d666702a4500b28ad14ab2c631b4b738e8d7d4de79cf69f00944756fce5c7153a22ce2e1
+  metadata.gz: 61f1d9d1008111fe1e66c07f187e0de5f63ae1b9c1d905000e8588b37c82f43fbdaf4e6220553b0c131b68e500c1a2ce7219357bd97f745de1f88700a6869ffc
+  data.tar.gz: 05006bd92cc3e363b511237c44b5ba4b7048f5f2ab4c5e22d3bac9ee8188bb95fb6b7bc693b35ed44f94afc740b910fd96a732185a3e7a73865302d50a0b6db8

data/Gemfile

@@ -18,7 +18,7 @@ gem 'rack', '~>3.1', require: false
 gem 'rackup', '~>2.2', require: false
 gem 'rake', '~>13.2', require: false
 gem 'random-port', '~>0.7', require: false
-gem 'rdoc', '6.16.0', require: false # GPL
+gem 'rdoc', '6.16.1', require: false # GPL
 gem 'rubocop', '~>1.73', require: false
 gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.23', require: false

data/Gemfile.lock

@@ -128,7 +128,7 @@ GEM
     rake (13.3.1)
     random-port (0.7.6)
       tago (~> 0.0)
-    rdoc (6.16.0)
+    rdoc (6.16.1)
       erb
       psych (>= 4.0.0)
       tsort
@@ -221,7 +221,7 @@ DEPENDENCIES
   rackup (~> 2.2)
   rake (~> 13.2)
   random-port (~> 0.7)
-  rdoc (= 6.16.0)
+  rdoc (= 6.16.1)
   rubocop (~> 1.73)
   rubocop-minitest (~> 0.38)
   rubocop-performance (~> 1.23)

data/lib/baza-rb/version.rb

@@ -13,5 +13,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class BazaRb
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

data/lib/baza-rb.rb

@@ -580,6 +580,34 @@ class BazaRb
 
   private
 
+  # Stick host from X-Zerocracy-Host header if present.
+  #
+  # @param [Typhoeus::Response] ret The HTTP response containing headers
+  # @param [Iri] uri The current URI object to update
+  # @return [Iri] The updated URI object (or original if no valid header present)
+  # @note Invalid hostnames are logged as warnings and ignored
+  def stick_host(ret, uri)
+    sticky = ret.headers && ret.headers['X-Zerocracy-Host']
+    return uri unless sticky
+    return uri unless hostname?(sticky)
+    new_host = sticky.strip.chomp('.')
+    if new_host != @host
+      @loog.debug("Switching host from #{@host} to #{new_host} as per X-Zerocracy-Host")
+      @host = new_host
+    end
+    uri.host(@host)
+  end
+
+  # Validate hostname format according to RFC 1123.
+  #
+  # @param [String] name The hostname to validate
+  # @return [Boolean] True if valid, false otherwise
+  def hostname?(name)
+    name = name.strip
+    return false if name.empty? || name.bytesize > 253
+    name.match?(/\A[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\.?\z/)
+  end
+
   # Get the user agent string for HTTP requests.
   #
   # @return [String] The user agent string
@@ -707,22 +735,27 @@ class BazaRb
       @loog.debug(log)
       return ret
     end
-    @loog.debug("#{log}\n  #{(ret.headers || {}).map { |k, v| "#{k}: #{v}" }.join("\n  ")}")
     headers = ret.headers || {}
-    msg = [
-      "Invalid response code ##{ret.code} ",
-      "at #{mtd} #{url}",
-      headers['X-Zerocracy-Flash'] ? " (#{headers['X-Zerocracy-Flash'].inspect})" : ''
-    ].join
+    if headers.any?
+      @loog.error(
+        "#{log}\n" +
+        headers.map { |k, v| "  #{k}: #{v}" }.join("\n")
+      )
+    else
+      @loog.error("#{log}\n  (no headers returned)")
+    end
+    details = [
+      ("Flash: #{headers['X-Zerocracy-Flash']}" if headers['X-Zerocracy-Flash']),
+      ("Failure: #{headers['X-Zerocracy-Failure']}" if headers['X-Zerocracy-Failure']),
+      ("FailureMark: #{headers['X-Zerocracy-FailureMark']}" if headers['X-Zerocracy-FailureMark'])
+    ].compact
+    msg = "Invalid response code ##{ret.code} at #{mtd} #{url}"
+    msg += " (#{details.join(', ')})" unless details.empty?
     case ret.code
-    when 500
+    when 500, 503
       msg +=
         ", most probably it's an internal error on the server, " \
         'please report this to https://github.com/zerocracy/baza.rb'
-    when 503
-      msg +=
-        ", most probably it's an internal error on the server (#{headers['X-Zerocracy-Failure'].inspect}), " \
-        'please report this to https://github.com/zerocracy/baza.rb'
     when 404
       msg +=
         ", most probably you are trying to reach a wrong server, which doesn't " \
@@ -829,6 +862,7 @@ class BazaRb
           ("ranged as #{ret.headers['Content-Range'].inspect}" if ret.headers['Content-Range'])
         ]
         ret = checked(ret, [200, 206, 204, 302])
+        uri = stick_host(ret, uri)
         if blanks.include?(ret.code)
           sleep(2)
           next
@@ -908,6 +942,7 @@ class BazaRb
               end
             )
           end
+        uri = stick_host(ret, uri)
         sent += params[:body].bytesize
         @loog.debug(
           [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza.rb
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Yegor Bugayenko