aikido-zen 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f84d6263b1e3a0465611f20c4c25b953370179330d3be5472d18d246fe44a8
-  data.tar.gz: 8c212fec6db284434786644d20e3c4301b0612b6d2127be5f968db6dd254bd9e
+  metadata.gz: 052d01f51eb0f34c08a07ba96d66f8e31e003c80014b832093ce5cdb5e651fb8
+  data.tar.gz: 0c4840278e6628eacc85c0202be103e4e61db7353081f241be716cea0decd1b3
 SHA512:
-  metadata.gz: 427092eaa22f0ca613e34016d19ebebace148dd3b9111189f65077d11cbac3d425e28ac7e60755dd2414b56c245d0bacb5a422e9d06a861068ef705a97a62a8a
-  data.tar.gz: bda45c8553f65d296e6e65d2371bf6b32613fd960e29e51200db812198d0a3505ba99c0bc00698844b369b4f0d4417c445b9d1f8c6b7aa541c6b8ce99dad81a5
+  metadata.gz: d2a5c9158588d96494c090315aa0a2bcddf6a51165ece7cc8585d7ec3ee58d09c5b36e52cf7a905323598f362e00417dfee018245fc5edb9a981b40ff728265d
+  data.tar.gz: 20245af9becf214d9c648446242fdf38a345785c153d28e65605ec97b5b90b51ea1cd6e7bbbf4b9a82ae426f4663a6549e596394ef5a8a2714f84ca3d0ee89d6

data/docs/config.md

@@ -5,6 +5,15 @@ changing values on the `Aikido::Zen.config` object, which you can do from
 your app's startup file (like an initializer in Rails, or `config.ru` in
 other Rack-based apps).
 
+## Middleware insertion
+
+By default, the Zen middleware is inserted after `ActionDispatch::Executor`.
+You can change this by setting `Aikido::Zen.config.insert_middleware_after`
+to a Rack middleware class or index.
+
+When set to `nil`, the middleware is inserted before the first middleware in
+the then-current middleware stack.
+
 ## Disable Zen
 
 In order to fully turn off Zen and prevent it from intercepting any requests or

data/lib/aikido/zen/config.rb

@@ -8,6 +8,12 @@ require_relative "context"
 
 module Aikido::Zen
   class Config
+    # @return [Class, Integer, nil] The Rack middleware class or index after which
+    #   the Zen middleware should be inserted. When set to nil, the middleware is
+    #   inserted before the first middleware in the then-current middleware stack.
+    #   Defaults to ::ActionDispatch::Executor.
+    attr_accessor :insert_middleware_after
+
     # @return [Boolean] whether Aikido should be turned completely off (no
     #   intercepting calls to protect the app, no agent process running, no
     #   middleware installed). Defaults to false (so, enabled). Can be set
@@ -178,6 +184,7 @@ module Aikido::Zen
     attr_accessor :attack_wave_max_cache_entries
 
     def initialize
+      self.insert_middleware_after = ::ActionDispatch::Executor
       self.disabled = read_boolean_from_env(ENV.fetch("AIKIDO_DISABLE", false)) || read_boolean_from_env(ENV.fetch("AIKIDO_DISABLED", false))
       self.blocking_mode = read_boolean_from_env(ENV.fetch("AIKIDO_BLOCK", false))
       self.api_timeouts = 10

data/lib/aikido/zen/rails_engine.rb

@@ -10,10 +10,10 @@ module Aikido::Zen
     end
 
     initializer "aikido.add_middleware", after: :load_config_initializers do |app|
-      # The midleware to be inserted in order. The first middleware is the existing
-      # middleware to use as an anchor point.
-      middleware = [
-        ::Rails::Rack::Logger,
+      # The Zen middleware is inserted in order as a block after the configured
+      # middleware anchor point.
+
+      middleware_block = [
         Aikido::Zen::Middleware::ForkDetector,
         Aikido::Zen::Middleware::ContextSetter,
         Aikido::Zen::Middleware::AllowedAddressChecker,
@@ -24,8 +24,16 @@ module Aikido::Zen
         Aikido::Zen::Middleware::RequestTracker
       ]
 
-      middleware.each_cons(2) do |existing_middleware, additional_middleware|
-        app.middleware.insert_after(existing_middleware, additional_middleware)
+      middleware_anchor = Aikido::Zen.config.insert_middleware_after
+
+      if middleware_anchor.nil?
+        app.middleware.insert_before 0, middleware_block.first
+      else
+        app.middleware.insert_after middleware_anchor, middleware_block.first
+      end
+
+      middleware_block.each_cons(2) do |existing_middleware, middleware|
+        app.middleware.insert_after(existing_middleware, middleware)
       end
 
       ActiveSupport.on_load(:action_controller) do

data/lib/aikido/zen/version.rb

@@ -2,7 +2,7 @@
 
 module Aikido
   module Zen
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
 
     # The version of libzen_internals that we build against.
     LIBZEN_VERSION = "0.1.48"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aikido-zen
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Aikido Security
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-19 00:00:00.000000000 Z
+date: 2025-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby