Change the way how login tracking is disabled for Rememberable strategy

When logging in via devise Rememberable strategy, we disable login tracking by setting @_datadog_skip_track_login_event and checking for it in patched Authenticatable#validate
DataDog · Sep 13, 2024 · 8e60850 · 8e60850
1 parent f2fe86a
commit 8e60850
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/datadog/appsec/contrib/devise/patcher.rb b/lib/datadog/appsec/contrib/devise/patcher.rb
@@ -32,7 +32,6 @@ def patch
           end
 
           def patch_authenticatable_strategy
-            ::Devise::Strategies::Authenticatable.alias_method(:__validate_datadog_authenticatable, :validate)
             ::Devise::Strategies::Authenticatable.prepend(AuthenticatablePatch)
           end
 

diff --git a/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb b/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb
@@ -15,6 +15,7 @@ module AuthenticatablePatch
             def validate(resource, &block)
               result = super
               return result unless AppSec.enabled?
+              return result if @_datadog_skip_track_login_event
 
               track_user_events_configuration = Datadog.configuration.appsec.track_user_events
 

diff --git a/lib/datadog/appsec/contrib/devise/patcher/rememberable_patch.rb b/lib/datadog/appsec/contrib/devise/patcher/rememberable_patch.rb
@@ -9,7 +9,9 @@ module Patcher
           # Rememberable strategy as Login Success events.
           module RememberablePatch
             def validate(*args)
-              __validate_datadog_authenticatable(*args)
+              @_datadog_skip_track_login_event = true
+
+              super
             end
           end
         end

diff --git a/spec/datadog/appsec/contrib/devise/patcher/authenticatable_patch_spec.rb b/spec/datadog/appsec/contrib/devise/patcher/authenticatable_patch_spec.rb
@@ -90,8 +90,6 @@ def validate(resource, &block)
           @result
         end
 
-        alias_method :__validate_datadog_authenticatable, :validate
-
         prepend Datadog::AppSec::Contrib::Devise::Patcher::AuthenticatablePatch
         prepend Datadog::AppSec::Contrib::Devise::Patcher::RememberablePatch