sidekiq-unique-jobs 8.0.3 → 8.0.10

data/lib/sidekiq_unique_jobs/web.rb

@@ -13,11 +13,11 @@ module SidekiqUniqueJobs
       end
 
       app.get "/changelogs" do
-        @filter         = params[:filter] || "*"
+        @filter         = h(params[:filter] || "*")
         @filter         = "*" if @filter == ""
-        @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor].to_i
-        @prev_cursor    = params[:prev_cursor].to_i
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor]).to_i
+        @prev_cursor    = h(params[:prev_cursor]).to_i
         @total_size, @next_cursor, @changelogs = changelog.page(
           cursor: @current_cursor,
           pattern: @filter,
@@ -33,11 +33,11 @@ module SidekiqUniqueJobs
       end
 
       app.get "/locks" do
-        @filter         = params[:filter] || "*"
+        @filter         = h(params[:filter]) || "*"
         @filter         = "*" if @filter == ""
-        @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor].to_i
-        @prev_cursor    = params[:prev_cursor].to_i
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor]).to_i
+        @prev_cursor    = h(params[:prev_cursor]).to_i
 
         @total_size, @next_cursor, @locks = digests.page(
           cursor: @current_cursor,
@@ -49,11 +49,11 @@ module SidekiqUniqueJobs
       end
 
       app.get "/expiring_locks" do
-        @filter         = params[:filter] || "*"
+        @filter         = h(params[:filter]) || "*"
         @filter         = "*" if @filter == ""
-        @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor].to_i
-        @prev_cursor    = params[:prev_cursor].to_i
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor]).to_i
+        @prev_cursor    = h(params[:prev_cursor]).to_i
 
         @total_size, @next_cursor, @locks = expiring_digests.page(
           cursor: @current_cursor,
@@ -71,22 +71,23 @@ module SidekiqUniqueJobs
       end
 
       app.get "/locks/:digest" do
-        @digest = params[:digest]
+        @digest = h(params[:digest])
         @lock   = SidekiqUniqueJobs::Lock.new(@digest)
 
         erb(unique_template(:lock))
       end
 
       app.get "/locks/:digest/delete" do
-        digests.delete_by_digest(params[:digest])
-        expiring_digests.delete_by_digest(params[:digest])
+        digests.delete_by_digest(h(params[:digest]))
+        expiring_digests.delete_by_digest(h(params[:digest]))
         redirect_to :locks
       end
 
       app.get "/locks/:digest/jobs/:job_id/delete" do
-        @digest = params[:digest]
+        @digest = h(params[:digest])
+        @job_id = h(params[:job_id])
         @lock   = SidekiqUniqueJobs::Lock.new(@digest)
-        @lock.unlock(params[:job_id])
+        @lock.unlock(@job_id)
 
         redirect_to "locks/#{@lock.key}"
       end

data/lib/sidekiq_unique_jobs.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-require "brpoplpush/redis_script"
+require "concurrent/executor/ruby_single_thread_executor"
 require "concurrent/future"
-require "concurrent/promises"
 require "concurrent/map"
 require "concurrent/mutable_struct"
+require "concurrent/promises"
 require "concurrent/timer_task"
-require "concurrent/executor/ruby_single_thread_executor"
 require "digest"
 require "digest/sha1"
 require "erb"
 require "forwardable"
 require "json"
 require "pathname"
+require "redis_client"
 require "sidekiq"
 
+require "sidekiq_unique_jobs/script"
+
 require "sidekiq_unique_jobs/deprecation"
 require "sidekiq_unique_jobs/reflections"
 require "sidekiq_unique_jobs/reflectable"
@@ -29,7 +31,6 @@ require "sidekiq_unique_jobs/timing"
 require "sidekiq_unique_jobs/sidekiq_worker_methods"
 require "sidekiq_unique_jobs/connection"
 require "sidekiq_unique_jobs/exceptions"
-require "sidekiq_unique_jobs/script"
 require "sidekiq_unique_jobs/script/caller"
 require "sidekiq_unique_jobs/normalizer"
 require "sidekiq_unique_jobs/job"

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.0.10
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: brpoplpush-redis_script
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +175,15 @@ files:
 - lib/sidekiq_unique_jobs/rspec/matchers/have_valid_sidekiq_options.rb
 - lib/sidekiq_unique_jobs/script.rb
 - lib/sidekiq_unique_jobs/script/caller.rb
+- lib/sidekiq_unique_jobs/script/client.rb
+- lib/sidekiq_unique_jobs/script/config.rb
+- lib/sidekiq_unique_jobs/script/dsl.rb
+- lib/sidekiq_unique_jobs/script/logging.rb
+- lib/sidekiq_unique_jobs/script/lua_error.rb
+- lib/sidekiq_unique_jobs/script/script.rb
+- lib/sidekiq_unique_jobs/script/scripts.rb
+- lib/sidekiq_unique_jobs/script/template.rb
+- lib/sidekiq_unique_jobs/script/timing.rb
 - lib/sidekiq_unique_jobs/server.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb
@@ -234,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs