sidekiq 8.0.3 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5862bbba5b859c1983788b6aeb49193fad724a1186426084c1e42747cb226ba2
-  data.tar.gz: 11fbaba14b814b87d09d809173ca59f9477c119f9ab6d556e4a9baa8e4e83d63
+  metadata.gz: c6b95635fb1084ed28d8b6dd5f7d273873e24ffab09aeb5057de74d4bebeae07
+  data.tar.gz: bba44aed090637fb4991ae3935112b84b33df8b7281c9d0f273f0146ea11415a
 SHA512:
-  metadata.gz: 67d640ff21778c036ba15db434bafe0582a61e1b462d1bee2502fa7a9b8978208b4099c46d8ad6bd6214f198558de8985deeb11b6e7d99f1e603b15f087f0215
-  data.tar.gz: 4becc4ea36c062f52667fea91d4f49b5bfb759fe43f75ef6427c1aeacdc36764408f442cafccc3595585cf13ef2ff71da98212d7db0fcb89ff198ace0cd19caa
+  metadata.gz: 657b2d2f1e1c850779d29990c88227d7776f8e5a4b3333fd7b2e5f249fb360a1f69de40a773dc5b608ae37ff249713af5aa5b38cd04da2ceffe64f79578861a3
+  data.tar.gz: a8d8d6f32921b00341dc8910155b8a85d6c036bc31a69437dde3f5107d02bed5ffb2b0754f014eaf69f577570e91455a7ead03367cf43fe0b24ef2650e9f57be

data/Changes.md

@@ -2,7 +2,27 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
-HEAD
+8.0.5
+----------
+
+- Add `stopping?` method to AJ adapter for compatibility with the new AJ::Continuations feature [#6732]
+- Further improvements to Rails boot compatibility [#6710]
+- Add ability to disable CSRF middleware. SameSite cookies prevent
+  CSRF in a cleaner manner and are default in most browsers now.
+  CSRF code will be removed in Sidekiq 9.0. [#6739]
+
+8.0.4
+----------
+
+- Adjust Rails integration for various edge cases [6713]
+- Flush job iteration state when an error is raised [#6704]
+- Update Accept-Language parsing in Web UI [#6721]
+- Remove fixed-width in Web UI [#6686]
+- Adjust CSRF middleware ordering [#6688]
+- Support proxies when POSTing profiles to profiler.firefox.com [#6687]
+- Dont swallow NoMethodErrors in CurrentAttributes [#6685]
+
+8.0.3
 ----------
 
 - Configure Vernier output directory [#6674]

data/lib/active_job/queue_adapters/sidekiq_adapter.rb

@@ -17,7 +17,7 @@ begin
     end
   end
 
-  unless ActiveJob::Base.respond_to?(:sidekiq_options)
+  ActiveSupport.on_load(:active_job) do
     # By including the Options module, we allow AJs to directly control sidekiq features
     # via the *sidekiq_options* class method and, for instance, not use AJ's retry system.
     # AJ retries don't show up in the Sidekiq UI Retries tab, don't save any error data, can't be
@@ -29,7 +29,7 @@ begin
     #     def perform
     #     end
     #   end
-    ActiveJob::Base.include Sidekiq::Job::Options
+    include Sidekiq::Job::Options unless respond_to?(:sidekiq_options)
   end
 
   # Patch the ActiveJob module
@@ -43,7 +43,14 @@ begin
       # To use Sidekiq set the queue_adapter config to +:sidekiq+.
       #
       #   Rails.application.config.active_job.queue_adapter = :sidekiq
-      class SidekiqAdapter
+      class SidekiqAdapter < AbstractAdapter
+        @@stopping = false
+
+        callback = -> { @@stopping = true }
+
+        Sidekiq.configure_client { |config| config.on(:quiet, &callback) }
+        Sidekiq.configure_server { |config| config.on(:quiet, &callback) }
+
         # Defines whether enqueuing should happen implicitly to after commit when called
         # from inside a transaction.
         # @api private
@@ -99,10 +106,12 @@ begin
           enqueued_count
         end
 
+        # @api private
+        def stopping? = !!@@stopping
+
         # Defines a class alias for backwards compatibility with enqueued Active Job jobs.
         # @api private
-        class JobWrapper < Sidekiq::ActiveJob::Wrapper
-        end
+        JobWrapper = Sidekiq::ActiveJob::Wrapper
       end
     end
   end

data/lib/sidekiq/job/iterable.rb

@@ -221,6 +221,9 @@ module Sidekiq
           verify_iteration_time(time_limit, object) do
             around_iteration do
               each_iteration(object, *arguments)
+            rescue Exception
+              flush_state
+              raise
             end
           end
         end

data/lib/sidekiq/middleware/current_attributes.rb

@@ -71,11 +71,14 @@ module Sidekiq
         retried = false
 
         begin
+          set_succeeded = false
           klass.set(attrs) do
+            set_succeeded = true
             wrap(klass_attrs, &block)
           end
         rescue NoMethodError
-          raise if retried
+          # Don't retry if the no method error didn't come from current attributes
+          raise if retried || set_succeeded
 
           # It is possible that the `CurrentAttributes` definition
           # was changed before the job started processing.

data/lib/sidekiq/rails.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "sidekiq/job"
-require_relative "../active_job/queue_adapters/sidekiq_adapter"
-
 module Sidekiq
   begin
     gem "railties", ">= 7.0"
     require "rails"
+    require "sidekiq/job"
+    require_relative "../active_job/queue_adapters/sidekiq_adapter"
 
     class Rails < ::Rails::Engine
       class Reloader

data/lib/sidekiq/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "8.0.3"
+  VERSION = "8.0.5"
   MAJOR = 8
 
   def self.gem_version

data/lib/sidekiq/web/application.rb

@@ -325,6 +325,8 @@ module Sidekiq
       get "/stats" do
         sidekiq_stats = Sidekiq::Stats.new
         redis_stats = redis_info.slice(*REDIS_KEYS)
+        redis_stats["store_name"] = store_name
+        redis_stats["store_version"] = store_version
         json(
           sidekiq: {
             processed: sidekiq_stats.processed,
@@ -360,10 +362,16 @@ module Sidekiq
         unless sid
           require "net/http"
           data = Sidekiq.redis { |c| c.hget(key, "data") }
-          resp = Net::HTTP.post(URI(store),
-            data,
-            {"Accept" => "application/vnd.firefox-profiler+json;version=1.0",
-             "User-Agent" => "Sidekiq #{Sidekiq::VERSION} job profiler"})
+
+          store_uri = URI(store)
+          http = Net::HTTP.new(store_uri.host, store_uri.port)
+          http.use_ssl = store_uri.scheme == "https"
+          request = Net::HTTP::Post.new(store_uri.request_uri)
+          request.body = data
+          request["Accept"] = "application/vnd.firefox-profiler+json;version=1.0"
+          request["User-Agent"] = "Sidekiq #{Sidekiq::VERSION} job profiler"
+
+          resp = http.request(request)
           # https://raw.githubusercontent.com/firefox-devtools/profiler-server/master/tools/decode_jwt_payload.py
           rawjson = resp.body.split(".")[1].unpack1("m")
           sid = Sidekiq.load_json(rawjson)["profileToken"]

data/lib/sidekiq/web/config.rb

@@ -24,7 +24,10 @@ module Sidekiq
         # and very difficult for us to vendor or provide ourselves. If you are worried
         # about data security and wish to self-host, you can change these URLs.
         profile_view_url: "https://profiler.firefox.com/public/%s",
-        profile_store_url: "https://api.profiler.firefox.com/compressed-store"
+        profile_store_url: "https://api.profiler.firefox.com/compressed-store",
+        # Will be false in Sidekiq 9.0.
+        # CSRF is unnecessary if you are using SameSite=(Strict|Lax) cookies.
+        csrf: true
       }
 
       ##
@@ -57,7 +60,7 @@ module Sidekiq
         @locales = LOCALES
         @views = VIEWS
         @tabs = DEFAULT_TABS.dup
-        @middlewares = [Sidekiq::Web::CsrfProtection]
+        @middlewares = []
         @custom_job_info_rows = []
       end
 

data/lib/sidekiq/web/helpers.rb

@@ -2,7 +2,7 @@
 
 require "uri"
 require "yaml"
-require "cgi"
+require "cgi/escape"
 
 module Sidekiq
   # These methods are available to pages within the Web UI and UI extensions.
@@ -165,7 +165,10 @@ module Sidekiq
       text_direction == "rtl"
     end
 
-    # See https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+    # See https://www.rfc-editor.org/rfc/rfc9110.html#section-12.5.4
+    # Returns an array of language tags ordered by their quality value
+    #
+    # Inspiration taken from https://github.com/iain/http_accept_language/blob/master/lib/http_accept_language/parser.rb
     def user_preferred_languages
       languages = env["HTTP_ACCEPT_LANGUAGE"]
       languages.to_s.gsub(/\s+/, "").split(",").map { |language|
@@ -180,28 +183,30 @@ module Sidekiq
 
     # Given an Accept-Language header like "fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2"
     # this method will try to best match the available locales to the user's preferred languages.
-    #
-    # Inspiration taken from https://github.com/iain/http_accept_language/blob/master/lib/http_accept_language/parser.rb
     def locale
       # session[:locale] is set via the locale selector from the footer
       @locale ||= if (l = session&.fetch(:locale, nil)) && available_locales.include?(l)
         l
       else
+        matched_locale = nil
+        # Attempt to find a case-insensitive exact match first
+        user_preferred_languages.each do |preferred|
+          # We only care about the language and primary subtag
+          # "en-GB-oxendict" becomes "en-GB"
+          language_tag = preferred.split("-")[0..1].join("-")
+          matched_locale = available_locales.find { |available_locale| available_locale.casecmp?(language_tag) }
+          break if matched_locale
+        end
 
-        # exactly match with preferred like "pt-BR, zh-CN, zh-TW..." first
-        matched_locale = user_preferred_languages.find { |preferred|
-          available_locales.include?(preferred) if preferred.length == 5
-        }
-
-        matched_locale ||= user_preferred_languages.map { |preferred|
-          preferred_language = preferred.split("-", 2).first
-
-          lang_group = available_locales.select { |available|
-            preferred_language == available.split("-", 2).first
-          }
+        return matched_locale if matched_locale
 
-          lang_group.find { |lang| lang == preferred } || lang_group.min_by(&:length)
-        }.compact.first
+        # Find the first base language match
+        # "en-US,es-MX;q=0.9" matches "en"
+        user_preferred_languages.each do |preferred|
+          base_language = preferred.split("-", 2).first
+          matched_locale = available_locales.find { |available_locale| available_locale.casecmp?(base_language) }
+          break if matched_locale
+        end
 
         matched_locale || "en"
       end
@@ -372,7 +377,7 @@ module Sidekiq
       elsif rss_kb < 10_000_000
         "#{number_with_delimiter((rss_kb / 1024.0).to_i)} MB"
       else
-        "#{number_with_delimiter((rss_kb / (1024.0 * 1024.0)), precision: 1)} GB"
+        "#{number_with_delimiter(rss_kb / (1024.0 * 1024.0), precision: 1)} GB"
       end
     end
 

data/lib/sidekiq/web.rb

@@ -109,6 +109,7 @@ module Sidekiq
           cascade: true,
           header_rules: rules
         m.each { |middleware, block| use(*middleware, &block) }
+        use CsrfProtection if cfg[:csrf]
         run Sidekiq::Web::Application.new(self.class)
       end
     end

data/lib/sidekiq.rb

@@ -146,4 +146,4 @@ module Sidekiq
   class Shutdown < Interrupt; end
 end
 
-require "sidekiq/rails"
+require "sidekiq/rails" if defined?(::Rails::Engine)

data/web/assets/javascripts/dashboard.js

@@ -11,7 +11,7 @@ var updateStatsSummary = function(data) {
 }
 
 var updateRedisStats = function(data) {
-  document.getElementById('redis_version').innerText = data.redis_version;
+  document.getElementById('redis_version').innerText = data.store_version;
   document.getElementById('uptime_in_days').innerText = data.uptime_in_days;
   document.getElementById('connected_clients').innerText = data.connected_clients;
   document.getElementById('used_memory_human').innerText = data.used_memory_human;

data/web/assets/stylesheets/style.css

@@ -69,7 +69,7 @@ body {
 
 .container {
   margin: 0 auto;
-  max-width: 1440px;
+  /* max-width: 1440px; */
   padding: var(--space-2x);
 }
 
@@ -90,6 +90,7 @@ code {
   font-family: var(--font-mono);
   font-size: var(--font-size-small);
   padding: var(--space-1-2);
+  word-wrap: anywhere;
 }
 
 time { color: var(--color-text-light); }
@@ -437,7 +438,10 @@ article .count {
 }
 
 /* table */
-.table_container { overflow-x: auto; }
+.table_container {
+  overflow-x: auto;
+  margin-bottom: var(--space-2x);
+}
 
 .table_container + form,
 .table_container + input,
@@ -563,6 +567,7 @@ body > footer .nav {
     --color-border: oklch(25% 0.01 256);
     --color-input-border: oklch(31% 0.01 256);
     --color-selected: oklch(27% 0.01 256);
+    --color-selected-text: oklch(55% 0.11 45);
     --color-table-bg-alt: oklch(24% 0.01 256);
     --color-shadow: oklch(9% 0.01 256 / 10%);
     --color-text: oklch(75% 0.01 256);
@@ -611,6 +616,10 @@ body > footer .nav {
   .label-info { background: var(--color-info); }
   .label-danger { background: var(--color-danger); }
   .label-warning { background: var(--color-warning); }
+
+  td.box::selection {
+    background-color: var(--color-selected-text);
+  }
 }
 
 @media (max-width: 800px) { :root { --font-size: 14px; } }
@@ -754,4 +763,4 @@ body > footer .nav {
   text-align: center;
   padding: 20px;
   background: var(--color-success);
-}
+}

data/web/views/scheduled.erb

@@ -57,4 +57,4 @@
   <% else %>
     <div class="alert alert-success"><%= t('NoScheduledFound') %></div>
   <% end %>
-</div>
+</section>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.0.5
 platform: ruby
 authors:
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client