super_settings 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c33c68388f12bb6216f928e778f5a4965bf11f263bc315f0a9ce9261f9d4637
-  data.tar.gz: fc7e9bd62a5412843c0da1a2accf93812869ae85cf91c8b7accd0eb496c9cf00
+  metadata.gz: 290e32e0c4e0a4512fa7e4192a91fd9e654d1500a28bae270c8f21ec9c1a8478
+  data.tar.gz: 11ff70806b5849faae35e1d05f226af696f40a0f60334880fe0944d7770d48c1
 SHA512:
-  metadata.gz: d85f6b31e1757e36fbfe6486851ee2ccfdf10b13bca742ed90910898761c2215ca053ee2a91ad204b65913d765b66084b03e802544985c3d3c263d692c54480d
-  data.tar.gz: 17a61ebac8696d0d2b1ca09229b0826d8885853e858f3ebcb2956cad00d56cf35f9e0928afc4c4e0987d270be3b9b23ab52cf18c91c91874281e3ac2239e81ad
+  metadata.gz: 912971873912df17a2ff9eb3c2462356161fb19ee7bb2c127264f12b59cfff2282ad1084eb62c3e62ec91afed8a49de22ad3fc0cb30a40d2982e230a951765dc
+  data.tar.gz: b843b3b01bbd4ab7e8a91328c20134379bb6f5a218d7bef0a34f0b3868aed9b7f41746b1cbb3949e76f3b22290fd44be7ec0e4a1af360057e7235bb2ac0f4fc7

data/CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.6.1
+
+### Security
+
+- Fixed a stored cross-site scripting (XSS) vulnerability where a setting key was interpolated into the history pagination links in the web UI without HTML escaping. A user with write access could craft a key that executed JavaScript in another user's browser.
+
+### Fixed
+
+- Fixed `Setting.save!` raising a `NoMethodError` in non-Rails applications that relied on the implicit ActiveRecord storage default. The transaction now resolves the storage class through the public accessor instead of the uninitialized instance variable.
+- Fixed `LocalCache#to_h` returning only the first element of `array` type settings. It now returns the full array value.
+- Fixed `Setting#save!` always updating the `updated_at` timestamp (and triggering a write) even when nothing had changed, which caused unnecessary cache invalidation across processes.
+- Fixed a race condition in `LocalCache` where a value read on a cache miss could overwrite a fresher value written by a concurrent refresh.
+- Fixed `LocalCache#refresh` never picking up newly added settings if the cache had been loaded while the data store was empty.
+- Fixed `LocalCache` returning mutable array values for settings added by a cache refresh or a cache miss. All cached values are now frozen so callers cannot mutate the shared cache.
+- Fixed the web UI history view failing to render when a history record has no timestamp.
+- Fixed a duplicate-key race in `ActiveRecordStorage#save!` that raised an unhandled `ActiveRecord::RecordNotUnique` when the same key was created concurrently. The conflict is now retried and merged.
+- Fixed a bulk update against `HttpStorage` silently reporting success when the remote API rejected the changes. `bulk_update` now returns `false` and `save!` raises a `SuperSettings::Setting::PersistenceError` in this case so storage failures can be distinguished from validation errors. The storage failure message is reported in the `errors` payload so the web UI and API clients are told why the update failed.
+- Fixed thread-safety issues in the cached S3 and MongoDB clients that could expose a stale client or permanently cache a `nil` client after a transient connection failure.
+- Fixed `MongoDBStorage.find_by_key` returning records that reported `persisted?` as `false`.
+- Fixed the escaping of `SuperSettings.authentication_url` when injected into the inline web UI JavaScript. URLs containing single quotes previously produced corrupted or invalid JavaScript.
+- Fixed the Rack application returning 404 for all routes when mounted under a path (e.g. via `map` or Rails `mount`) without repeating the mount path in the constructor.
+- Fixed `HttpClient` corrupting base URLs that include a query string when appending the trailing path separator.
+- Fixed `HttpClient` retrying non-idempotent POST requests after a connection error, which could apply an update twice. The retry of a GET request now discards the failed connection instead of reusing it.
+- Fixed the `/settings/updated_since` endpoint returning a 500 (or a misleading empty success) when the `time` parameter was missing or unparseable. It now returns a 400 Bad Request.
+- Fixed the web UI POST endpoint returning a 500 for malformed JSON request bodies instead of a 400 Bad Request. The endpoint now also returns a 400 Bad Request when the `settings` parameter is missing or is not an array of hashes.
+- Fixed an authenticated but unauthorized user being redirected to the login page (a potential redirect loop) instead of receiving a 403 Forbidden.
+- Fixed the Rails layout helper using the raw dark mode selector instead of the resolved value, which could render a page with mismatched light/dark styling.
+- Fixed `Coerce.boolean` returning `true` for a whitespace-only string.
+- Fixed the Rails engine eagerly loading `ActiveJob::Base` during initialization.
+- Added a missing `require "time"` so `Time.parse` based coercion works in non-Rails applications.
+
 ## 2.6.0
 
 ### Added

data/README.md

@@ -468,7 +468,7 @@ This will work out of the box with the defaults for the storage engines when run
 
 - `REDIS_URL` - `redis://localhost:6379/0`
 - `REST_API_URL` - `http://localhost:3000/settings` (this is the default URL for the Rails application)
-- `S3_URL` - `s3://accesskey:secretkey@region-1/settings/settings.json` (the S3 endpoint will be set to `http://localhost:9000`)
+- `S3_URL` - `s3://accesskey:secretkey@region-1/settings/settings.json` (the S3 endpoint will be set to `http://localhost:24456`)
 - `MONGODB_URL` - `mongodb://localhost:27017/super_settings`
 
 ## License

data/VERSION

@@ -1 +1 @@
-2.6.0
+2.6.1

data/app/helpers/super_settings/settings_helper.rb

@@ -29,7 +29,7 @@ module SuperSettings
       application_dir = File.expand_path(File.join("..", "..", "..", "lib", "super_settings", "application"), __dir__)
       erb = ERB.new(File.read(File.join(application_dir, "layout_vars.css.erb")))
       color_scheme = SuperSettings.configuration.controller.color_scheme
-      dark_mode_selector = SuperSettings.configuration.controller.dark_mode_selector
+      dark_mode_selector = SuperSettings.configuration.controller.resolved_dark_mode_selector
       erb.result(binding).html_safe
     end
   end

data/lib/super_settings/application/helper.rb

@@ -56,7 +56,7 @@ module SuperSettings
           window.__superSettingsI18n = #{translations_json};
           #{File.read(File.join(__dir__, "scripts.js"))}
           #{File.read(File.join(__dir__, "api.js"))}
-          #{"SuperSettingsAPI.authenticationUrl = '#{SuperSettings.authentication_url.gsub("'", "\\'")}';" if SuperSettings.authentication_url}
+          #{"SuperSettingsAPI.authenticationUrl = #{SuperSettings.authentication_url.to_s.to_json.gsub("</", "<\\/")};" if SuperSettings.authentication_url}
           #{SuperSettings.web_ui_javascript}
         </script>
       HTML

data/lib/super_settings/application/scripts.js

@@ -413,8 +413,13 @@
     const historyItems = parent.querySelector(".super-settings-history-items");
     let itemsHTML = "";
     payload.histories.forEach(function(history) {
-      const date = new Date(Date.parse(history.created_at));
-      const dateString = dateFormatter().format(date);
+      let dateString = "";
+      if (history.created_at) {
+        const timestamp = Date.parse(history.created_at);
+        if (!isNaN(timestamp)) {
+          dateString = dateFormatter().format(new Date(timestamp));
+        }
+      }
       const value = (history.deleted ? '<em class="super-settings-text-danger">' + escapeHTML(t("history.deleted")) + '</em>' : escapeHTML(history.value));
       itemsHTML += `<div class="super-settings-history-item">
         <div class="super-settings-history-time">${escapeHTML(dateString)}</div>
@@ -427,10 +432,10 @@
     if (payload.previous_page_params || payload.next_page_params) {
       let paginationHTML = `<div class="super-settings-align-center">`;
       if (payload.previous_page_params) {
-        paginationHTML += `<div style="float:left;"><a href="#" class="js-show-history" title="${escapeHTML(t("history.newer"))}" data-offset="${payload.previous_page_params.offset}" data-limit="${payload.previous_page_params.limit}" data-key="${payload.previous_page_params.key}")>&#8592; ${escapeHTML(t("history.newer"))}</a></div>`;
+        paginationHTML += `<div style="float:left;"><a href="#" class="js-show-history" title="${escapeHTML(t("history.newer"))}" data-offset="${payload.previous_page_params.offset}" data-limit="${payload.previous_page_params.limit}" data-key="${escapeHTML(payload.previous_page_params.key)}">&#8592; ${escapeHTML(t("history.newer"))}</a></div>`;
       }
       if (payload.next_page_params) {
-        paginationHTML += `<div style="float:right;"><a href="#" class="js-show-history" title="${escapeHTML(t("history.older"))}" data-offset="${payload.next_page_params.offset}" data-limit="${payload.next_page_params.limit}" data-key="${payload.next_page_params.key}")>${escapeHTML(t("history.older"))} &#8594;</a></div>`;
+        paginationHTML += `<div style="float:right;"><a href="#" class="js-show-history" title="${escapeHTML(t("history.older"))}" data-offset="${payload.next_page_params.offset}" data-limit="${payload.next_page_params.limit}" data-key="${escapeHTML(payload.next_page_params.key)}">${escapeHTML(t("history.older"))} &#8594;</a></div>`;
       }
       paginationHTML += '<div style="clear:both;"></div>';
       parent.querySelector(".super-settings-history-container").insertAdjacentHTML("afterend", paginationHTML);

data/lib/super_settings/application.rb

@@ -45,20 +45,12 @@ module SuperSettings
       html
     end
 
-    # Render the edit form HTML for a single setting.
-    #
-    # @return [String] the rendered HTML
-    def render_edit
-      template = ERB.new(File.read(File.expand_path(File.join("application", "edit.html.erb"), __dir__)))
-      html = template.result(binding)
-      html = render_layout { html } if @layout
-      html = html.html_safe if html.respond_to?(:html_safe)
-      html
-    end
-
     private
 
-    def render_layout
+    # The block is not called directly here; it is yielded to from the `<%= yield %>` call
+    # in the layout template which is evaluated with this method's binding. The block argument
+    # must be declared so that Ruby doesn't warn that the block may be ignored.
+    def render_layout(&block)
       @layout&.result(binding)
     end
   end

data/lib/super_settings/coerce.rb

@@ -21,13 +21,10 @@ module SuperSettings
       # @param value [Object]
       # @return [Boolean]
       def boolean(value)
-        if value == false
-          false
-        elsif blank?(value)
-          nil
-        else
-          !FALSE_VALUES.include?(value.to_s.downcase)
-        end
+        return false if value == false
+        return nil if blank?(value)
+
+        !FALSE_VALUES.include?(value.to_s.downcase)
       end
 
       # Cast a value to a Time object.

data/lib/super_settings/configuration.rb

@@ -206,21 +206,28 @@ module SuperSettings
       @model = Model.new
       @controller = Controller.new
       @deferred_configs = []
+      @called = false
     end
 
     # Defer the execution of a block that will be yielded to with the config object. This
     # is needed in a Rails environment during initialization so that all the frameworks can
-    # load before loading the settings.
+    # load before loading the settings. If the deferred configuration has already been run
+    # (i.e. the application has finished initializing), the block is called immediately.
     #
     # @api private
     def defer(&block)
-      @deferred_configs << block
+      if @called
+        block.call(self)
+      else
+        @deferred_configs << block
+      end
     end
 
     # Call the block deferred during initialization.
     #
     # @api private
     def call
+      @called = true
       while (block = @deferred_configs.shift)
         block&.call(self)
       end

data/lib/super_settings/controller_actions.rb

@@ -75,7 +75,12 @@ module SuperSettings
 
     # API endpoint for getting settings that have changed since specified time. See SuperSettings::RestAPI for details.
     def updated_since
-      render json: SuperSettings::RestAPI.updated_since(params[:time])
+      result = SuperSettings::RestAPI.updated_since(params[:time])
+      if result
+        render json: result
+      else
+        render json: {error: "Invalid time parameter"}, status: 400
+      end
     end
 
     # API endpoint for checking if the user is authorized to edit settings.

data/lib/super_settings/engine.rb

@@ -10,8 +10,8 @@ module SuperSettings
     initializer("SuperSettings") do
       Rails.configuration.middleware.unshift(SuperSettings::Context::RackMiddleware)
 
-      if defined?(ActiveJob::Base.around_perform)
-        ActiveJob::Base.around_perform do |job, block|
+      ActiveSupport.on_load(:active_job) do
+        around_perform do |job, block|
           SuperSettings.context(&block)
         end
       end

data/lib/super_settings/http_client.rb

@@ -27,8 +27,8 @@ module SuperSettings
     end
 
     def initialize(base_url, headers: nil, params: nil, timeout: nil, user: nil, password: nil)
-      base_url = "#{base_url}/" unless base_url.end_with?("/")
       @base_uri = URI(base_url)
+      @base_uri.path = "#{@base_uri.path}/" unless @base_uri.path.end_with?("/")
       @base_uri.query = query_string(params) if params
       @headers = headers ? DEFAULT_HEADERS.merge(headers) : DEFAULT_HEADERS
       @timeout = timeout || DEFAULT_TIMEOUT
@@ -53,34 +53,35 @@ module SuperSettings
 
     def send_request(request)
       set_headers(request)
-      response_payload = nil
       attempts = 0
 
-      with_connection do |http|
-        http.start unless http.started?
-        response = http.request(request)
-
-        begin
-          response.value # raises exception unless response is a success
-          response_payload = JSON.parse(response.body)
-        rescue Net::ProtocolError
-          if [404, 410].include?(response.code.to_i)
-            raise NotFoundError.new("#{response.code} #{response.message}")
-          elsif response.code.to_i == 422
-            raise InvalidRecordError.new("#{response.code} #{response.message}", errors: JSON.parse(response.body)["errors"])
-          else
-            raise Error.new("#{response.code} #{response.message}")
+      begin
+        with_connection do |http|
+          http.start unless http.started?
+          response = http.request(request)
+
+          begin
+            response.value # raises exception unless response is a success
+            JSON.parse(response.body)
+          rescue Net::ProtocolError
+            if [404, 410].include?(response.code.to_i)
+              raise NotFoundError.new("#{response.code} #{response.message}")
+            elsif response.code.to_i == 422
+              raise InvalidRecordError.new("#{response.code} #{response.message}", errors: JSON.parse(response.body)["errors"])
+            else
+              raise Error.new("#{response.code} #{response.message}")
+            end
+          rescue JSON::JSONError => e
+            raise Error.new(e.message)
           end
-        rescue JSON::JSONError => e
-          raise Error.new(e.message)
         end
-      rescue IOError, Errno::ECONNRESET => connection_error
+      rescue IOError, Errno::ECONNRESET, Errno::EPIPE => connection_error
+        # Only retry idempotent requests; a POST may have already been processed by
+        # the server before the connection failed.
         attempts += 1
-        retry if attempts <= 1
+        retry if attempts <= 1 && request.is_a?(Net::HTTP::Get)
         raise connection_error
       end
-
-      response_payload
     end
 
     def with_connection(&block)

data/lib/super_settings/local_cache.rb

@@ -12,10 +12,6 @@ module SuperSettings
     NOT_DEFINED = Object.new.freeze
     private_constant :NOT_DEFINED
 
-    # @private
-    DRIFT_FACTOR = 10
-    private_constant :DRIFT_FACTOR
-
     # Number of seconds that the cache will be considered fresh. The database will only be
     # checked for changed settings at most this often.
     attr_reader :refresh_interval
@@ -47,13 +43,15 @@ module SuperSettings
           value = NOT_DEFINED
         else
           setting = Setting.find_by_key(key)
-          value = (setting ? setting.value : NOT_DEFINED)
+          value = (setting ? setting.value.freeze : NOT_DEFINED)
           # Guard against caching too many cache missees; at some point it's better to slam
           # the database rather than run out of memory.
           if setting || @cache.size < 100_000
             @lock.synchronize do
-              # For case where one thread could be iterating over the cache while it's updated causing an error
-              @cache = @cache.merge(key => value).freeze
+              # Don't overwrite an entry added by a concurrent refresh; it is at least as
+              # fresh as the value read here. A new hash is set so that one thread can
+              # iterate over the cache while it's updated without causing an error.
+              @cache = @cache.merge(key => value).freeze unless @cache.include?(key)
             end
           end
         end
@@ -91,8 +89,7 @@ module SuperSettings
     def to_h
       ensure_cache_up_to_date!
       hash = {}
-      @cache.each do |key, data|
-        value, _ = data
+      @cache.each do |key, value|
         hash[key] = value unless value == NOT_DEFINED
       end
       hash
@@ -150,8 +147,6 @@ module SuperSettings
         return if @refreshing
 
         @next_check_at = Time.now + @refresh_interval
-        return if @cache.empty?
-
         @refreshing = true
       end
 
@@ -199,7 +194,7 @@ module SuperSettings
       return if Coerce.blank?(setting.key)
 
       @lock.synchronize do
-        @cache = @cache.merge(setting.key => setting.value)
+        @cache = @cache.merge(setting.key => setting.value.freeze).freeze
       end
     end
 
@@ -220,7 +215,7 @@ module SuperSettings
       changed_settings = {}
       start_time = Time.now
       Setting.updated_since(last_refresh_time - 1).each do |setting|
-        value = (setting.deleted? ? NOT_DEFINED : setting.value)
+        value = (setting.deleted? ? NOT_DEFINED : setting.value.freeze)
         changed_settings[setting.key] = value
       end
       set_cache_values(start_time) { @cache.merge(changed_settings) }
@@ -249,13 +244,5 @@ module SuperSettings
         @cache = block.call.freeze
       end
     end
-
-    # Recursively freeze a hash.
-    def deep_freeze_hash(hash)
-      hash.each_value do |value|
-        deep_freeze_hash(value) if value.is_a?(Hash)
-      end
-      hash.freeze
-    end
   end
 end

data/lib/super_settings/mini_i18n.rb

@@ -78,21 +78,21 @@ module SuperSettings
       # Load every JSON file from the locales directory, keyed by filename
       # stem (e.g. "en").
       def load_all_locales
-        if development_mode?
-          @mutex.synchronize { @cache = {} }
-        end
-
-        return @cache unless @cache.empty?
+        return @cache unless @cache.empty? || development_mode?
 
         @mutex.synchronize do
-          return @cache unless @cache.empty?
+          return @cache unless @cache.empty? || development_mode?
 
+          # Build into a new hash so that other threads never see a partially
+          # loaded cache.
+          cache = {}
           Dir.glob(File.join(locales_dir, "*.json")).each do |path|
             code = File.basename(path, ".json").downcase
-            @cache[code] = JSON.parse(File.read(path))
+            cache[code] = JSON.parse(File.read(path))
           rescue JSON::ParserError
             # Skip malformed locale files
           end
+          @cache = cache
         end
 
         @cache
@@ -103,7 +103,8 @@ module SuperSettings
       end
 
       def development_mode?
-        ENV.fetch("RACK_ENV", ENV.fetch("RAILS_ENV", "development")) == "development"
+        env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "development"
+        env == "development"
       end
     end
   end

data/lib/super_settings/rack_application.rb

@@ -52,8 +52,10 @@ module SuperSettings
     def call(env)
       if @path_prefix.empty? || "#{env["SCRIPT_NAME"]}#{env["PATH_INFO"]}".start_with?(@path_prefix)
         handle_request(env)
-      else
+      elsif @app
         @app.call(env)
+      else
+        [404, {"content-type" => "text/plain"}, ["Not found"]]
       end
     end
 
@@ -129,7 +131,16 @@ module SuperSettings
 
     def handle_request(env)
       request = Rack::Request.new(env)
-      path = request.path[@path_prefix.length, request.path.length]
+      script_name = env["SCRIPT_NAME"].to_s
+      full_path = "#{script_name}#{env["PATH_INFO"]}"
+      path = if !@path_prefix.empty? && full_path.start_with?(@path_prefix)
+        full_path[@path_prefix.length, full_path.length]
+      elsif @path_prefix.empty? && !script_name.empty?
+        # The application is mounted at SCRIPT_NAME, which the router has already consumed.
+        env["PATH_INFO"].to_s
+      else
+        full_path
+      end
       if request.get?
         if (path == "/" || path == "") && web_ui_enabled?
           return handle_root_request(request)
@@ -197,10 +208,10 @@ module SuperSettings
         [200, headers, [application.render]]
       end
 
-      if [401, 403].include?(response.first)
-        if SuperSettings.authentication_url
-          response = [302, {"location" => SuperSettings.authentication_url}, []]
-        end
+      # Only unauthenticated requests are redirected to the login page. An authenticated
+      # user who is denied access would just be bounced back here in a redirect loop.
+      if response.first == 401 && SuperSettings.authentication_url
+        response = [302, {"location" => SuperSettings.authentication_url}, []]
       end
 
       response
@@ -225,7 +236,11 @@ module SuperSettings
 
     def handle_update_request(request)
       check_authorization(request, write_required: true) do |user|
-        result = SuperSettings::RestAPI.update(post_params(request)["settings"], changed_by(user))
+        params = post_params(request)
+        settings = params["settings"] if params
+        next json_response(400, error: "Invalid request") unless valid_settings_params?(settings)
+
+        result = SuperSettings::RestAPI.update(settings, changed_by(user))
         if result[:success]
           json_response(200, result)
         else
@@ -253,7 +268,12 @@ module SuperSettings
 
     def handle_updated_since_request(request)
       check_authorization(request) do |user|
-        json_response(200, RestAPI.updated_since(request.params["time"]))
+        result = RestAPI.updated_since(request.params["time"])
+        if result
+          json_response(200, result)
+        else
+          json_response(400, error: "Invalid time parameter")
+        end
       end
     end
 
@@ -323,12 +343,24 @@ module SuperSettings
       nil
     end
 
+    # Returns the request parameters merged with any JSON request body. Returns nil
+    # if the request body is not valid JSON.
     def post_params(request)
       if request.content_type.to_s.match?(/\Aapplication\/json/i) && request.body
-        request.params.merge(JSON.parse(request.body.read))
+        body = JSON.parse(request.body.read)
+        return nil unless body.is_a?(Hash)
+
+        request.params.merge(body)
       else
         request.params
       end
+    rescue JSON::ParserError
+      nil
+    end
+
+    # The settings parameter in an update request must be an array of hashes.
+    def valid_settings_params?(settings)
+      settings.is_a?(Array) && settings.all? { |setting| setting.is_a?(Hash) }
     end
   end
 end

data/lib/super_settings/rest_api.rb

@@ -163,7 +163,7 @@ module SuperSettings
         end
 
         payload[:histories] = histories.collect do |history|
-          history_values = {value: history.value, changed_by: history.changed_by_display, created_at: history.created_at.utc.iso8601(6)}
+          history_values = {value: history.value, changed_by: history.changed_by_display, created_at: history.created_at&.utc&.iso8601(6)}
           history_values[:deleted] = true if history.deleted?
           history_values
         end
@@ -209,9 +209,15 @@ module SuperSettings
       #     ...
       #   ]
       #
-      # @return [Hash] hash with settings array
+      # @return [Hash, nil] hash with settings array or nil if the time is missing or unparseable
       def updated_since(time)
-        time = Coerce.time(time)
+        time = begin
+          Coerce.time(time)
+        rescue ArgumentError
+          nil
+        end
+        return nil if time.nil?
+
         settings = Setting.updated_since(time).reject(&:deleted?)
         {settings: settings.collect(&:as_json)}
       end

data/lib/super_settings/setting.rb

@@ -30,6 +30,10 @@ module SuperSettings
     class InvalidRecordError < StandardError
     end
 
+    # Exception raised if the storage engine could not persist valid changes.
+    class PersistenceError < StandardError
+    end
+
     include Attributes
 
     # The changed_by attribute is used to temporarily store an identifier for the user
@@ -164,12 +168,23 @@ module SuperSettings
       def bulk_update(params, changed_by = nil)
         all_valid, settings = update_settings(params, changed_by)
         if all_valid
-          storage.with_connection do
-            transaction do |_changes|
-              settings.each do |setting|
-                setting.save!
+          begin
+            storage.with_connection do
+              transaction do |_changes|
+                settings.each do |setting|
+                  setting.save!
+                end
               end
             end
+          rescue InvalidRecordError, PersistenceError => e
+            # Validation failures detected by save! are already recorded on the setting that
+            # failed. A storage level failure isn't attributable to any single setting, so
+            # record it on all of them; otherwise callers would get a failure with no
+            # explanation of what went wrong.
+            if settings.none? { |setting| setting.errors.any? }
+              settings.each { |setting| setting.send(:add_base_error, e.message) }
+            end
+            return [false, settings]
           end
           clear_last_updated_cache
         end
@@ -214,7 +229,7 @@ module SuperSettings
         Thread.current[:super_settings_transaction] = changes
 
         begin
-          @storage.transaction(&block)
+          storage.transaction(&block)
 
           clear_last_updated_cache
 
@@ -382,7 +397,7 @@ module SuperSettings
     # @param val [String]
     def description=(val)
       val = val&.to_s
-      val = nil if val&.empty?
+      val = nil if val && val.empty?
       will_change!(:description, val) unless description == val
       @record.description = val
     end
@@ -484,12 +499,12 @@ module SuperSettings
         raise InvalidRecordError.new(errors.values.join("; "))
       end
 
+      return if @changes.empty?
+
       timestamp = Time.now
       self.created_at ||= timestamp
       self.updated_at = timestamp if updated_at.nil? || !changed?(:updated_at)
 
-      return if @changes.empty?
-
       self.class.storage.with_connection do
         self.class.transaction do
           record_value_change
@@ -664,7 +679,7 @@ module SuperSettings
 
     def raw_value=(val)
       val = val&.to_s
-      val = nil if val&.empty?
+      val = nil if val && val.empty?
       will_change!(:raw_value, val) unless raw_value == val
       @raw_value = val
       @record.raw_value = val
@@ -706,6 +721,17 @@ module SuperSettings
       attribute_errors << "#{attribute.tr("_", " ")} #{message}"
     end
 
+    # Record an error that applies to the record as a whole rather than to one attribute.
+    # The message is used verbatim since there is no attribute name to prefix it with.
+    def add_base_error(message)
+      base_errors = @errors["base"]
+      unless base_errors
+        base_errors = []
+        @errors["base"] = base_errors
+      end
+      base_errors << message
+    end
+
     def call_after_save_callbacks
       self.class.after_save_blocks.each do |block|
         block.call(self)

data/lib/super_settings/storage/active_record_storage.rb

@@ -103,22 +103,37 @@ module SuperSettings
       def save!
         # Check if another record with the same key exists. If it does, then we need to update
         # that record instead and delete the current one.
-        duplicate = @model.class.find_by(key: @model.key)
-        if duplicate.nil? || duplicate == @model
-          @model.save!
-        else
-          duplicate.raw_value = @model.raw_value
-          duplicate.value_type = @model.value_type
-          duplicate.description = @model.description
-          duplicate.deleted = @model.deleted
-
-          @model.transaction do
-            if @model.persisted?
-              @model.reload.update!(deleted: true)
+        attempts = 0
+        begin
+          # Each attempt runs in a savepoint so a duplicate key failure can be rolled back
+          # and retried; otherwise the surrounding transaction would be left in an aborted
+          # state on PostgreSQL.
+          @model.class.transaction(requires_new: true) do
+            duplicate = @model.class.find_by(key: @model.key)
+            if duplicate.nil? || duplicate == @model
+              @model.save!
+            else
+              duplicate.raw_value = @model.raw_value
+              duplicate.value_type = @model.value_type
+              duplicate.description = @model.description
+              duplicate.deleted = @model.deleted
+
+              if @model.persisted?
+                begin
+                  @model.reload.update!(deleted: true)
+                rescue ActiveRecord::RecordNotFound
+                end
+              end
+              duplicate.save!
+              @model = duplicate
             end
-            duplicate.save!
           end
-          @model = duplicate
+        rescue ActiveRecord::RecordNotUnique
+          # A record with the same key was inserted concurrently; retry so it is
+          # found as a duplicate and merged.
+          attempts += 1
+          retry if attempts <= 1
+          raise
         end
       end
 

data/lib/super_settings/storage/json_storage.rb

@@ -11,6 +11,11 @@ module SuperSettings
     # This class can be used as the base for any storage class where the settings are all stored
     # together in a single JSON payload.
     #
+    # Writes are serialized within a process, but there is no coordination between processes.
+    # If multiple processes write settings at the same time, the last write wins and can
+    # overwrite changes made by another process. Storage backends based on this class are best
+    # suited for setups where settings are updated from a single process at a time.
+    #
     # Subclasses must implement the following methods:
     # - self.all
     # - self.last_updated_at
@@ -18,6 +23,12 @@ module SuperSettings
     class JSONStorage < StorageAttributes
       include Transaction
 
+      # Mutex used to serialize the read-modify-write cycle in save_all within a process.
+      # Note that this cannot protect against concurrent writes from multiple processes;
+      # in that situation the last writer wins and can overwrite another process's changes.
+      SAVE_MUTEX = Mutex.new
+      private_constant :SAVE_MUTEX
+
       class HistoryStorage < HistoryAttributes
         class << self
           def create!(attributes)
@@ -65,50 +76,52 @@ module SuperSettings
         end
 
         def save_all(changes)
-          existing = {}
-          parse_settings(settings_json_payload).each do |setting|
-            existing[setting.key] = setting
-          end
+          SAVE_MUTEX.synchronize do
+            existing = {}
+            parse_settings(settings_json_payload).each do |setting|
+              existing[setting.key] = setting
+            end
 
-          history_items = []
-          changes.each do |record|
-            if record.is_a?(HistoryStorage)
-              history_items << record
-            else
-              existing[record.key] = record
+            history_items = []
+            changes.each do |record|
+              if record.is_a?(HistoryStorage)
+                history_items << record
+              else
+                existing[record.key] = record
+              end
             end
-          end
 
-          settings = existing.values.sort_by(&:key)
+            settings = existing.values.sort_by(&:key)
 
-          changed_histories = {}
-          history_items.each do |history_item|
-            setting = existing[history_item.key]
-            next unless setting
+            changed_histories = {}
+            history_items.each do |history_item|
+              setting = existing[history_item.key]
+              next unless setting
 
-            history = changed_histories[history_item.key]
-            unless history
-              history = setting.history.dup
-              changed_histories[history_item.key] = history
+              history = changed_histories[history_item.key]
+              unless history
+                history = setting.history.dup
+                changed_histories[history_item.key] = history
+              end
+              history.unshift(history_item)
             end
-            history.unshift(history_item)
-          end
 
-          settings_json = JSON.dump(settings.collect(&:as_json))
-          save_settings_json(settings_json)
-
-          changed_histories.each do |setting_key, setting_history|
-            ordered_history = setting_history.sort_by { |history_item| history_item.created_at }.reverse
-            payload = ordered_history.collect do |history_item|
-              {
-                value: history_item.value,
-                changed_by: history_item.changed_by,
-                created_at: history_item.created_at.iso8601(6),
-                deleted: history_item.deleted?
-              }
+            settings_json = JSON.dump(settings.collect(&:as_json))
+            save_settings_json(settings_json)
+
+            changed_histories.each do |setting_key, setting_history|
+              ordered_history = setting_history.sort_by { |history_item| history_item.created_at }.reverse
+              payload = ordered_history.collect do |history_item|
+                {
+                  value: history_item.value,
+                  changed_by: history_item.changed_by,
+                  created_at: history_item.created_at.iso8601(6),
+                  deleted: history_item.deleted?
+                }
+              end
+              history_json = JSON.dump(payload)
+              save_history_json(setting_key, history_json)
             end
-            history_json = JSON.dump(payload)
-            save_history_json(setting_key, history_json)
           end
         end
 

data/lib/super_settings/storage/mongodb_storage.rb

@@ -65,9 +65,12 @@ module SuperSettings
           if @mongodb.nil? || @url_hash != @url.hash
             @mutex.synchronize do
               unless @url_hash == @url.hash
+                client = Mongo::Client.new(@url)
+                create_indexes!(client)
+                # Only record the URL hash after the client is set up so that a
+                # failure here will be retried on the next call.
+                @mongodb = client
                 @url_hash = @url.hash
-                @mongodb = Mongo::Client.new(@url)
-                create_indexes!(@mongodb)
               end
             end
           end
@@ -100,8 +103,12 @@ module SuperSettings
             key: key,
             deleted: false
           }
-          record = settings_collection.find(query).projection(history: 0).first
-          new(record) if record
+          attributes = settings_collection.find(query).projection(history: 0).first
+          if attributes
+            record = new(attributes)
+            record.persisted = true
+            record
+          end
         end
 
         def last_updated_at

data/lib/super_settings/storage/redis_storage.rb

@@ -123,7 +123,7 @@ module SuperSettings
         end
 
         def last_updated_at
-          result = with_redis { |redis| redis.zrevrange(UPDATED_KEY, 0, 1, withscores: true).first }
+          result = with_redis { |redis| redis.zrevrange(UPDATED_KEY, 0, 0, withscores: true).first }
           return nil unless result
 
           time_at_microseconds(result[1])

data/lib/super_settings/storage/s3_storage.rb

@@ -69,6 +69,9 @@ module SuperSettings
         end
       end
 
+      BUCKET_MUTEX = Mutex.new
+      private_constant :BUCKET_MUTEX
+
       @bucket = nil
       @bucket_hash = nil
 
@@ -115,20 +118,32 @@ module SuperSettings
         private
 
         def s3_bucket
-          if configuration.hash != @bucket_hash
-            @bucket_hash = configuration.hash
+          # The mutex ensures the bucket and the configuration hash it was built from are
+          # always published together. The bucket and the hash are derived from a single
+          # read of the configuration attributes so that a concurrent configuration change
+          # cannot cache a bucket built from mixed values under the settled configuration
+          # hash; a torn read produces a hash that will not match the settled configuration,
+          # so the bucket gets rebuilt on the next call.
+          BUCKET_MUTEX.synchronize do
+            config = configuration
             options = {
-              endpoint: configuration.endpoint,
-              access_key_id: configuration.access_key_id,
-              secret_access_key: configuration.secret_access_key,
-              region: configuration.region
+              endpoint: config.endpoint,
+              access_key_id: config.access_key_id,
+              secret_access_key: config.secret_access_key,
+              region: config.region
             }
-            options[:force_path_style] = true if configuration.endpoint
-            options.compact!
+            bucket_name = config.bucket
+            config_hash = [options, bucket_name, config.path].hash
+
+            if config_hash != @bucket_hash
+              options[:force_path_style] = true if options[:endpoint]
+              options.compact!
 
-            @bucket = Aws::S3::Resource.new(options).bucket(configuration.bucket)
+              @bucket = Aws::S3::Resource.new(options).bucket(bucket_name)
+              @bucket_hash = config_hash
+            end
+            @bucket
           end
-          @bucket
         end
 
         def s3_object(filename)

data/lib/super_settings/storage/test_storage.rb

@@ -107,6 +107,7 @@ module SuperSettings
           self.class.settings.delete(@original_key)
         end
         self.class.settings[key] = attributes
+        @original_key = nil
         set_persisted!
         true
       end

data/lib/super_settings/storage/transaction.rb

@@ -20,10 +20,12 @@ module SuperSettings
 
               yield(changes)
 
-              if save_all(changes) != false
-                changes.each do |object|
-                  object.persisted = true if object.respond_to?(:persisted=)
-                end
+              if save_all(changes) == false
+                raise SuperSettings::Setting::PersistenceError.new("Settings could not be saved")
+              end
+
+              changes.each do |object|
+                object.persisted = true if object.respond_to?(:persisted=)
               end
             ensure
               Thread.current[transaction_key] = nil

data/lib/super_settings.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "time"
 
 # This is the main interface to the access settings.
 module SuperSettings

data/super_settings.gemspec

@@ -37,7 +37,5 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler"
-
   spec.required_ruby_version = ">= 2.7"
 end

metadata

@@ -1,28 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_settings
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Brian Durand
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 email:
 - bbdurand@gmail.com
 executables: []