discourse_mail_receiver 4.0.6 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72fe5eeee1a64327ea7295c1cf30188400ffd676afbd52eb8a93ef46d9b55e69
-  data.tar.gz: 9e4ba32c89d81b996ec6b380ab4625a2240d5a19338532296f9b5fd2a5019bd0
+  metadata.gz: 621926d0206bd4c21fc7e1c138ca3674154abba678c2e12f340391821c3232f3
+  data.tar.gz: 746ba23e178eb0b46f88827c6da15819a956576ff4fa91d344dcd429473a04e5
 SHA512:
-  metadata.gz: b7460dc6e50026a499b54abe29ad0bcd4cb23f44ccb3d611b0847ad71dd19533fff31b78c0bdb92cf3831609c46e9c153a16bedf6097738798e6252a405c7d29
-  data.tar.gz: 45a839a7762bde4bbb9c0d60065618b6b702709489345cfdd504f2cd606f5a5c6a0d1f75309e12764794fd3304deb007575da98015053392a2d9c282ec96bd91
+  metadata.gz: 85da9c1a37912f5962c9ca3b7f3f297818a4f95cba651855427c67007fa1f18b70ee52a43bc301ebfc4d5d2e7f37cf33cd1624ecd14fa0615dadd688c37e8ef6
+  data.tar.gz: 9dfae7da9939d77675cfad66aff9f3b732d09d3d5db3b9260b0093fbaedbb7cb7c59cf7ffaef5c43f336af083887a7b425dea3a604793aabc1c255d388afca8a

data/lib/mail_receiver/discourse_mail_receiver.rb

@@ -1,11 +1,11 @@
-require 'syslog'
-require 'json'
+# frozen_string_literal: true
+require "syslog"
+require "json"
 require "uri"
 require "net/http"
-require_relative 'mail_receiver_base'
+require_relative "mail_receiver_base"
 
 class DiscourseMailReceiver < MailReceiverBase
-
   def initialize(env_file = nil, recipient = nil, mail = nil)
     super(env_file)
 
@@ -22,8 +22,8 @@ class DiscourseMailReceiver < MailReceiverBase
 
     @endpoint = @env["DISCOURSE_MAIL_ENDPOINT"]
 
-    if @env['DISCOURSE_BASE_URL']
-      @endpoint = "#{@env['DISCOURSE_BASE_URL']}/admin/email/handle_mail"
+    if @env["DISCOURSE_BASE_URL"]
+      @endpoint = "#{@env["DISCOURSE_BASE_URL"]}/admin/email/handle_mail"
     end
     @endpoint
   end
@@ -54,5 +54,4 @@ class DiscourseMailReceiver < MailReceiverBase
     logger.err "Failed to POST the e-mail to %s: %s", endpoint, response.code
     :failure
   end
-
 end

data/lib/mail_receiver/fast_rejection.rb

@@ -1,21 +1,25 @@
-require 'set'
-require 'syslog'
-require 'json'
-require 'uri'
-require 'cgi'
-require 'net/http'
+# frozen_string_literal: true
 
-require_relative 'mail'
-require_relative 'mail_receiver_base'
+# rubocop:disable Lint/RedundantRequireStatement
+# require "set" is needed for Set
+require "set"
+require "syslog"
+require "json"
+require "uri"
+require "cgi"
+require "net/http"
 
-class FastRejection < MailReceiverBase
+require_relative "mail"
+require_relative "mail_receiver_base"
 
+class FastRejection < MailReceiverBase
   def initialize(env_file)
     super(env_file)
 
-    @disabled = @env['DISCOURSE_FAST_REJECTION_DISABLED'] || !@env['DISCOURSE_BASE_URL']
+    @disabled = @env["DISCOURSE_FAST_REJECTION_DISABLED"] || !@env["DISCOURSE_BASE_URL"]
 
-    @blacklisted_sender_domains = @env.fetch('BLACKLISTED_SENDER_DOMAINS', "").split(" ").map(&:downcase).to_set
+    @blacklisted_sender_domains =
+      Set.new(@env.fetch("BLACKLISTED_SENDER_DOMAINS", "").split(" ").map(&:downcase))
   end
 
   def disabled?
@@ -23,7 +27,7 @@ class FastRejection < MailReceiverBase
   end
 
   def process
-    $stdout.sync = true   # unbuffered output
+    $stdout.sync = true # unbuffered output
 
     args = {}
     while line = gets
@@ -31,29 +35,29 @@ class FastRejection < MailReceiverBase
       line = line.chomp
       if line.empty?
         puts "action=#{process_single_request(args)}"
-        puts ''
+        puts ""
 
-        args = {}  # reset for next request.
+        args = {} # reset for next request.
       else
-        k, v = line.chomp.split('=', 2)
+        k, v = line.chomp.split("=", 2)
         args[k] = v
       end
     end
   end
 
   def process_single_request(args)
-    return 'dunno' if disabled?
+    return "dunno" if disabled?
 
-    if args['request'] != 'smtpd_access_policy'
-      return 'defer_if_permit Internal error, Request type invalid'
-    elsif args['protocol_state'] != 'RCPT'
-      return 'dunno'
-    elsif args['sender'].nil?
+    if args["request"] != "smtpd_access_policy"
+      return "defer_if_permit Internal error, Request type invalid"
+    elsif args["protocol_state"] != "RCPT"
+      return "dunno"
+    elsif args["sender"].nil?
       # Note that while this key should always exist, its value may be the empty
       # string.  Postfix will convert the "<>" null sender to "".
-      return 'defer_if_permit No sender specified'
-    elsif args['recipient'].nil?
-      return 'defer_if_permit No recipient specified'
+      return "defer_if_permit No sender specified"
+    elsif args["recipient"].nil?
+      return "defer_if_permit No recipient specified"
     end
 
     run_filters(args)
@@ -61,8 +65,8 @@ class FastRejection < MailReceiverBase
 
   def maybe_reject_email(from, to)
     uri = URI.parse(endpoint)
-    fromarg = CGI::escape(from)
-    toarg = CGI::escape(to)
+    fromarg = CGI.escape(from)
+    toarg = CGI.escape(to)
 
     qs = "from=#{fromarg}&to=#{toarg}"
     if uri.query && !uri.query.empty?
@@ -79,7 +83,10 @@ class FastRejection < MailReceiverBase
       get["Api-Key"] = key
       response = http.request(get)
     rescue StandardError => ex
-      logger.err "Failed to GET smtp_should_reject answer from %s: %s (%s)", endpoint, ex.message, ex.class
+      logger.err "Failed to GET smtp_should_reject answer from %s: %s (%s)",
+                 endpoint,
+                 ex.message,
+                 ex.class
       logger.err ex.backtrace.map { |l| "  #{l}" }.join("\n")
       return "defer_if_permit Internal error, API request preparation failed"
     ensure
@@ -88,28 +95,23 @@ class FastRejection < MailReceiverBase
 
     if Net::HTTPSuccess === response
       reply = JSON.parse(response.body)
-      if reply['reject']
-        return "reject #{reply['reason']}"
-      end
+      return "reject #{reply["reason"]}" if reply["reject"]
     else
       logger.err "Failed to GET smtp_should_reject answer from %s: %s", endpoint, response.code
       return "defer_if_permit Internal error, API request failed"
     end
 
-    "dunno"  # let future tests also be allowed to reject this one.
+    "dunno" # let future tests also be allowed to reject this one.
   end
 
   def endpoint
-    "#{@env['DISCOURSE_BASE_URL']}/admin/email/smtp_should_reject.json"
+    "#{@env["DISCOURSE_BASE_URL"]}/admin/email/smtp_should_reject.json"
   end
 
   private
 
   def run_filters(args)
-    filters = [
-      :maybe_reject_by_sender_domain,
-      :maybe_reject_by_api,
-    ]
+    filters = %i[maybe_reject_by_sender_domain maybe_reject_by_api]
 
     filters.each do |f|
       action = send(f, args)
@@ -120,25 +122,24 @@ class FastRejection < MailReceiverBase
   end
 
   def maybe_reject_by_sender_domain(args)
-    sender = args['sender']
+    sender = args["sender"]
 
     return "dunno" if sender.empty?
 
     domain = domain_from_addrspec(sender)
     if domain.empty?
       logger.info("deferred mail with domainless sender #{sender}")
-      return 'defer_if_permit Invalid sender'
+      return "defer_if_permit Invalid sender"
     end
     if @blacklisted_sender_domains.include? domain
       logger.info("rejected mail from blacklisted sender domain #{domain} (from #{sender})")
-      return 'reject Invalid sender'
+      return "reject Invalid sender"
     end
 
     "dunno"
   end
 
   def maybe_reject_by_api(args)
-    maybe_reject_email(args['sender'], args['recipient'])
+    maybe_reject_email(args["sender"], args["recipient"])
   end
-
 end

data/lib/mail_receiver/mail.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Parse and return the domain from an Internet addr-spec.  Return value is
 # normalised to lowercase.
 #

data/lib/mail_receiver/mail_receiver_base.rb

@@ -1,20 +1,20 @@
+# frozen_string_literal: true
 class MailReceiverBase
-  class ReceiverException < StandardError; end;
+  class ReceiverException < StandardError
+  end
 
   attr_reader :env
 
   def initialize(env_file)
-    unless File.exists?(env_file)
-      fatal "Config file %s does not exist. Aborting.", env_file
-    end
+    fatal "Config file %s does not exist. Aborting.", env_file unless File.exist?(env_file)
 
     @env = JSON.parse(File.read(env_file))
 
-    %w{DISCOURSE_API_KEY DISCOURSE_API_USERNAME}.each do |kw|
+    %w[DISCOURSE_API_KEY DISCOURSE_API_USERNAME].each do |kw|
       fatal "env var %s is required", kw unless @env[kw]
     end
 
-    if @env['DISCOURSE_MAIL_ENDPOINT'].nil? && @env['DISCOURSE_BASE_URL'].nil?
+    if @env["DISCOURSE_MAIL_ENDPOINT"].nil? && @env["DISCOURSE_BASE_URL"].nil?
       fatal "DISCOURSE_MAIL_ENDPOINT and DISCOURSE_BASE_URL env var missing"
     end
   end
@@ -28,11 +28,11 @@ class MailReceiverBase
   end
 
   def key
-    @env['DISCOURSE_API_KEY']
+    @env["DISCOURSE_API_KEY"]
   end
 
   def username
-    @env['DISCOURSE_API_USERNAME']
+    @env["DISCOURSE_API_USERNAME"]
   end
 
   def fatal(*args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_mail_receiver
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.1.0
 platform: ruby
 authors:
 - Discourse Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -25,33 +25,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
-  type: :development
+        version: 0.3.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: syntax_tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: syntax_tree-disable_ternary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: A gem used to package the core .rb files of the mail-receiver.
 email:
 - team@discourse.org
@@ -67,7 +123,7 @@ homepage: https://github.com/discourse/mail-receiver
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,15 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: A gem used to package the core .rb files of the mail-receiver.
 test_files: []