aikido-zen 1.0.1.beta.3 → 1.0.1.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b65ca1f70cfe358f45e5a32ebf7040ddd23e14fc06fcdc76ecc40787c7e900a
-  data.tar.gz: 9eeec2fac0c811d58543f984a438729a2c335c1a04a3ca477f0cc580dc1850a2
+  metadata.gz: 77f21724c518120f8babf2de99cb851ca3883c7f30486c55f85b2e50fccda388
+  data.tar.gz: 60991be90b49872e9d31d3c84c5482a9e57191964bfc890478c876a89b18d848
 SHA512:
-  metadata.gz: '07069063ad2ddf0cd07d1332cb9bd82a2a07670355fde427c21abdda64f6eaad32b8d7f3b5f841b93803e2e4c2e9588ce280d1af6158a14820482880e2e452f0'
-  data.tar.gz: 421cef9738902e350617663306f95f52a92ed8773f192684b7c8f8546e02eaf8afe90ce619bb81c2d0797a36537c2beaa597e34dc7d5a620b905a61500f21a8d
+  metadata.gz: 8537a8ca813cd0480141b47976bed6a0577ef5c06ed07db0dcfa59c77cd2061954ffad805ea8daad3e2549cb73558f06e6d34a67f3ebec024ddc40b18958fc5c
+  data.tar.gz: d6f99986334e8435118e1516ae93152bf2f6f6f2a96e306c3649016eb878e1454885ef45fecf04875b57c3d6b89f6e73e7063db02780fe126c92f8a02f9b5a7f

data/lib/aikido/zen/rails_engine.rb

@@ -10,8 +10,6 @@ module Aikido::Zen
     end
 
     initializer "aikido.add_middleware" do |app|
-      next unless config.zen.protect?
-
       app.middleware.use Aikido::Zen::Middleware::SetContext
       app.middleware.use Aikido::Zen::Middleware::CheckAllowedAddresses
       # Request Tracker stats do not consider failed request or 40x, so the middleware
@@ -51,20 +49,8 @@ module Aikido::Zen
     end
 
     config.after_initialize do
-      next unless config.zen.protect?
-
-      # Make sure this is run at the end of the initialization process, so
-      # that any gems required after aikido-zen are detected and patched
-      # accordingly.
-      Aikido::Zen.load_sinks!
-
-      # It's important we start after loading sinks, so we can report the installed packages
+      # Start the Aikido Agent only once the application starts.
       Aikido::Zen.start!
-
-      # Agent's bootstrap process has finished —Controllers are patched to block
-      # unwanted requests, sinks are loaded, scanners are running—, so we mark
-      # the agent as installed.
-      Aikido::Zen.middleware_installed!
     end
   end
 end

data/lib/aikido/zen/version.rb

@@ -2,7 +2,7 @@
 
 module Aikido
   module Zen
-    VERSION = "1.0.1.beta.3"
+    VERSION = "1.0.1.beta.4"
 
     # The version of libzen_internals that we build against.
     LIBZEN_VERSION = "0.1.39"

data/lib/aikido/zen.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-# IMPORTANT: Any files that load sinks or start the Aikido Agent should
-# be required in `Aikido::Zen.protect!`.
-
 require_relative "zen/version"
 require_relative "zen/errors"
 require_relative "zen/actor"
@@ -29,6 +26,9 @@ module Aikido
     # Enable protection. Until this method is called no sinks are loaded
     # and the Aikido Agent does not start.
     #
+    # This method should be called only once, in the application after the
+    # initialization process is complete.
+    #
     # @return [void]
     def self.protect!
       if config.disabled?
@@ -36,16 +36,14 @@ module Aikido
         return
       end
 
-      # IMPORTANT: Any files that load sinks or start the Aikido Agent
-      # should be required here only.
+      return unless config.protect?
 
-      if Aikido::Zen.satisfy "rails", ">= 7.0"
-        require_relative "zen/rails_engine"
+      unless load_sources! && load_sinks!
+        config.logger.warn "Zen could not find any supported libraries or frameworks. Visit https://github.com/AikidoSec/firewall-ruby for more information."
+        return
       end
 
-      if Aikido::Zen::Sinks.registry.empty?
-        warn "Zen could not find any supported libraries or frameworks. Visit https://github.com/AikidoSec/firewall-ruby for more information."
-      end
+      middleware_installed!
     end
 
     # @!visibility private
@@ -173,15 +171,28 @@ module Aikido
       collector.middleware_installed!
     end
 
-    # Load all sinks matching libraries loaded into memory. This method should
-    # be called after all other dependencies have been loaded into memory (i.e.
-    # at the end of the initialization process).
+    # @!visibility private
+    # Load all sources.
     #
-    # If a new gem is required, this method can be called again safely.
+    # @return [Boolean] true if any sources were loaded
+    def self.load_sources!
+      if Aikido::Zen.satisfy("rails", ">= 7.0")
+        require_relative "zen/rails_engine"
+
+        return true
+      end
+
+      false
+    end
+
+    # @!visibility private
+    # Load all sinks.
     #
-    # @return [void]
+    # @return [Boolean] true if any sinks were loaded
     def self.load_sinks!
       require_relative "zen/sinks"
+
+      !Aikido::Zen::Sinks.registry.empty?
     end
 
     # @!visibility private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aikido-zen
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta.3
+  version: 1.0.1.beta.4
 platform: ruby
 authors:
 - Aikido Security
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby