Any module that references habitat settings must use the habitat from…

… that module directly to avoid method overrides. Fixes #1685 (#1686)
luckyframework · Apr 17, 2022 · 99d713c · 99d713c
1 parent 1175174
commit 99d713c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/spec/lucky/subdomain_spec.cr b/spec/lucky/subdomain_spec.cr
@@ -3,6 +3,8 @@ require "../spec_helper"
 include ContextHelper
 
 abstract class BaseAction < Lucky::Action
+  # https://github.com/luckyframework/lucky/issues/1685
+  include Lucky::ProtectFromForgery
   include Lucky::Subdomain
   accepted_formats [:html], default: :html
 end

diff --git a/src/lucky/protect_from_forgery.cr b/src/lucky/protect_from_forgery.cr
@@ -22,7 +22,7 @@ module Lucky::ProtectFromForgery
 
   private def protect_from_forgery
     set_session_csrf_token
-    if !settings.allow_forgery_protection? || request_does_not_require_protection? || valid_csrf_token?
+    if !Lucky::ProtectFromForgery.settings.allow_forgery_protection? || request_does_not_require_protection? || valid_csrf_token?
       continue
     else
       forbid_access_because_of_bad_token

diff --git a/src/lucky/subdomain.cr b/src/lucky/subdomain.cr
@@ -47,7 +47,7 @@ module Lucky::Subdomain
     return if host.nil? || IP_HOST_REGEXP.matches?(host)
 
     parts = host.split('.')
-    parts.pop(settings.tld_length + 1)
+    parts.pop(Lucky::Subdomain.settings.tld_length + 1)
 
     parts.empty? ? nil : parts.join(".")
   end