radfish 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddba2c0632175f4f75abe456074d912b7d6644371ca78699b7979abb4e9dd3de
-  data.tar.gz: 44eedf5868fbea6171d2714a922f1ab35dec320293208c5472e32d7d2104ece7
+  metadata.gz: 28b19abfcfc47b88d31ad43a17e67b9f0de71ac358c44bdb8e7e6f91b80a775f
+  data.tar.gz: d6e34c43743f79bfbfbb874545deedf1a487bfdfd6c7111683baebad257b5f45
 SHA512:
-  metadata.gz: 127e46cc938fe890f04ae0ad6b68b2ea0d2643ab7ca27c0855586291f363853cfb3151b0d88860d1f02f364f1430c42bef6f2c35880b6a8cc9504b5c7962b23c
-  data.tar.gz: c0e1fb812a023c8ecdfcf47a701dfc2fa4b959c9a63527109b4367a960f6261d5f3a35daa0415fe706ef0f3a66c4097a103bbd0a7d1ecc25b32872191013da46
+  metadata.gz: 0c62952bdd04c892f39f6fe44785bfd8f7b12800f27eaac6ef7ba2555380027401acfb2ed76fe5a0d4628917ababcde8fd4dba12dd61bc0ecfa88ea97c9d9b0c
+  data.tar.gz: 51a2cd9988e9b3e39e4af3c382308f48128aa52d3f5ab52857e4b11425e775f996a559fc1d77a1353d321e832c8e5266336bf597f55b897666be4e6c8981a962

data/README.md

@@ -126,6 +126,20 @@ Regardless of vendor, all adapters provide:
 ### Vendor-Specific Features
 Adapters can expose vendor-specific functionality while maintaining the common interface.
 
+## Compatibility
+
+`activesupport` below 8.1 and `json` 3 cannot be used together: activesupport's
+JSON encoder calls `JSON.generate(..., quirks_mode: true)`, and json 3 removed
+that keyword, so any `hash.to_json` raises `ArgumentError: unknown keyword:
+quirks_mode`. This is not specific to this gem — it bites anything that loads
+`active_support/core_ext` — but radfish depends on activesupport, so pick one
+of:
+
+- activesupport >= 8.1 with json 3, or
+- activesupport 7.x with json 2.
+
+CI covers both ends.
+
 ## Installation
 
 Add to your Gemfile:

data/lib/radfish/core/session.rb

@@ -14,9 +14,14 @@ module Radfish
       end
       
       def connection
-        @connection ||= Faraday.new(url: client.base_url, ssl: { verify: client.verify_ssl }) do |faraday|
-          faraday.request :url_encoded
-          faraday.adapter Faraday.default_adapter
+        @connection ||= begin
+          url = URI(client.base_url)
+          HttpClient.new(host: url.host, port: url.port,
+                         use_ssl: url.scheme == 'https', verify_ssl: client.verify_ssl,
+                         host_header: client.host_header,
+                         retry_count: client.retry_count,
+                         retry_delay: client.retry_delay,
+                         verbosity: verbosity)
         end
       end
       
@@ -32,10 +37,9 @@ module Radfish
           'Content-Type' => 'application/json',
           'Accept' => 'application/json'
         }
-        headers['Host'] = client.host_header if client.host_header
-        
+
         begin
-          response = connection.post('/redfish/v1/SessionService/Sessions', payload, headers)
+          response = connection.post('/redfish/v1/SessionService/Sessions', body: payload, headers: headers)
           
           if response.status == 201
             @x_auth_token = response.headers['x-auth-token']
@@ -50,14 +54,14 @@ module Radfish
             rescue JSON::ParserError
             end
             
-            debug "Session created successfully. Token: #{@x_auth_token ? @x_auth_token[0..10] + '...' : 'nil'}", 1, :green
+            debug "Session #{@session_id || '?'} created successfully (token #{@x_auth_token ? 'received' : 'missing'})", 1, :green
             return true
           else
             debug "Failed to create session. Status: #{response.status}", 1, :red
-            debug "Response: #{response.body}", 2
+            debug "Response: #{HttpClient.scrub(response.body)}", 2
             return false
           end
-        rescue Faraday::Error => e
+        rescue Radfish::Error => e
           debug "Connection error creating session: #{e.message}", 1, :red
           return false
         end
@@ -72,10 +76,9 @@ module Radfish
           'X-Auth-Token' => @x_auth_token,
           'Accept' => 'application/json'
         }
-        headers['Host'] = client.host_header if client.host_header
-        
+
         begin
-          response = connection.delete("/redfish/v1/SessionService/Sessions/#{@session_id}", nil, headers)
+          response = connection.delete("/redfish/v1/SessionService/Sessions/#{@session_id}", headers: headers)
           
           if response.status == 204 || response.status == 200
             debug "Session deleted successfully", 1, :green
@@ -86,7 +89,7 @@ module Radfish
             debug "Failed to delete session. Status: #{response.status}", 1, :yellow
             return false
           end
-        rescue Faraday::Error => e
+        rescue Radfish::Error => e
           debug "Error deleting session: #{e.message}", 1, :yellow
           return false
         end
@@ -99,10 +102,9 @@ module Radfish
           'X-Auth-Token' => @x_auth_token,
           'Accept' => 'application/json'
         }
-        headers['Host'] = client.host_header if client.host_header
-        
+
         begin
-          response = connection.get("/redfish/v1/SessionService/Sessions/#{@session_id}", nil, headers)
+          response = connection.get("/redfish/v1/SessionService/Sessions/#{@session_id}", headers: headers)
           response.status == 200
         rescue
           false
@@ -114,4 +116,4 @@ module Radfish
       end
     end
   end
-end
+end

data/lib/radfish/http_client.rb

@@ -24,14 +24,29 @@ module Radfish
     IDEMPOTENT_METHODS = [:get, :head, :put, :delete].freeze
     RETRY_STATUSES = [408, 429, 500, 502, 503, 504].freeze
     
+    # Secrets stripped from the debug log. Redfish session payloads use
+    # "Password" where other calls use "password", and the session token comes
+    # back as a header, so match either case and both header shapes.
+    LOG_FILTERS = [
+      # Faraday logs a header as `Authorization: "Basic dXNlcjpwdw=="` and a
+      # headers hash as `"Authorization"=>"Basic ..."`, so the quote sits
+      # between the colon and the scheme. Match both shapes, and any scheme,
+      # keeping the scheme itself visible because it is useful and not secret.
+      [/(Authorization"?\s*(?:=>|:)\s*"?)((?:Basic|Bearer|Digest)\s+)?[^"\n]+/i, '\1\2[FILTERED]'],
+      [/(Password"=>"?)([^,"]+)/i, '\1[FILTERED]'],
+      [/("password"\s*:\s*")([^"]+)/i, '\1[FILTERED]'],
+      [/((?:X-Auth-Token)"?\s*(?:=>|:)\s*"?)([^",\n]+)/i, '\1[FILTERED]']
+    ].freeze
+    
     attr_reader :host, :port, :use_ssl, :verify_ssl
     attr_accessor :username, :password, :verbosity, :retry_count, :retry_delay,
-                  :retry_methods, :max_redirects
+                  :retry_methods, :max_redirects, :log_device
     
     def initialize(host:, port: 443, use_ssl: true, verify_ssl: false, 
                    username: nil, password: nil, verbosity: 0,
                    retry_count: 3, retry_delay: 1,
-                   retry_methods: IDEMPOTENT_METHODS, max_redirects: 3, **options)
+                   retry_methods: IDEMPOTENT_METHODS, max_redirects: 3,
+                   log_device: STDOUT, **options)
       @host = host
       @port = port
       @use_ssl = use_ssl
@@ -43,9 +58,16 @@ module Radfish
       @retry_delay = retry_delay
       @retry_methods = retry_methods
       @max_redirects = max_redirects
+      @log_device = log_device
       @options = options
     end
     
+    # The Faraday logger applies LOG_FILTERS, but our own debug lines bypass it,
+    # so anything we print that can carry a header or a body goes through here.
+    def self.scrub(text)
+      LOG_FILTERS.reduce(text.to_s) { |t, (pattern, replacement)| t.gsub(pattern, replacement) }
+    end
+    
     def base_url
       protocol = use_ssl ? 'https' : 'http'
       "#{protocol}://#{host}:#{port}"
@@ -91,7 +113,7 @@ module Radfish
       response = conn.send(method) do |req|
         debug "Setting request URL: #{path}", 3, :cyan
         req.url path
-        debug "Merging headers: #{headers}", 3, :cyan
+        debug "Merging headers: #{self.class.scrub(headers)}", 3, :cyan
         req.headers.merge!(headers)
         req.body = body if body
         
@@ -152,6 +174,10 @@ module Radfish
       end
       
       raise Radfish::ConnectionError, "SSL error connecting to #{host}: #{e.message}"
+    rescue Faraday::Error => e
+      # HttpClient is the seam: callers speak Radfish errors, not Faraday ones.
+      debug "HTTP request failed: #{e.class} - #{e.message}", 1, :red
+      raise Radfish::Error, "Request to #{host} failed: #{e.message}"
     rescue => e
       debug "HTTP request failed: #{e.class} - #{e.message}", 1, :red
       debug "Exception backtrace: #{e.backtrace.first(5).join("\n")}", 1, :red
@@ -260,10 +286,8 @@ module Radfish
         
         # Add logging if verbose
         if verbosity >= 2
-          faraday.response :logger, Logger.new(STDOUT), { bodies: verbosity >= 3 } do |logger|
-            logger.filter(/(Authorization: Basic )([^,\n]+)/, '\1[FILTERED]')
-            logger.filter(/(Password"=>"?)([^,"]+)/, '\1[FILTERED]')
-            logger.filter(/("password":\s*")([^"]+)/, '\1[FILTERED]')
+          faraday.response :logger, Logger.new(log_device), { bodies: verbosity >= 3 } do |logger|
+            LOG_FILTERS.each { |pattern, replacement| logger.filter(pattern, replacement) }
           end
         end
         

data/lib/radfish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Radfish
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-10 00:00:00.000000000 Z
+date: 2026-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor