pg_rls 0.0.2.6.11 → 0.0.2.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961e2929b7e30e78b3900be5b998f918b5ffac245f908ee0d1759fb36f4cdc9f
-  data.tar.gz: 5be148679ce859f8140e10d5d467b4007988a162d6f5f3b812f6996176642c92
+  metadata.gz: f20b589d7f7ad97bcbf75f1e0ff592e7fc27abe088f14f63ef2bf85316330bb5
+  data.tar.gz: 927b254ebe42c9d93cd444a178f17d7b60b3cb5f47937123f5d3c1c7b037af18
 SHA512:
-  metadata.gz: 0171035774710f89e5b5b7b46f379eefadbabb681e9edd65faea4b55a741b29b7550921a03704c011406ede9b559223a09bb22846beb1f6d88340be4c180a0e2
-  data.tar.gz: c2d07c0b91cf14714937ccfb3c59fc875e28b83c20c025e87ae31d2d3299298bacbc5b99612023f3c5235ae6d95b12f4b45864e20f17472760b5a6a2f9df11a4
+  metadata.gz: 5e8f8fa951cf0e544515423ff63379e13741ee777cf189725e7bbd3e75b6df091bf895e6f879f97c058f8ee7845b98178b3fd4121cdc86ef7322db94054c5fe6
+  data.tar.gz: b94f0eae566441c7e694bff41a4b3100bdfc7f2476bd5a5a6ddedfb3c793a8cd35ca805e6f36e722dace5410649d7d897425c0702392b69a077abda857d91795

data/.rubocop.yml

@@ -159,4 +159,4 @@ Style/GuardClause:
     - lib/generators/pg_rls/active_record/active_record_generator.rb
 Naming/AccessorMethodName:
   Exclude:
-    - lib/pg_rls/tenant.rb
+    - lib/pg_rls/tenant.rb

data/lib/generators/templates/pg_rls.rb.tt

@@ -27,18 +27,18 @@ PgRls.setup do |config|
   ## which is autopopulated on each request
   # config.solo_mode = true
 
+  ## ------------------------------ Middleware SetResetConnection -----------------------------
+  ## Uncomment this lines if you're using SetResetConnection Middleware
+  #
+  # config.session_store_server = Rails.application.config_for(:redis).session
+  #
+  ## Uncomment this line if you're not using warden as your authentication system or if you
+  ## changed the default warden key. Devise, uses warden authentication.
+  # config.session_store_default_warden_key = '2'
+  #
+  ## Uncomment this line if you're setting a diferent session key than stablished under your
+  ## redis server configuration
+  # config.session_key_prefix = '_hub_session'
   ##
-  ## After installing the PgRls gem, you can add the `PgRls::Middleware::SetResetConnection`
-  ## middleware to your Rails application to secure all database connections using Row Level Security.
-  ## To add the middleware using the `middleware.use` method, add the following
-  ## lines to your `config/application.rb` file:
-  ## require 'pg_rls/middleware/set_reset_connection'
-  ## config.middleware.use PgRls::Middleware::SetResetConnection
-  ## Note: Be sure to add the `PgRls::Middleware::SetResetConnection` middleware after any
-  ## middleware that sets up the Rails session, since the RLS middleware depends
-  ## on the presence of the session to work correctly.
-  ## Additionally, you will need to manually require the `PgRls::Middleware::SetResetConnection`
-  ## file in your application, as shown in the first line of the code snippet above.
-  # config.session_key = '_hub_sessions'
-  # config.session_prefix = '_session_id:2::'
+  ## ------------------------------ Middleware SetResetConnection -----------------------------
 end

data/lib/pg_rls/middleware/set_reset_connection.rb

@@ -1,5 +1,43 @@
 # frozen_string_literal: true
 
+module PgRls
+  class FrozenConfiguration < StandardError; end
+
+  def self.sessions
+    @sessions ||= Redis.new(@session_store_server)
+  end
+
+  def self.session_prefix
+    @session_prefix ||= begin
+      store_default_warden_key = @session_store_default_warden_key || '2'
+
+      "#{session_key_prefix}:#{store_default_warden_key}::"
+    end
+  end
+
+  def self.session_store_server=(opts = {})
+    raise Errors::FrozenConfiguration unless @sessions.nil?
+
+    @session_store_server = opts.deep_symbolize_keys
+  end
+
+  def self.session_store_default_warden_key=(val)
+    raise Errors::FrozenConfiguration unless @sessions.nil?
+
+    @session_store_default_warden_key = val
+  end
+
+  def self.session_key_prefix
+    @session_key_prefix ||= @session_key_prefix || @session_store_server[:key_prefix]
+  end
+
+  def self.session_key_prefix=(val)
+    raise Errors::FrozenConfiguration unless @sessions.nil?
+
+    @session_key_prefix = val
+  end
+end
+
 module PgRls
   module Middleware
     # Set RLS if sessions present.
@@ -26,7 +64,7 @@ module PgRls
         cookie_string = env['HTTP_COOKIE']
         return if cookie_string.nil?
 
-        cookie_regex = /#{PgRls.session_key}=([^;]+)/
+        cookie_regex = /#{PgRls.session_key_prefix}=([^;]+)/
         match = cookie_regex.match(cookie_string)
         match[1] if match
       end
@@ -36,8 +74,15 @@ module PgRls
 
         return if cookie.blank?
 
-        sessions = Rails.cache.read("#{PgRls.session_prefix}#{Digest::SHA256.hexdigest(cookie)}")
-        sessions['_tenant'] if sessions.present?
+        redis_session_key = "#{PgRls.session_prefix}#{Digest::SHA256.hexdigest(cookie)}"
+        tenant_session = Marshal.load(PgRls.sessions.get(redis_session_key))
+
+        return if tenant_session.blank?
+        return if tenant_session['_tenant'].blank?
+
+        tenant_session['_tenant'] if tenant_session.present?
+      rescue TypeError
+        nil
       end
 
       def rails_active_storage_request?(env)

data/lib/pg_rls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRls
-  VERSION = '0.0.2.6.11'
+  VERSION = '0.0.2.6.12'
 end

data/lib/pg_rls.rb

@@ -148,12 +148,6 @@ module PgRls
   mattr_accessor :test_inline_tenant
   @@test_inline_tenant = false
 
-  mattr_accessor :session_key
-  @@session_key = '_hub_sessions'
-
-  mattr_accessor :session_prefix
-  @@session_prefix = '_session_id:2::'
-
   mattr_accessor :search_methods
   @@search_methods = %i[subdomain id tenant_id]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6.11
+  version: 0.0.2.6.12
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler