gitlab-mail_room 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e4c047999e1f2e3d77862ea0e65f146fe92c89de4d0367892649d518de8ad66
-  data.tar.gz: 36000daee0622b345eea3be14143652ce335ea9441ab012a4088d0038b7bef8c
+  metadata.gz: 1acb9f27f253f776bd924c9dfa75228f964a37ec3364fd6a557f916da85c3af1
+  data.tar.gz: 9397eee73f27be29ca26296b8525d5bb689856d70d46fedf0844cf08b0b575b7
 SHA512:
-  metadata.gz: 9693c9ee292e8e45025d251c720d4bda9f80b121aa0524c6c2bad0924b5ec731fcb017f91641c27adf2c7a3321a59345d1f0b80177bbde998ac5b42bc080a13d
-  data.tar.gz: d8c733b9eaef28122e6b2533e1e5fca6a0aba6581b07be93189f498f38ad4845ef624016258c339a2e6cd8ac56e7eb2fbe3c52a9724d5d9363deb58ed1d8d431
+  metadata.gz: d45ef4ad64a91e09f146c44673612aa7211ceebd2f42907db1d525b18d9bf64749b18e2277f1df0e79aceea5108ca5526a673e9c1a6a9a262a902eeb4d64dfda
+  data.tar.gz: 3ba5a0a5dfbd62c1cb5ba5c81d340c08ee075ccd86cbbaa22c675b2dd681537714f79cb5b317e60365a39cdc2e8230fff2d384d481392d056dcca81d0b941c0c

data/.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
           - '3.0'
           - '2.7'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:
@@ -43,7 +43,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:

data/.gitlab-ci.yml

@@ -10,11 +10,10 @@ services:
     paths:
       - vendor/ruby
   variables:
-    REDIS_URL: redis://redis:6379/0
+    REDIS_URL: redis://redis:6379
   before_script:
     - apt update && apt install -y libicu-dev
     - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler --no-document         # Bundler is not installed with the image
     - bundle config set --local path 'vendor'
     - bundle install -j $(nproc)
   script:
@@ -23,8 +22,8 @@ services:
 rspec:
   parallel:
     matrix:
-      - RUBY_VERSION: [ "2.6", "2.7", "3.0", "3.1", "3.2" ]
+      - RUBY_VERSION: [ "3.0", "3.1", "3.2", "3.3", "3.4" ]
   <<: *test
 
 include:
-  - template: Security/Dependency-Scanning.gitlab-ci.yml
+  - template: Security/Dependency-Scanning.gitlab-ci.yml

data/.rubocop_todo.yml

@@ -25,7 +25,6 @@ Gemspec/RequiredRubyVersion:
 # This cop supports safe autocorrection (--autocorrect).
 Layout/BlockEndNewline:
   Exclude:
-    - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 5
@@ -75,7 +74,6 @@ Layout/EmptyLinesAroundClassBody:
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
   Exclude:
-    - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
     - 'spec/lib/logger/structured_spec.rb'
 
@@ -101,7 +99,6 @@ Layout/LeadingCommentSpace:
 # This cop supports safe autocorrection (--autocorrect).
 Layout/MultilineBlockLayout:
   Exclude:
-    - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 3
@@ -153,7 +150,6 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/lib/configuration_spec.rb'
     - 'spec/lib/delivery/letter_opener_spec.rb'
     - 'spec/lib/delivery/logger_spec.rb'
-    - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
     - 'spec/lib/imap/connection_spec.rb'
     - 'spec/lib/mailbox_watcher_spec.rb'
@@ -273,7 +269,6 @@ Style/Alias:
 Style/BlockDelimiters:
   Exclude:
     - 'spec/lib/arbitration/redis_spec.rb'
-    - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
     - 'spec/lib/delivery/sidekiq_spec.rb'
 

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.2

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## mail_room 0.11.1 ##
+
+https://github.com/tpitale/mail_room/compare/v0.11.0...v0.11.1
+
+## mail_room 0.11.0 ##
+
+https://github.com/tpitale/mail_room/compare/v0.10.1...v0.11.0
+
 ## mail_room 0.10.1 ##
 
 * Fix db attribute on redis URL PR#130 - @jarkaK

data/README.md

@@ -489,13 +489,3 @@ respectively and MailRoom will log there.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 6. If accepted, ask for commit rights
-
-## TODO ##
-
-1. specs, this is just a (working) proof of concept √
-2. finish code for POSTing to callback with auth √
-3. accept mailbox configuration for one account directly on the commandline; or ask for it
-4. add example rails endpoint, with auth examples
-5. add example configs for upstart/init.d √
-6. log to stdout √
-7. add a development mode that opens in letter_opener by ryanb √

data/lib/mail_room/arbitration/redis.rb

@@ -3,11 +3,13 @@ require "redis"
 module MailRoom
   module Arbitration
     class Redis
-      Options = Struct.new(:redis_url, :namespace, :sentinels) do
+      Options = Struct.new(:redis_url, :namespace, :sentinels, :sentinel_username, :sentinel_password) do
         def initialize(mailbox)
           redis_url = mailbox.arbitration_options[:redis_url] || "redis://localhost:6379"
           namespace = mailbox.arbitration_options[:namespace]
           sentinels = mailbox.arbitration_options[:sentinels]
+          sentinel_username = mailbox.arbitration_options[:sentinel_username]
+          sentinel_password = mailbox.arbitration_options[:sentinel_password]
 
           if namespace
             warn <<~MSG
@@ -16,7 +18,7 @@ module MailRoom
             MSG
           end
 
-          super(redis_url, namespace, sentinels)
+          super(redis_url, namespace, sentinels, sentinel_username, sentinel_password)
         end
       end
 
@@ -48,6 +50,8 @@ module MailRoom
           sentinels = options.sentinels
           redis_options = { url: options.redis_url }
           redis_options[:sentinels] = sentinels if sentinels
+          redis_options[:sentinel_username] = options.sentinel_username if options.sentinel_username
+          redis_options[:sentinel_password] = options.sentinel_password if options.sentinel_password
 
           redis = ::Redis.new(redis_options)
 

data/lib/mail_room/delivery/postback.rb

@@ -61,7 +61,6 @@ module MailRoom
       # Build a new delivery, hold the delivery options
       # @param [MailRoom::Delivery::Postback::Options]
       def initialize(delivery_options)
-        puts delivery_options
         @delivery_options = delivery_options
       end
 
@@ -71,19 +70,19 @@ module MailRoom
         connection = Faraday.new
 
         if @delivery_options.token_auth?
-          connection.token_auth @delivery_options.token
+          config_token_auth(connection)
         elsif @delivery_options.basic_auth?
           config_basic_auth(connection)
         end
 
-        connection.post do |request|
+        result = connection.post do |request|
           request.url @delivery_options.url
           request.body = message
           config_request_content_type(request)
           config_request_jwt_auth(request)
         end
 
-        @delivery_options.logger.info({ delivery_method: 'Postback', action: 'message pushed', url: @delivery_options.url })
+        @delivery_options.logger.info({ delivery_method: 'Postback', action: 'message pushed', url: @delivery_options.url, status_code: result.status })
         true
       end
 
@@ -101,6 +100,18 @@ module MailRoom
         request.headers[@delivery_options.jwt.header] = @delivery_options.jwt.token
       end
 
+      def config_token_auth(connection)
+        # connection.token_auth was removed in Faraday v2 in favor of connection.request(:authorization, 'Token', token)
+        if defined?(connection.token_auth)
+          connection.token_auth @delivery_options.token
+        else
+          connection.request(
+            :authorization, 'Token',
+            @delivery_options.token
+          )
+        end
+      end
+
       def config_basic_auth(connection)
         if defined?(connection.basic_auth)
           connection.basic_auth(

data/lib/mail_room/delivery/sidekiq.rb

@@ -8,12 +8,14 @@ module MailRoom
     # Sidekiq Delivery method
     # @author Douwe Maan
     class Sidekiq
-      Options = Struct.new(:redis_url, :namespace, :sentinels, :queue, :worker, :logger, :redis_db) do
+      Options = Struct.new(:redis_url, :namespace, :sentinels, :queue, :worker, :logger, :redis_db, :sentinel_username, :sentinel_password) do
         def initialize(mailbox)
           redis_url = mailbox.delivery_options[:redis_url] || "redis://localhost:6379"
           redis_db  = mailbox.delivery_options[:redis_db] || 0
           namespace = mailbox.delivery_options[:namespace]
           sentinels = mailbox.delivery_options[:sentinels]
+          sentinel_username = mailbox.delivery_options[:sentinel_username]
+          sentinel_password = mailbox.delivery_options[:sentinel_password]
           queue     = mailbox.delivery_options[:queue] || "default"
           worker    = mailbox.delivery_options[:worker]
           logger = mailbox.logger
@@ -25,7 +27,7 @@ module MailRoom
             MSG
           end
 
-          super(redis_url, namespace, sentinels, queue, worker, logger, redis_db)
+          super(redis_url, namespace, sentinels, queue, worker, logger, redis_db, sentinel_username, sentinel_password)
         end
       end
 
@@ -55,6 +57,8 @@ module MailRoom
           sentinels = options.sentinels
           redis_options = { url: options.redis_url, db: options.redis_db }
           redis_options[:sentinels] = sentinels if sentinels
+          redis_options[:sentinel_username] = options.sentinel_username if options.sentinel_username
+          redis_options[:sentinel_password] = options.sentinel_password if options.sentinel_password
 
           redis = ::Redis.new(redis_options)
 

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.24"
+  VERSION = "0.0.26"
 end

data/mail_room.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["tpitale@gmail.com"]
   gem.description   = %q{mail_room will proxy email (gmail) from IMAP to a delivery method}
   gem.summary       = %q{mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or letter_opener}
-  gem.homepage      = "http://github.com/tpitale/mail_room"
+  gem.homepage      = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-mail_room"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,13 +20,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency             "net-imap", ">= 0.2.1"
   gem.add_dependency             "oauth2", [">= 1.4.4", "< 3"]
   gem.add_dependency             "jwt", ">= 2.0"
-  gem.add_dependency             "redis", [">= 4", "< 6"]
+  gem.add_dependency             "redis", [">= 5", "< 6"]
   gem.add_dependency             "redis-namespace", '>= 1.8.2'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.9"
   gem.add_development_dependency "rubocop", "~> 1.11"
-  gem.add_development_dependency "mocha", "~> 1.11"
+  gem.add_development_dependency "mocha", "~> 2.0"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "webrick", "~> 1.6"
 

data/spec/lib/arbitration/redis_spec.rb

@@ -11,21 +11,12 @@ describe MailRoom::Arbitration::Redis do
     )
   }
   let(:options) { described_class::Options.new(mailbox) }
-  let(:redis5) { Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0') }
   subject       { described_class.new(options) }
 
   # Private, but we don't care.
   let(:redis) { subject.send(:client) }
   let(:raw_client) { redis._client }
 
-  let(:server_url) do
-    if redis5
-      raw_client.config.server_url
-    else
-      raw_client.options[:url]
-    end
-  end
-
   describe '#deliver?' do
     context "when called the first time" do
       after do
@@ -89,7 +80,7 @@ describe MailRoom::Arbitration::Redis do
 
   context 'redis client connection params' do
     context 'when only url is present' do
-      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') }
+      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379') }
       let(:mailbox) {
         build_mailbox(
           arbitration_options: {
@@ -105,7 +96,7 @@ describe MailRoom::Arbitration::Redis do
       it 'client has same specified url' do
         subject.deliver?(123)
 
-        expect(server_url).to eq redis_url
+        expect(raw_client.config.server_url).to eq redis_url
       end
 
       it 'client is a instance of Redis class' do
@@ -144,17 +135,37 @@ describe MailRoom::Arbitration::Redis do
         )
       }
 
+      before { ::RedisClient::SentinelConfig.any_instance.stubs(:resolve_master).returns(RedisClient::Config.new(**sentinels.first)) }
+
       it 'client has same specified sentinel params' do
-        if redis5
+        expect(raw_client.config).to be_a RedisClient::SentinelConfig
+        expect(raw_client.config.name).to eq('sentinel-master')
+        expect(raw_client.config.host).to eq('10.0.0.1')
+        expect(raw_client.config.password).to eq('mypassword')
+        expect(raw_client.config.sentinels.map(&:server_url)).to eq(["redis://10.0.0.1:26379"])
+      end
+
+      context 'with separate Sentinel username and password' do
+        let(:sentinel_username) { 'my-sentinel-user' }
+        let(:sentinel_password) { 'my-sentinel-pass' }
+        let(:mailbox) {
+          build_mailbox(
+            arbitration_options: {
+              redis_url: redis_url,
+              sentinels: sentinels,
+              sentinel_username: sentinel_username,
+              sentinel_password: sentinel_password
+            }
+          )
+        }
+
+        it 'client uses Sentinel username and password' do
+          expect(raw_client.config).to be_a RedisClient::SentinelConfig
           expect(raw_client.config.password).to eq('mypassword')
-          client_sentinels = raw_client.config.sentinels
-          expect(client_sentinels.length).to eq(sentinels.length)
-          expect(client_sentinels[0].host).to eq('10.0.0.1')
-          expect(client_sentinels[0].port).to eq(26379) # rubocop:disable Style/NumericLiterals
-        else
-          expect(raw_client.options[:host]).to eq('sentinel-master')
-          expect(raw_client.options[:password]).to eq('mypassword')
-          expect(raw_client.options[:sentinels]).to eq(sentinels)
+
+          sentinels = raw_client.config.sentinels
+          expect(sentinels.map(&:username).uniq).to eq([sentinel_username])
+          expect(sentinels.map(&:password).uniq).to eq([sentinel_password])
         end
       end
     end

data/spec/lib/delivery/postback_spec.rb

@@ -1,138 +1,108 @@
 require 'spec_helper'
 require 'mail_room/delivery/postback'
+require 'tempfile'
+require 'webmock/rspec'
 
 describe MailRoom::Delivery::Postback do
   describe '#deliver' do
-    context 'with token auth delivery' do
-      let(:mailbox) {build_mailbox({
-        delivery_url: 'http://localhost/inbox',
-        delivery_token: 'abcdefg'
-      })}
+    let(:delivery_options) do
+      MailRoom::Delivery::Postback::Options.new(mailbox)
+    end
 
-      let(:delivery_options) {
-        MailRoom::Delivery::Postback::Options.new(mailbox)
-      }
+    before do
+      stub_request(:post, 'http://localhost/inbox')
+        .with(body: 'a message', headers: headers)
+        .to_return(status: 201)
+    end
 
+    shared_examples 'message poster' do
       it 'posts the message with faraday' do
-        connection = stub
-        request = stub
-        Faraday.stubs(:new).returns(connection)
-
-        connection.expects(:token_auth).with('abcdefg')
-        connection.expects(:post).yields(request)
-
-        request.expects(:url).with('http://localhost/inbox')
-        request.expects(:body=).with('a message')
-
         MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
       end
     end
 
-    context 'with basic auth delivery options' do
-      let(:mailbox) {build_mailbox({
-        delivery_options: {
-          url: 'http://localhost/inbox',
-          username: 'user1',
-          password: 'password123abc'
-        }
-      })}
-
-      let(:delivery_options) {
-        MailRoom::Delivery::Postback::Options.new(mailbox)
-      }
-
-      it 'posts the message with faraday' do
-        connection = stub
-        request = stub
-        Faraday.stubs(:new).returns(connection)
+    context 'with token auth delivery' do
+      let(:mailbox) do
+        build_mailbox({
+                        delivery_url: 'http://localhost/inbox',
+                        delivery_token: 'abcdefg'
+                      })
+      end
 
-        connection.expects(:basic_auth).with('user1', 'password123abc')
-        connection.expects(:post).yields(request)
+      let(:headers) { { 'Authorization' => 'Token abcdefg' } }
 
-        request.expects(:url).with('http://localhost/inbox')
-        request.expects(:body=).with('a message')
+      it_behaves_like 'message poster'
+    end
 
-        MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
+    context 'with basic auth delivery options' do
+      let(:mailbox) do
+        build_mailbox({
+                        delivery_options: {
+                          url: 'http://localhost/inbox',
+                          username: 'user1',
+                          password: 'password123abc'
+                        }
+                      })
       end
 
-      context 'with content type in the delivery options' do
-        let(:mailbox) {build_mailbox({
-          delivery_options: {
-            url: 'http://localhost/inbox',
-            username: 'user1',
-            password: 'password123abc',
-            content_type: 'text/plain'
-          }
-        })}
-
-        let(:delivery_options) {
-          MailRoom::Delivery::Postback::Options.new(mailbox)
-        }
+      let(:headers) { { 'Authorization' => 'Basic dXNlcjE6cGFzc3dvcmQxMjNhYmM=' } }
 
-        it 'posts the message with faraday' do
-          connection = stub
-          request = stub
-          Faraday.stubs(:new).returns(connection)
+      it_behaves_like 'message poster'
 
-          connection.expects(:post).yields(request)
-          request.stubs(:url)
-          request.stubs(:body=)
-          request.stubs(:headers).returns({})
-          connection.expects(:basic_auth).with('user1', 'password123abc')
-
-          MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
+      context 'with content type in the delivery options' do
+        let(:mailbox) do
+          build_mailbox({
+                          delivery_options: {
+                            url: 'http://localhost/inbox',
+                            username: 'user1',
+                            password: 'password123abc',
+                            content_type: 'text/plain'
+                          }
+                        })
+        end
 
-          expect(request.headers['Content-Type']).to eq('text/plain')
+        let(:headers) do
+          {
+            'Authorization' => 'Basic dXNlcjE6cGFzc3dvcmQxMjNhYmM=',
+            'Content-Type' => 'text/plain'
+          }
         end
+
+        it_behaves_like 'message poster'
       end
 
       context 'with jwt token in the delivery options' do
-        let(:mailbox) {build_mailbox({
-          delivery_options: {
-            url: 'http://localhost/inbox',
-            jwt_auth_header: "Mailroom-Api-Request",
-            jwt_issuer: "mailroom",
-            jwt_algorithm: "HS256",
-            jwt_secret_path: "secret_path"
+        let(:mailbox) do
+          build_mailbox({
+                          delivery_options: {
+                            url: 'http://localhost/inbox',
+                            jwt_auth_header: "Mailroom-Api-Request",
+                            jwt_issuer: "mailroom",
+                            jwt_algorithm: "HS256",
+                            jwt_secret_path: jwt_secret.path,
+                            content_type: 'application/json'
+                          }
+                        })
+        end
+
+        let(:headers) do
+          {
+            'Content-Type' => 'application/json',
+            'Mailroom-Api-Request' => /.*/
           }
-        })}
-
-        let(:delivery_options) {
-          MailRoom::Delivery::Postback::Options.new(mailbox)
-        }
-
-        it 'posts the message with faraday' do
-          connection = stub
-          request = stub
-          Faraday.stubs(:new).returns(connection)
-
-          connection.expects(:post).yields(request).twice
-          request.stubs(:url)
-          request.stubs(:body=)
-          request.stubs(:headers).returns({})
-
-          jwt = stub
-          MailRoom::JWT.expects(:new).with(
-            header: 'Mailroom-Api-Request',
-            issuer: 'mailroom',
-            algorithm: 'HS256',
-            secret_path: 'secret_path'
-          ).returns(jwt)
-          jwt.stubs(:valid?).returns(true)
-          jwt.stubs(:header).returns('Mailroom-Api-Request')
-          jwt.stubs(:token).returns('a_jwt_token')
-
-          delivery = MailRoom::Delivery::Postback.new(delivery_options)
-
-          delivery.deliver('a message')
-          expect(request.headers['Mailroom-Api-Request']).to eql('a_jwt_token')
-
-          # A different jwt token for the second time
-          jwt.stubs(:token).returns('another_jwt_token')
-
-          delivery.deliver('another message')
-          expect(request.headers['Mailroom-Api-Request']).to eql('another_jwt_token')
         end
+
+        let(:jwt_secret) do
+          file = Tempfile.new('secret')
+          file.write("test secret")
+          file
+        end
+
+        after do
+          jwt_secret.unlink
+        end
+
+        it_behaves_like 'message poster'
       end
     end
   end

data/spec/lib/delivery/sidekiq_spec.rb

@@ -6,17 +6,9 @@ describe MailRoom::Delivery::Sidekiq do
   let(:redis) { subject.send(:client) }
   let(:raw_client) { redis._client }
   let(:options) { MailRoom::Delivery::Sidekiq::Options.new(mailbox) }
-  let(:redis5) { Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0') }
-  let(:server_url) do
-    if redis5
-      raw_client.config.server_url
-    else
-      raw_client.options[:url]
-    end
-  end
 
   describe '#options' do
-    let(:redis_url) { 'redis://localhost' }
+    let(:redis_url) { 'redis://localhost:6379' }
     let(:redis_options) { { redis_url: redis_url } }
 
     context 'when only redis_url is specified' do
@@ -28,10 +20,8 @@ describe MailRoom::Delivery::Sidekiq do
       }
 
       context 'with simple redis url' do
-        let(:expected_url) { redis5 ? "#{redis_url}:6379/0" : redis_url }
-
         it 'client has same specified redis_url' do
-          expect(raw_client.server_url).to eq(expected_url)
+          expect(raw_client.config.server_url).to eq(redis_url)
         end
 
         it 'client is a instance of RedisNamespace class' do
@@ -45,19 +35,17 @@ describe MailRoom::Delivery::Sidekiq do
       end
 
       context 'with redis_db specified in options' do
-        let(:expected_url) { redis5 ? "#{redis_url}:6379/4" : redis_url }
-
         before do
           redis_options[:redis_db] = 4
         end
 
         it 'client has correct redis_url' do
-          expect(raw_client.server_url).to eq(expected_url)
+          expect(raw_client.config.server_url).to eq("#{redis_url}/4")
         end
 
         it 'connection has correct values' do
-          expect(redis.connection[:host]).to eq('localhost')
-          expect(redis.connection[:db]).to eq(4)
+          expect(raw_client.config.host).to eq('localhost')
+          expect(raw_client.config.db).to eq(4)
         end
       end
     end
@@ -96,17 +84,39 @@ describe MailRoom::Delivery::Sidekiq do
         )
       }
 
+      before { ::RedisClient::SentinelConfig.any_instance.stubs(:resolve_master).returns(RedisClient::Config.new(**sentinels.first)) }
+
       it 'client has same specified sentinel params' do
-        if redis5
+        expect(raw_client.config).to be_a RedisClient::SentinelConfig
+        expect(raw_client.config.host).to eq('10.0.0.1')
+        expect(raw_client.config.name).to eq('sentinel-master')
+        expect(raw_client.config.password).to eq('mypassword')
+        expect(raw_client.config.sentinels.map(&:server_url)).to eq(["redis://10.0.0.1:26379"])
+      end
+
+      context 'with separate Sentinel username and password' do
+        let(:sentinel_username) { 'my-sentinel-user' }
+        let(:sentinel_password) { 'my-sentinel-pass' }
+        let(:mailbox) {
+          build_mailbox(
+            delivery_method: :sidekiq,
+            delivery_options: {
+              redis_url: redis_url,
+              sentinels: sentinels,
+              sentinel_username: sentinel_username,
+              sentinel_password: sentinel_password
+            }
+          )
+        }
+
+        it 'client uses Sentinel username and password' do
+          expect(raw_client.config).to be_a RedisClient::SentinelConfig
           expect(raw_client.config.password).to eq('mypassword')
-          client_sentinels = raw_client.config.sentinels
-          expect(client_sentinels.length).to eq(sentinels.length)
-          expect(client_sentinels[0].host).to eq('10.0.0.1')
-          expect(client_sentinels[0].port).to eq(26379) # rubocop:disable Style/NumericLiterals
-        else
-          expect(raw_client.options[:host]).to eq('sentinel-master')
-          expect(raw_client.options[:password]).to eq('mypassword')
-          expect(raw_client.options[:sentinels]).to eq(sentinels)
+
+          sentinels = raw_client.config.sentinels
+
+          expect(sentinels.map(&:username).uniq).to eq([sentinel_username])
+          expect(sentinels.map(&:password).uniq).to eq([sentinel_password])
         end
       end
     end

data/spec/lib/health_check_spec.rb

@@ -34,12 +34,14 @@ describe MailRoom::HealthCheck do
 
   describe '#run' do
     it 'sets running to true' do
-      server = stub(start: true)
+      server = stub(start: true, shutdown: true)
       subject.stubs(:create_server).returns(server)
 
       subject.run
 
       expect(subject.running).to be true
+
+      subject.quit
     end
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Tony Pitale
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -64,7 +63,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -74,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -140,14 +139,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +276,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -337,10 +337,9 @@ files:
 - spec/lib/message_spec.rb
 - spec/lib/microsoft_graph/connection_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/tpitale/mail_room
+homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-mail_room
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -355,8 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or
   letter_opener