rails_multisite 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d253acd86ab0b218a43d6cf67bc7bd3948b03c8288872f75c8788ff1c54373
-  data.tar.gz: 1141a30cad5dba7992b6adc5ab1c315488789430f9bee82ba4bb0b189447d27c
+  metadata.gz: c423a9ad1f1506b7278fdad487f740236f6241a5cfced260e135cc4392f0f24d
+  data.tar.gz: 3da1e820fedb5a8ec1c7c34c41668cf62d8891bab765f554e54186688fe27464
 SHA512:
-  metadata.gz: 6a2a3ac0846e4b589a44e5285d8bba6be418e0a535c642a95f23073dcf16d51425e87d27ed74e5e58b04e25a5cc88620d7937530bd25285dd013d8e81689fb6e
-  data.tar.gz: 5520157f4aed32cc36b03e289ccb56b4f43385f7a153f64245a4ab570b13138826b8cf1d2aaac78b40b1d7231501575a53df4af0f1d56472ef267e82f90f6d92
+  metadata.gz: 68717b4c14ccf6586de353e1e455aa948e931a498fcb5816008f5f6655e6d8c896793ef635532cc056073f917f7ea6e7205e7f5bc9b4a5a581e574cee76cd47b
+  data.tar.gz: 68779aedd6acb814e8401226ef67ad9636abf3ca71c954cef89226199fd754a34f78c84c5340af2bc2216f9e560d410867837a3fd3d221c53b08449ed60ceb68

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_hostname`
+
+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_hostname = '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_hostname
+      @asset_hostname
+    end
+
+    def self.asset_hostname=(h)
+      @asset_hostname = h
+    end
+
     def self.config_filename
       @instance.config_filename
     end
@@ -98,6 +110,13 @@ module RailsMultisite
       config[:host_names].nil? ? config[:host] : config[:host_names].first
     end
 
+    def self.current_db_hostnames
+      spec = @instance.connection_spec(db: self.current_db) if @instance
+      spec ||= ActiveRecord::Base.connection_pool.spec
+      config = spec.config
+      config[:host_names].nil? ? [config[:host]] : config[:host_names]
+    end
+
     def self.connection_spec(opts)
       if @instance
         @instance.connection_spec(opts)
@@ -114,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
 
@@ -181,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
@@ -210,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
@@ -336,7 +378,14 @@ module RailsMultisite
       end
 
       request = Rack::Request.new(env)
-      host = request['__ws'] || request.host
+
+      host =
+        if request['__ws'] && request.host == self.class.asset_hostname
+          request.cookies.clear
+          request['__ws']
+        else
+          request.host
+        end
 
       env["RAILS_MULTISITE_HOST"] = host
     end
@@ -355,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.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-09-15 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: []