gitlab-mail_room 0.0.27 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01993f91940b070b674a54518a0f23dc638f80a467e0c8a52ebca8494d8d95d
-  data.tar.gz: 02772517d786fb0d1d1d9b3034604954e110e5d306f2da3ceb9afb186a5509e4
+  metadata.gz: 92305dd07fbde3e525e8a2656a31675f00d295357c211284d5d3b64858ae97c5
+  data.tar.gz: c9232a9916124e91af36e56cc02c7ab26f3613bb0ba4eb4705430e250b71186e
 SHA512:
-  metadata.gz: fc18a26e74e0c69c45a4ec5805bfb4098ed6aa85a4781d68b811a66588572cc0bb6fa87b476a3cf5250c402242393a12a8d89d19ca7ad85fab2a8c8d41bf4520
-  data.tar.gz: 57fc5878d55e7cd0337d4a5f4b8120514a419f6651a9686e1c44bb844de3f9a55379f67f0d2391e8e2cfffd74c499e0d5fa41f334079abcabd1736a8f670b63c
+  metadata.gz: 0d9b23088fa1ec3fef11e128d9af5e198f59f5361cf6516c0d2112c571eb5e515c2dde66a1305158f9db4b5f0a5e5756beab10d9dadaaeb13d70a53f13453869
+  data.tar.gz: 9e13d1174c016aecc8dd8af1c5f75755a8c45d9e11be1bb00bdf14eb53cbffb386c167bc4dd1fb063fb3057bcfbd0a01dfe5766602af3584513ad393a558745d

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-15 01:41:21 UTC using RuboCop version 1.48.1.
+# on 2026-01-14 08:16:06 UTC using RuboCop version 1.82.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,20 +8,17 @@
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemspec
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
 Gemspec/OrderedDependencies:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'mail_room.gemspec'
 
-# Offense count: 5
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Layout/BlockEndNewline:
   Exclude:
@@ -50,14 +47,13 @@ Layout/EmptyLinesAroundAccessModifier:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/delivery/que.rb'
 
-# Offense count: 4
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
     - 'spec/lib/crash_handler_spec.rb'
-    - 'spec/lib/delivery/sidekiq_spec.rb'
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 1
@@ -68,7 +64,7 @@ Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 15
+# Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
@@ -89,13 +85,13 @@ Layout/HashAlignment:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment, AllowRBSInlineAnnotation, AllowSteepAnnotation.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'lib/mail_room/mailbox.rb'
     - 'spec/lib/arbitration/redis_spec.rb'
 
-# Offense count: 5
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Layout/MultilineBlockLayout:
   Exclude:
@@ -120,8 +116,9 @@ Layout/SpaceAroundKeyword:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
 # SupportedStylesForExponentOperator: space, no_space
+# SupportedStylesForRationalLiterals: space, no_space
 Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/mail_room/mailbox.rb'
@@ -138,7 +135,7 @@ Layout/SpaceBeforeBlockBraces:
     - 'spec/lib/crash_handler_spec.rb'
     - 'spec/lib/mailbox_spec.rb'
 
-# Offense count: 51
+# Offense count: 47
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -204,17 +201,18 @@ Lint/RescueException:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 5
+# Offense count: 7
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 27
+  Max: 34
 
-# Offense count: 32
+# Offense count: 34
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -225,12 +223,12 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Max: 169
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 13
+# Offense count: 16
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 22
@@ -240,14 +238,13 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 172
 
-# Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    - 'lib/mail_room/configuration.rb'
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 9
 
 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Security/YAMLLoad:
+Naming/AccessorMethodName:
   Exclude:
     - 'lib/mail_room/configuration.rb'
 
@@ -259,7 +256,7 @@ Style/Alias:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
 
-# Offense count: 16
+# Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
@@ -344,7 +341,7 @@ Style/GuardClause:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent
+# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
 Style/HashSyntax:
   Exclude:
     - 'spec/lib/microsoft_graph/connection_spec.rb'
@@ -385,7 +382,7 @@ Style/PreferredHashMethods:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
@@ -438,7 +435,7 @@ Style/StringConcatenation:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 142
+# Offense count: 147
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -457,7 +454,7 @@ Style/SymbolArray:
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Exclude:
     - 'spec/lib/mailbox_spec.rb'
@@ -484,9 +481,9 @@ Style/WordArray:
   EnforcedStyle: percent
   MinSize: 3
 
-# Offense count: 7
+# Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 177

data/lib/mail_room/arbitration/redis.rb

@@ -3,9 +3,11 @@ require "redis"
 module MailRoom
   module Arbitration
     class Redis
-      Options = Struct.new(:redis_url, :namespace, :sentinels, :sentinel_username, :sentinel_password) do
+      Options = Struct.new(:redis_url, :redis_ssl_params, :namespace, :redis_db, :sentinels, :sentinel_username, :sentinel_password) do
         def initialize(mailbox)
           redis_url = mailbox.arbitration_options[:redis_url] || "redis://localhost:6379"
+          redis_ssl_params = mailbox.arbitration_options[:redis_ssl_params]
+          redis_db  = mailbox.arbitration_options[:redis_db] || 0
           namespace = mailbox.arbitration_options[:namespace]
           sentinels = mailbox.arbitration_options[:sentinels]
           sentinel_username = mailbox.arbitration_options[:sentinel_username]
@@ -18,7 +20,7 @@ module MailRoom
             MSG
           end
 
-          super(redis_url, namespace, sentinels, sentinel_username, sentinel_password)
+          super(redis_url, redis_ssl_params, namespace, redis_db, sentinels, sentinel_username, sentinel_password)
         end
       end
 
@@ -48,7 +50,10 @@ module MailRoom
       def client
         @client ||= begin
           sentinels = options.sentinels
-          redis_options = { url: options.redis_url }
+          redis_options = { url: options.redis_url, db: options.redis_db }
+          # Needed for redis-client 0.26.2 and older: https://github.com/redis-rb/redis-client/pull/277
+          redis_options[:ssl] = true if options.redis_url.start_with?("rediss://")
+          redis_options[:ssl_params] = options.redis_ssl_params if options.redis_ssl_params
           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

data/lib/mail_room/configuration.rb

@@ -15,7 +15,7 @@ module MailRoom
         begin
           erb = ERB.new(File.read(options[:config_path]))
           erb.filename = options[:config_path]
-          config_file = YAML.load(erb.result)
+          config_file = YAML.load(erb.result, symbolize_names: true)
 
           set_mailboxes(config_file[:mailboxes])
           set_health_check(config_file[:health_check])

data/lib/mail_room/delivery/sidekiq.rb

@@ -8,9 +8,10 @@ module MailRoom
     # Sidekiq Delivery method
     # @author Douwe Maan
     class Sidekiq
-      Options = Struct.new(:redis_url, :namespace, :sentinels, :queue, :worker, :logger, :redis_db, :sentinel_username, :sentinel_password) do
+      Options = Struct.new(:redis_url, :redis_ssl_params, :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_ssl_params = mailbox.delivery_options[:redis_ssl_params]
           redis_db  = mailbox.delivery_options[:redis_db] || 0
           namespace = mailbox.delivery_options[:namespace]
           sentinels = mailbox.delivery_options[:sentinels]
@@ -27,7 +28,7 @@ module MailRoom
             MSG
           end
 
-          super(redis_url, namespace, sentinels, queue, worker, logger, redis_db, sentinel_username, sentinel_password)
+          super(redis_url, redis_ssl_params, namespace, sentinels, queue, worker, logger, redis_db, sentinel_username, sentinel_password)
         end
       end
 
@@ -56,6 +57,9 @@ module MailRoom
         @client ||= begin
           sentinels = options.sentinels
           redis_options = { url: options.redis_url, db: options.redis_db }
+          # Needed for redis-client 0.26.2 and older: https://github.com/redis-rb/redis-client/pull/277
+          redis_options[:ssl] = true if options.redis_url.start_with?("rediss://")
+          redis_options[:ssl_params] = options.redis_ssl_params if options.redis_ssl_params
           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

data/lib/mail_room/version.rb

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

data/spec/lib/arbitration/redis_spec.rb

@@ -169,5 +169,28 @@ describe MailRoom::Arbitration::Redis do
         end
       end
     end
+
+    context 'when redis_ssl_params is specified' do
+      let(:redis_url) { ENV['REDIS_URL'] }
+      let(:redis_ssl_params) { { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+      let(:mailbox) {
+        build_mailbox(
+          arbitration_options: {
+            redis_url: redis_url,
+            redis_ssl_params: redis_ssl_params
+          }
+        )
+      }
+
+      after do
+        redis.del("delivered:123")
+      end
+
+      it 'client has same specified ssl_params' do
+        subject.deliver?(123)
+
+        expect(raw_client.config.ssl_params).to eq(redis_ssl_params)
+      end
+    end
   end
 end

data/spec/lib/delivery/sidekiq_spec.rb

@@ -120,5 +120,23 @@ describe MailRoom::Delivery::Sidekiq do
         end
       end
     end
+
+    context 'when redis_ssl_params is specified' do
+      let(:redis_url) { ENV['REDIS_URL'] }
+      let(:redis_ssl_params) { { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+      let(:mailbox) {
+        build_mailbox(
+          delivery_method: :sidekiq,
+          delivery_options: {
+            redis_url: redis_url,
+            redis_ssl_params: redis_ssl_params
+          }
+        )
+      }
+
+      it 'client has same specified ssl_params' do
+        expect(raw_client.config.ssl_params).to eq(redis_ssl_params)
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.1.0
 platform: ruby
 authors:
 - Tony Pitale
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2026-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap