gitlab-mail_room 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38092bd49b7554fc1f14f45b250737db77a58ce851e78ac9c3eb89c17424881
-  data.tar.gz: 04a4a167905034fcab7ee3c095991103b2bb5f92ff414c0cb6ca360017ae6f3b
+  metadata.gz: 1acb9f27f253f776bd924c9dfa75228f964a37ec3364fd6a557f916da85c3af1
+  data.tar.gz: 9397eee73f27be29ca26296b8525d5bb689856d70d46fedf0844cf08b0b575b7
 SHA512:
-  metadata.gz: 9d09917cbc928d36ea820d06957ad9bc3d47726017abdb307dc734e2b6ef4203dc95866e0821821b461bc86384c7670ad187b3cae0d31e2294501a762d4a9ea9
-  data.tar.gz: acea6980fe10c44333325ffd57cd78007302abf5d58e8a11c12e70a0b0aaf61bcea627b14b31bc24dcfe68f938d50a15ba91e60130aeeafbe7fb079b38dddfad
+  metadata.gz: d45ef4ad64a91e09f146c44673612aa7211ceebd2f42907db1d525b18d9bf64749b18e2277f1df0e79aceea5108ca5526a673e9c1a6a9a262a902eeb4d64dfda
+  data.tar.gz: 3ba5a0a5dfbd62c1cb5ba5c81d340c08ee075ccd86cbbaa22c675b2dd681537714f79cb5b317e60365a39cdc2e8230fff2d384d481392d056dcca81d0b941c0c

data/.gitlab-ci.yml

@@ -22,7 +22,7 @@ services:
 rspec:
   parallel:
     matrix:
-      - RUBY_VERSION: [ "3.0", "3.1", "3.2" ]
+      - RUBY_VERSION: [ "3.0", "3.1", "3.2", "3.3", "3.4" ]
   <<: *test
 
 include:

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/.tool-versions

@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.4.1

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
 
@@ -76,14 +75,14 @@ module MailRoom
           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
 

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Tony Pitale
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -341,7 +340,6 @@ files:
 homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-mail_room
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,8 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-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