logstruct 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3634f56776f895f97747c8165065651aca55098520469624f73f2d75b090f33c
-  data.tar.gz: c29661ad9e8044bad356a5a699f9aaed053c55ec124226784c60dd78655e794f
+  metadata.gz: 95828f14e3935518654b94939f2cee577f296d454fa3666a8e5f1eb9ababb1dd
+  data.tar.gz: dcd8ff40d991a79573fe60e678ea85590b9597f1e0163f132f8eff79015a88ff
 SHA512:
-  metadata.gz: c491c3087d5341e5ab88bc607c2596be06fb90c482b74498b5aebd5a0eb5ef92f917b889b3ea26f56cb5a69be756bbc0afabfb957bff557cbbd7615f45b3934b
-  data.tar.gz: '090f85673e396225d96254c14fdfcdc941904354d3c11700be60b93e83e7c2e230bcbc15c8436ba2e0491223c77e0498f33d866beddb1e34379b7e4863916d1b'
+  metadata.gz: 868f9dc4e320fbdf752b0e3b901280b5a972b9759592869587bf3673d905ddb3b554851c0dfe977eafe543be37b37105f9f759cccc8d06a009771585c931ce58
+  data.tar.gz: b8402c46a941a578261933249acddff294551d5fd5b1823ed54e48ce2f17ba1e760919a540ef38918706004093a1b3c0f5a89e16405037e4e86cbd6a114bc363

data/CHANGELOG.md

@@ -5,8 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
 ### Changed
 
+## [0.1.9] - 2026-01-23
+
+### Changed
+
+- **Fix**: ActiveJob integration handles Rails main event reporter subscribers
+- **Fix**: Rack error handler avoids deprecated CSRF exception class on Rails main
+- **CI**: Added Rails main daily integration run and updated Rails test matrix (7.1.6, 7.2.3, 8.0.4, 8.1.2)
+
 ## [0.1.8] - 2026-01-22
 
 - **Fix**: Lograge custom options now appear in request logs

data/lib/log_struct/integrations/active_job/log_subscriber.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "active_support/log_subscriber"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../log/active_job"
@@ -10,7 +11,7 @@ module LogStruct
   module Integrations
     module ActiveJob
       # Structured logging for ActiveJob
-      class LogSubscriber < ::ActiveJob::LogSubscriber
+      class LogSubscriber < ::ActiveSupport::LogSubscriber
         extend T::Sig
 
         sig { params(event: ::ActiveSupport::Notifications::Event).void }

data/lib/log_struct/integrations/active_job.rb

@@ -25,8 +25,13 @@ module LogStruct
         return nil unless config.integrations.enable_activejob
 
         ::ActiveSupport.on_load(:active_job) do
-          # Detach the default text formatter
-          ::ActiveJob::LogSubscriber.detach_from :active_job
+          if ::ActiveJob::LogSubscriber.respond_to?(:detach_from)
+            # Detach the default text formatter
+            ::ActiveJob::LogSubscriber.detach_from :active_job
+          elsif ::ActiveSupport.respond_to?(:event_reporter)
+            reporter = ::ActiveSupport.event_reporter
+            reporter.unsubscribe(::ActiveJob::LogSubscriber) if reporter.respond_to?(:unsubscribe)
+          end
 
           # Attach our structured formatter
           Integrations::ActiveJob::LogSubscriber.attach_to :active_job

data/lib/log_struct/integrations/rack_error_handler/middleware.rb

@@ -81,38 +81,40 @@ module LogStruct
             ::Rails.logger.warn(security_log)
 
             [FORBIDDEN_STATUS, IP_SPOOF_HEADERS.dup, [IP_SPOOF_HTML]]
-          rescue ::ActionController::InvalidAuthenticityToken => invalid_auth_token_error
-            # Create a security log for CSRF error
-            security_log = Log::Security::CSRFViolation.new(
-              path: request.path,
-              http_method: request.method,
-              source_ip: request.remote_ip,
-              user_agent: request.user_agent,
-              referer: request.referer,
-              request_id: request.request_id,
-              message: invalid_auth_token_error.message,
-              timestamp: Time.now
-            )
-            LogStruct.error(security_log)
-
-            # Report to error reporting service and/or re-raise
-            context = extract_request_context(env, request)
-            LogStruct.handle_exception(invalid_auth_token_error, source: Source::Security, context: context)
-
-            # If handle_exception raised an exception then Rails will deal with it (e.g. config.exceptions_app)
-            # If we are only logging or reporting these security errors, then return a default response
-            [FORBIDDEN_STATUS, CSRF_HEADERS.dup, [CSRF_HTML]]
           rescue => error
-            # Extract request context for error reporting
-            context = extract_request_context(env, request)
-
-            # Create and log a structured exception with request context
-            exception_log = Log.from_exception(Source::Rails, error, context)
-            LogStruct.error(exception_log)
-
-            # Re-raise any standard errors to let Rails or error reporter handle it.
-            # Rails will also log the request details separately
-            raise error
+            if csrf_error?(error)
+              # Create a security log for CSRF error
+              security_log = Log::Security::CSRFViolation.new(
+                path: request.path,
+                http_method: request.method,
+                source_ip: request.remote_ip,
+                user_agent: request.user_agent,
+                referer: request.referer,
+                request_id: request.request_id,
+                message: error.message,
+                timestamp: Time.now
+              )
+              LogStruct.error(security_log)
+
+              # Report to error reporting service and/or re-raise
+              context = extract_request_context(env, request)
+              LogStruct.handle_exception(error, source: Source::Security, context: context)
+
+              # If handle_exception raised an exception then Rails will deal with it (e.g. config.exceptions_app)
+              # If we are only logging or reporting these security errors, then return a default response
+              [FORBIDDEN_STATUS, CSRF_HEADERS.dup, [CSRF_HTML]]
+            else
+              # Extract request context for error reporting
+              context = extract_request_context(env, request)
+
+              # Create and log a structured exception with request context
+              exception_log = Log.from_exception(Source::Rails, error, context)
+              LogStruct.error(exception_log)
+
+              # Re-raise any standard errors to let Rails or error reporter handle it.
+              # Rails will also log the request details separately
+              raise error
+            end
           end
         end
 
@@ -146,6 +148,13 @@ module LogStruct
           {error_extracting_context: error.message}
         end
 
+        sig { params(error: StandardError).returns(T::Boolean) }
+        def csrf_error?(error)
+          error_name = error.class.name
+          error_name == "ActionController::InvalidAuthenticityToken" ||
+            error_name == "ActionController::InvalidCrossOriginRequest"
+        end
+
         sig { params(configured_proxies: T.untyped).returns(T.untyped) }
         def normalized_trusted_proxies(configured_proxies)
           if configured_proxies.nil? || (configured_proxies.respond_to?(:empty?) && configured_proxies.empty?)

data/lib/log_struct/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module LogStruct
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstruct
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - DocSpring