Merge branch 'master' into dependabot/bundler/rack-3.2.6

Author: farhatahmad

Gemfile.lock

@@ -74,8 +74,8 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.2)
     aws-eventstream (1.4.0)
     aws-partitions (1.1196.0)
@@ -120,7 +120,7 @@ GEM
       dotenv (= 3.1.7)
       railties (>= 6.1)
     drb (2.2.3)
-    erb (6.0.2)
+    erb (6.0.4)
     erubi (1.13.1)
     factory_bot (6.5.1)
       activesupport (>= 6.1.0)
@@ -172,7 +172,7 @@ GEM
     minitest (5.25.5)
     minitest-stub_any_instance (1.0.3)
     msgpack (1.8.0)
-    net-imap (0.6.3)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -210,12 +210,12 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (7.0.5)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.6)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -340,7 +340,7 @@ GEM
       tty-screen (= 0.8.1)
       unicode-display_width (~> 2.2)
     thor (1.5.0)
-    timeout (0.6.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     tty-screen (0.8.1)
     tzinfo (2.0.6)

app/services/recording_ready_notifier_service.rb

@@ -23,7 +23,16 @@ def execute(recording_id)
 
     def encoded_payload(meeting_id, record_id, secret)
       payload = { meeting_id: meeting_id, record_id: record_id }
-      JWT.encode(payload, secret)
+      JWT.encode(payload, secret, jwt_algorithm)
+    end
+
+    def jwt_algorithm
+      algos = Rails.configuration.x.loadbalancer_checksum_algorithms
+
+      return 'HS256' if algos.include?('SHA256')
+      return 'HS512' if algos.include?('SHA512')
+
+      'HS256'
     end
 
     def notify(callback_url, meeting_id, record_id, tenant_name)

lib/tasks/servers.rake

@@ -66,7 +66,9 @@ namespace :servers do
       end
     end
     server.load_multiplier = tmp_load_multiplier
-    server.tag = args.tag.presence unless args.tag.nil?
+    # inspect the raw positional arguments to distinguish an omitted tag from an explicit untag
+    tag_arg = args.to_a[3]
+    server.tag = tag_arg.presence unless tag_arg.nil?
     server.save!
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound

spec/services/recording_ready_notifier_service_spec.rb

@@ -69,9 +69,23 @@
       stub_request(:post, url)
         .to_return(status: 200, body: '', headers: {})
 
-      expect(JWT).to receive(:encode).with({ meeting_id: recording.meeting_id, record_id: recording.record_id }, tenant.secrets_array[0])
+      expect(JWT).to receive(:encode).with({ meeting_id: recording.meeting_id, record_id: recording.record_id }, tenant.secrets_array[0], anything)
 
       described_class.execute(recording.id)
     end
   end
+
+  describe '.jwt_algorithm' do
+    it 'returns HS256 with the default checksum algorithms configuration' do
+      allow(Rails.configuration.x).to receive(:loadbalancer_checksum_algorithms).and_return(%w[SHA1 SHA256 SHA512])
+
+      expect(described_class.jwt_algorithm).to eq('HS256')
+    end
+
+    it 'returns HS512 when only SHA512 is configured' do
+      allow(Rails.configuration.x).to receive(:loadbalancer_checksum_algorithms).and_return(%w[SHA512])
+
+      expect(described_class.jwt_algorithm).to eq('HS512')
+    end
+  end
 end

spec/tasks/servers/servers_tasks_spec.rb

@@ -51,4 +51,26 @@
       expect { task.invoke(verbose) }.to output(%r{url: https://example.com}).to_stdout
     end
   end
+
+  describe 'servers:update task' do
+    let(:task) { Rake::Task['servers:update'] }
+
+    it 'updates the tag when the fourth argument is non-empty' do
+      server = create(:server, tag: nil, load_multiplier: 1.0)
+      task.invoke(server.id, server.secret, '1.0', 'test-tag')
+      expect(Server.find(server.id).tag).to eq('test-tag')
+    end
+
+    it 'clears the tag when the fourth argument is an empty string' do
+      server = create(:server, tag: 'test-tag', load_multiplier: 1.0)
+      task.invoke(server.id, server.secret, '1.0', '')
+      expect(Server.find(server.id).tag).to be_nil
+    end
+
+    it 'keeps the existing tag when the fourth argument is omitted' do
+      server = create(:server, tag: 'test-tag', load_multiplier: 1.0)
+      task.invoke(server.id, server.secret, '1.0')
+      expect(Server.find(server.id).tag).to eq('test-tag')
+    end
+  end
 end