radfish 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57f1bd62815e2443eadeeb512c54df7c694da3cb11a88317ca0e788748dfdca
-  data.tar.gz: 7481606f6651361c81c13a2dc319670d34891affab6540394d30b2730df88a64
+  metadata.gz: 3eb7e0fad9f1c58627bb67908c36b48ee6345502dd697d060bfb2a2269168779
+  data.tar.gz: 1d0773d739fc075885f9c49abaf719394695af6e7120c2d42b0478638f78d0f7
 SHA512:
-  metadata.gz: da233a9a62801ecf8a50018dbc5e8c73cb7e7582bda980337cd934040f8583883cacfac803f266ce379b616b5a9531f67b97dec2c638e41e46f2f2aff858d56f
-  data.tar.gz: 9582794ab67b7e5e60c1bb47b8fd29c6556172e8b89c1309bf3cd1c7ccbc6fe61bb5317bf3077f968cb19102a61282ef49d446ba6afff24bfa1657e5e48c0abc
+  metadata.gz: 86cb61d2ce44dc0443bd41236074670645e8f16b8d6daa316b54159a6ebcacdf60184cc29ccbbce10747cd878a38b596703b631b2ef8b7e7fa8f922718928ed5
+  data.tar.gz: ee102d72d959c36cf16f997ebf8bacb9ae8ed6811b68fc6a08961510f85565e46ec132f42bd6d58da5b06af0acfb12fa543b9e3178abc1e86b69bfde01a582b9

data/lib/radfish/client.rb

@@ -18,7 +18,8 @@ module Radfish
           password: password,
           port: options[:port] || 443,
           use_ssl: options.fetch(:use_ssl, true),
-          verify_ssl: options.fetch(:verify_ssl, false)
+          verify_ssl: options.fetch(:verify_ssl, false),
+          host_header: options[:host_header]
         )
         detector.verbosity = @verbosity
         @vendor = detector.detect
@@ -186,6 +187,41 @@ module Radfish
       Array(raw).map { |v| build_volume(v, controller) }
     end
 
+    # Storage management methods - pass through to adapter
+    # These are Dell-specific for now but will be generalized when other vendors add support
+    
+    def enable_local_key_management(controller_id:, passphrase:, key_id:)
+      if @adapter.respond_to?(:enable_local_key_management)
+        @adapter.enable_local_key_management(controller_id: controller_id, passphrase: passphrase, key_id: key_id)
+      else
+        raise NotImplementedError, "Local key management not supported by #{@vendor} adapter"
+      end
+    end
+    
+    def disable_local_key_management(controller_id:)
+      if @adapter.respond_to?(:disable_local_key_management)
+        @adapter.disable_local_key_management(controller_id: controller_id)
+      else
+        raise NotImplementedError, "Local key management not supported by #{@vendor} adapter"
+      end
+    end
+    
+    def create_virtual_disk(**options)
+      if @adapter.respond_to?(:create_virtual_disk)
+        @adapter.create_virtual_disk(**options)
+      else
+        raise NotImplementedError, "Virtual disk creation not supported by #{@vendor} adapter"
+      end
+    end
+    
+    def delete_volume(volume_odata_id)
+      if @adapter.respond_to?(:delete_volume)
+        @adapter.delete_volume(volume_odata_id)
+      else
+        raise NotImplementedError, "Volume deletion not supported by #{@vendor} adapter"
+      end
+    end
+
     private
 
     def build_controller(raw)

data/lib/radfish/http_client.rb

@@ -4,6 +4,7 @@ require 'faraday'
 require 'faraday/multipart'
 require 'faraday/retry'
 require 'logger'
+require 'socket'
 
 module Radfish
   # Shared HTTP client for all BMC connections
@@ -54,13 +55,28 @@ module Radfish
     end
     
     def request(method, path, body: nil, headers: {}, auth: true, timeout: nil, **options)
-      response = connection(auth: auth).send(method) do |req|
+      debug "Starting HTTP #{method.upcase} request to #{path}", 2, :yellow
+      
+      # Add host header if specified (needed for SSH tunnels to iDRAC)
+      if @options[:host_header]
+        headers = headers.merge('Host' => @options[:host_header])
+        debug "Added Host header: #{@options[:host_header]}", 2, :cyan
+      end
+      
+      debug "Creating connection...", 2, :yellow
+      conn = connection(auth: auth)
+      debug "Connection created, sending #{method} request...", 2, :yellow
+      
+      response = conn.send(method) do |req|
+        debug "Setting request URL: #{path}", 3, :cyan
         req.url path
+        debug "Merging headers: #{headers}", 3, :cyan
         req.headers.merge!(headers)
         req.body = body if body
         
         # Override timeout if specified
         if timeout
+          debug "Setting timeout: #{timeout}s", 3, :cyan
           req.options.timeout = timeout
           req.options.open_timeout = [timeout / 2, 5].min
         end
@@ -69,21 +85,46 @@ module Radfish
         options.each do |key, value|
           req.options[key] = value if req.options.respond_to?(:"#{key}=")
         end
+        debug "Request configured, about to send...", 2, :yellow
       end
       
+      debug "Request completed with status: #{response.status}", 2, :green
+      
       response
     rescue Faraday::ConnectionFailed => e
       debug "Connection failed: #{e.message}", 1, :red
-      raise ConnectionError, "Failed to connect to #{host}: #{e.message}"
+      raise Radfish::ConnectionError, "Failed to connect to #{host}: #{e.message}"
     rescue Faraday::TimeoutError => e
       debug "Request timed out: #{e.message}", 1, :red
-      raise TimeoutError, "Request to #{host} timed out: #{e.message}"
+      raise Radfish::TimeoutError, "Request to #{host} timed out: #{e.message}"
     rescue Faraday::SSLError => e
       debug "SSL error: #{e.message}", 1, :red
-      raise ConnectionError, "SSL error connecting to #{host}: #{e.message}"
+      
+      # Test if this might be HTTP instead of HTTPS
+      begin
+        debug "Testing if endpoint supports HTTP instead of HTTPS...", 2, :yellow
+        test_http_socket = TCPSocket.new(host, port)
+        test_http_socket.write("GET /redfish/v1 HTTP/1.1\r\nHost: #{@host_header || host}\r\nConnection: close\r\n\r\n")
+        response = test_http_socket.read(1024) # Read first 1KB
+        test_http_socket.close
+        
+        if response && response.include?("HTTP/") && !response.include?("301") && !response.include?("302")
+          debug "HTTP response received - this endpoint might support HTTP instead of HTTPS", 1, :yellow
+          debug "HTTP response preview: #{response[0..200]}", 2
+        else
+          debug "No valid HTTP response - endpoint requires HTTPS but SSL failed", 2, :red
+        end
+      rescue => http_test_error
+        debug "HTTP test failed: #{http_test_error.message}", 2
+      end
+      
+      raise Radfish::ConnectionError, "SSL error connecting to #{host}: #{e.message}"
     rescue => e
       debug "HTTP request failed: #{e.class} - #{e.message}", 1, :red
-      raise Error, "HTTP request failed: #{e.message}"
+      debug "Exception backtrace: #{e.backtrace.first(5).join("\n")}", 1, :red
+      
+      # Don't re-raise as generic error - let the original exception propagate
+      raise e
     end
     
     private
@@ -92,7 +133,30 @@ module Radfish
       @connections ||= {}
       cache_key = auth ? :with_auth : :without_auth
       
-      @connections[cache_key] ||= Faraday.new(url: base_url, ssl: { verify: verify_ssl }) do |faraday|
+      ssl_options = {
+        verify: verify_ssl,
+        verify_mode: verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE,
+        # Try TLS 1.0 for older BMCs, fallback to 1.2
+        min_version: OpenSSL::SSL::TLS1_VERSION,
+        max_version: OpenSSL::SSL::TLS1_2_VERSION,
+        ciphers: 'ALL:!aNULL:!eNULL:!SSLv2'  # More permissive for older BMCs
+      }
+      debug "SSL options: #{ssl_options.inspect}", 2, :yellow
+      
+      # Test TCP connectivity first (for SSH tunnels)
+      if host.include?('localhost') && port
+        begin
+          debug "Testing TCP connectivity to #{host}:#{port}...", 2, :yellow
+          socket = TCPSocket.new(host, port)
+          socket.close
+          debug "TCP connection test successful", 2, :green
+        rescue => e
+          debug "TCP connection test failed: #{e.message}", 1, :red
+          raise Radfish::ConnectionError, "TCP connection test failed to #{host}:#{port}: #{e.message}"
+        end
+      end
+      
+      @connections[cache_key] ||= Faraday.new(url: base_url, ssl: ssl_options) do |faraday|
         # Add authentication if credentials provided and auth is enabled
         if auth && username && password
           faraday.request :authorization, :basic, username, password
@@ -119,12 +183,8 @@ module Radfish
             Faraday::RetriableResponse
           ],
           methods: [:get, :put, :delete, :post, :patch],
-          retry_statuses: [408, 429, 500, 502, 503, 504],
-          retry_block: -> (env, options, retries, exception) {
-            if verbosity > 0
-              debug "Retry #{retries}/#{options[:max]}: #{exception&.message || "HTTP #{env.status}"}", 1, :yellow
-            end
-          }
+          retry_statuses: [408, 429, 500, 502, 503, 504]
+          # Removed retry_block to debug ArgumentError - can add back later
         }
         
         # Set timeouts
@@ -133,7 +193,7 @@ module Radfish
         
         # Add logging if verbose
         if verbosity > 0
-          faraday.response :logger, Logger.new(STDOUT), bodies: verbosity >= 2 do |logger|
+          faraday.response :logger, Logger.new(STDOUT), { bodies: verbosity >= 2 } do |logger|
             logger.filter(/(Authorization: Basic )([^,\n]+)/, '\1[FILTERED]')
             logger.filter(/(Password"=>"?)([^,"]+)/, '\1[FILTERED]')
             logger.filter(/("password":\s*")([^"]+)/, '\1[FILTERED]')

data/lib/radfish/vendor_detector.rb

@@ -9,13 +9,14 @@ module Radfish
     attr_reader :host, :username, :password, :port, :use_ssl, :verify_ssl
     attr_accessor :verbosity
     
-    def initialize(host:, username:, password:, port: 443, use_ssl: true, verify_ssl: false)
+    def initialize(host:, username:, password:, port: 443, use_ssl: true, verify_ssl: false, host_header: nil)
       @host = host
       @username = username
       @password = password
       @port = port
       @use_ssl = use_ssl
       @verify_ssl = verify_ssl
+      @host_header = host_header
       @verbosity = 0
       
       # Use the shared HTTP client
@@ -26,6 +27,7 @@ module Radfish
         verify_ssl: verify_ssl,
         username: username,
         password: password,
+        host_header: host_header,  # Pass host_header to HttpClient
         verbosity: 0,  # Will be updated via verbosity= setter
         retry_count: 2,  # Fewer retries for detection
         retry_delay: 0.5
@@ -39,8 +41,10 @@ module Radfish
     
     def detect
       debug "Detecting vendor for #{host}:#{port}...", 1, :cyan
+      debug "Host header: #{@host_header}" if @host_header
       
       # Try to get the Redfish service root
+      debug "Fetching service root...", 2, :yellow
       service_root = fetch_service_root
       
       unless service_root
@@ -48,6 +52,7 @@ module Radfish
         return nil
       end
       
+      debug "Service root fetched successfully", 2, :green
       vendor = identify_vendor(service_root)
       debug "Detected vendor: #{vendor || 'Unknown'} for #{host}:#{port}", 1, vendor ? :green : :yellow
       
@@ -58,10 +63,15 @@ module Radfish
     
     def fetch_service_root
       begin
-        # Use a shorter timeout for vendor detection (5 seconds total)
-        response = @http_client.get('/redfish/v1', timeout: 5)
+        debug "About to make HTTP GET request to /redfish/v1", 2, :yellow
+        # Use longer timeout for SSH tunnels (15 seconds), shorter for direct connections (5 seconds)
+        timeout = @host_header ? 15 : 5
+        debug "Using timeout: #{timeout}s (SSH tunnel detected)" if @host_header
+        response = @http_client.get('/redfish/v1', timeout: timeout)
+        debug "HTTP GET request completed", 2, :green
         
         if response.status == 200
+          debug "Got 200 response, parsing JSON...", 2, :green
           JSON.parse(response.body)
         elsif response.status == 401
           debug "Authentication failed (HTTP 401) - check username/password", 1, :red

data/lib/radfish/version.rb

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

metadata

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