From a20fdd591bd5b1596983f5e1ee6ffed4e0b1f5f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= <josef.simanek@gmail.com>
Date: Wed, 23 Mar 2022 19:23:08 +0100
Subject: [PATCH] Add Mail::YAML#load compatible with Psych 3.x and Psych 4.x.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Vít Ondruch <vondruch@redhat.com>
---
 lib/mail/message.rb          |  4 ++--
 lib/mail/yaml.rb             | 30 ++++++++++++++++++++++++++++++
 spec/mail/message_spec.rb    |  8 ++++----
 spec/mail/parts_list_spec.rb |  2 +-
 spec/mail/yaml_spec.rb       | 13 +++++++++++++
 5 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 lib/mail/yaml.rb
 create mode 100644 spec/mail/yaml_spec.rb

diff --git a/lib/mail/message.rb b/lib/mail/message.rb
index d3efb0b83..424a4ca78 100644
--- a/lib/mail/message.rb
+++ b/lib/mail/message.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 require 'mail/constants'
 require 'mail/utilities'
-require 'yaml'
+require 'mail/yaml'
 
 module Mail
   # The Message class provides a single point of access to all things to do with an
@@ -1841,7 +1841,7 @@ def to_yaml(opts = {})
     end
 
     def self.from_yaml(str)
-      hash = YAML.load(str)
+      hash = Mail::YAML.load(str)
       m = self.new(:headers => hash['headers'])
       hash.delete('headers')
       hash.each do |k,v|
diff --git a/lib/mail/yaml.rb b/lib/mail/yaml.rb
new file mode 100644
index 000000000..5ec358808
--- /dev/null
+++ b/lib/mail/yaml.rb
@@ -0,0 +1,30 @@
+require 'yaml'
+
+module Mail
+  module YAML
+    def self.load(yaml)
+      permitted_classes = [
+        Symbol,
+
+        Mail::Body,
+
+        # Delivery methods as listed in mail/configuration.rb
+        Mail::SMTP,
+        Mail::Sendmail,
+        Mail::Exim,
+        Mail::FileDelivery,
+        Mail::SMTPConnection,
+        Mail::TestMailer,
+        Mail::LoggerDelivery,
+
+        Mail.delivery_method.class,
+      ]
+
+      if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+        ::YAML.safe_load(yaml, :permitted_classes => permitted_classes)
+      else
+        ::YAML.safe_load(yaml, permitted_classes)
+      end
+    end
+  end
+end
diff --git a/spec/mail/message_spec.rb b/spec/mail/message_spec.rb
index f28b5c4df..6706cb5cc 100644
--- a/spec/mail/message_spec.rb
+++ b/spec/mail/message_spec.rb
@@ -194,7 +194,7 @@ def create_mail_with_splat_args
 
       it "should serialize the basic information to YAML" do
         yaml = @yaml_mail.to_yaml
-        yaml_output = YAML.load(yaml)
+        yaml_output = Mail::YAML.load(yaml)
         expect(yaml_output['headers']['To']).to       eq "someone@somewhere.com"
         expect(yaml_output['headers']['Cc']).to       eq "someoneelse@somewhere.com"
         expect(yaml_output['headers']['Subject']).to  eq "subject"
@@ -212,7 +212,7 @@ def create_mail_with_splat_args
       it "should serialize a Message with a custom delivery_handler" do
         @yaml_mail.delivery_handler = DeliveryAgent
         yaml = @yaml_mail.to_yaml
-        yaml_output = YAML.load(yaml)
+        yaml_output = Mail::YAML.load(yaml)
         expect(yaml_output['delivery_handler']).to eq "DeliveryAgent"
       end
 
@@ -224,7 +224,7 @@ def create_mail_with_splat_args
 
       it "should not deserialize a delivery_handler that does not exist" do
         yaml = @yaml_mail.to_yaml
-        yaml_hash = YAML.load(yaml)
+        yaml_hash = Mail::YAML.load(yaml)
         yaml_hash['delivery_handler'] = "NotARealClass"
         deserialized = Mail::Message.from_yaml(yaml_hash.to_yaml)
         expect(deserialized.delivery_handler).to be_nil
@@ -232,7 +232,7 @@ def create_mail_with_splat_args
 
       it "should deserialize parts as an instance of Mail::PartsList" do
         yaml = @yaml_mail.to_yaml
-        yaml_hash = YAML.load(yaml)
+        yaml_hash = Mail::YAML.load(yaml)
         deserialized = Mail::Message.from_yaml(yaml_hash.to_yaml)
         expect(deserialized.parts).to be_kind_of(Mail::PartsList)
       end
diff --git a/spec/mail/parts_list_spec.rb b/spec/mail/parts_list_spec.rb
index 30dc7d7c8..d22846043 100644
--- a/spec/mail/parts_list_spec.rb
+++ b/spec/mail/parts_list_spec.rb
@@ -95,6 +95,6 @@
 
   it "should have a round-tripping YAML serialization" do
     p = Mail::PartsList.new([1, 2])
-    expect(YAML.load(YAML.dump(p))).to eq(p)
+    expect(Mail::YAML.load(YAML.dump(p))).to eq(p)
   end
 end
diff --git a/spec/mail/yaml_spec.rb b/spec/mail/yaml_spec.rb
new file mode 100644
index 000000000..7c72fe1ab
--- /dev/null
+++ b/spec/mail/yaml_spec.rb
@@ -0,0 +1,13 @@
+# encoding: utf-8
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Mail::YAML do
+
+  describe "#load" do
+
+    it 'loads YAML' do
+      expect(Mail::YAML.load('{}')).to eq({})
+    end
+  end
+end