rails_multisite 2.1.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4520b9fc9764176e8b5da30cb855e9326df49403655f79d521574140b6e85b9
-  data.tar.gz: 8402996c6905b34c67b68d78ad4bfae8d2d8d440e0e71f884ff5d18ad68e62d0
+  metadata.gz: e38f660f7fbb4a5505adeb4d46f73a02f290cc65f9f566a03fc4fc7051e68392
+  data.tar.gz: 90242e454a09c2faed90d8561ac6b3de61c0d723344ac107e1fc89e23c20f0cd
 SHA512:
-  metadata.gz: f53da66c5fee3e2871a90051d72b78a87c13307a0efa3dfe443bdee4693f46344d18545e405a6079cd41f7596909a645bfdd3c7b32a362be6a61ccdc7b64f1ef
-  data.tar.gz: 9e10e10e824f77a79ed1cece3cbacc139d1c13362ed3b9d99e750aac1daca8066971ef8566b0d3df1cf389c9c2619cdefa9c7426ee9fd6e84f0ab6bbaf57b1a8
+  metadata.gz: 8a9bccdd03ddb205a20325ed127cc0e40b6e7c790147334ac9154350f5bc802e0462893541a39ab1ac0c54939d3cabadd7af455af5c779b882d93d5a4b5e4037
+  data.tar.gz: 7b0065714791944b3cabf2673f93a18277ec2cc721d85e8b5609ab94b7ff5928f8adf1500219aad4f659c27f5774e465739960c5a84468d6a0759ac07862c43b

data/README.md

@@ -93,6 +93,19 @@ To get a Rails console that is connected to `some_database_1` database:
 RAILS_DB=db_one rails console
 ```
 
+### CDN origin support
+
+To avoid needing to configure many origins you can consider using `RailsMultisite::ConnectionManagement.asset_hostnames`
+
+When configured, requests to `asset_hostname`?__ws=another.host.name will be re-routed to the correct site. Cookies will
+be stripped on all incoming requests.
+
+Example:
+
+- Multisite serves `sub.example.com` and `assets.example.com`
+- `RailsMultisite::ConnectionManagement.asset_hostnames = ['assets.example.com']`
+- Requests to `https://assets.example.com/route/?__ws=sub.example.com` will be routed to the `sub.example.com`
+
 
 ## Contributing
 

data/lib/rails_multisite/connection_management.rb

@@ -11,6 +11,10 @@ module RailsMultisite
     end
 
     def self.clear_settings!
+      @instance&.db_spec_cache&.each do |key, spec|
+        @instance.connection_handlers.delete(self.handler_key(spec))
+      end
+
       @instance = nil
     end
 
@@ -31,6 +35,14 @@ module RailsMultisite
       end
     end
 
+    def self.asset_hostnames
+      @asset_hostnames
+    end
+
+    def self.asset_hostnames=(h)
+      @asset_hostnames = h
+    end
+
     def self.config_filename
       @instance.config_filename
     end
@@ -121,17 +133,45 @@ module RailsMultisite
       end
     end
 
-    attr_reader :config_filename
+    def self.handler_key(spec)
+      @handler_key_suffix ||= begin
+        if ActiveRecord::Base.respond_to?(:writing_role)
+          "_#{ActiveRecord::Base.writing_role}"
+        else
+          ""
+        end
+      end
+
+      :"#{spec.name}#{@handler_key_suffix}"
+    end
+
+    def self.default_connection_handler=(connection_handler)
+      if @instance
+        unless connection_handler.is_a?(ActiveRecord::ConnectionAdapters::ConnectionHandler)
+          raise ArgumentError.new("Invalid connection handler")
+        end
+
+        @instance.default_connection_handler = connection_handler
+      end
+    end
+
+    attr_reader :config_filename, :db_spec_cache, :connection_handlers
+    attr_writer :default_connection_handler
 
     def initialize(config_filename)
       @config_filename = config_filename
 
-      @connection_handlers = {}
-      @db_spec_cache = {}
+      @connection_handlers = begin
+        if ActiveRecord::Base.respond_to?(:connection_handlers)
+          ActiveRecord::Base.connection_handlers
+        else
+          {}
+        end
+      end
 
+      @db_spec_cache = {}
       @default_spec = SPEC_KLASS::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
       @default_connection_handler = ActiveRecord::Base.connection_handler
-      @established_default = false
 
       @reload_mutex = Mutex.new
 
@@ -188,8 +228,7 @@ module RailsMultisite
       @db_spec_cache = new_db_spec_cache
 
       # Clean up connection handler cache.
-      # (@connection_handlers is a hash of spec => handler)
-      removed_specs.each { |s| @connection_handlers.delete(s) }
+      removed_specs.each { |s| @connection_handlers.delete(handler_key(s)) }
     end
 
     def reload
@@ -217,18 +256,14 @@ module RailsMultisite
       spec ||= @default_spec
       handler = nil
       if spec != @default_spec
-        handler = @connection_handlers[spec]
+        handler = @connection_handlers[handler_key(spec)]
         unless handler
           handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
           handler_establish_connection(handler, spec)
-          @connection_handlers[spec] = handler
+          @connection_handlers[handler_key(spec)] = handler
         end
       else
         handler = @default_connection_handler
-        if !@established_default
-          handler_establish_connection(handler, spec)
-          @established_default = true
-        end
       end
 
       ActiveRecord::Base.connection_handler = handler
@@ -343,7 +378,14 @@ module RailsMultisite
       end
 
       request = Rack::Request.new(env)
-      host = request['__ws'] || request.host
+
+      host =
+        if request['__ws'] && self.class.asset_hostnames&.include?(request.host)
+          request.cookies.clear
+          request['__ws']
+        else
+          request.host
+        end
 
       env["RAILS_MULTISITE_HOST"] = host
     end
@@ -362,5 +404,9 @@ module RailsMultisite
       handler.establish_connection(spec.config)
     end
 
+    def handler_key(spec)
+      self.class.handler_key(spec)
+    end
+
   end
 end

data/lib/rails_multisite/railtie.rb

@@ -7,20 +7,28 @@ module RailsMultisite
     end
 
     initializer "RailsMultisite.init" do |app|
-      Rails.configuration.multisite = false
+      app.config.multisite = false
 
       config_file = ConnectionManagement.default_config_filename
       if File.exist?(config_file)
         ConnectionManagement.config_filename = ConnectionManagement.default_config_filename
-        Rails.configuration.multisite = true
+        app.config.multisite = true
         Rails.logger.formatter = RailsMultisite::Formatter.new
-        app.middleware.insert_after(ActionDispatch::Executor, RailsMultisite::Middleware)
-        app.middleware.delete(ActionDispatch::Executor)
+
+        if !skip_middleware?(app.config)
+          app.middleware.insert_after(ActionDispatch::Executor, RailsMultisite::Middleware)
+          app.middleware.delete(ActionDispatch::Executor)
+        end
 
         if ENV['RAILS_DB'].present?
           ConnectionManagement.establish_connection(db: ENV['RAILS_DB'], raise_on_missing: true)
         end
       end
     end
+
+    def skip_middleware?(config)
+      return false if !config.respond_to?(:skip_multisite_middleware)
+      config.skip_multisite_middleware
+    end
   end
 end

data/lib/rails_multisite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 #
 module RailsMultisite
-  VERSION = "2.1.1"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,7 +70,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Multi tenancy support for Rails
 test_files: []