From fcdc63ff8978f35dc13722713cb951fb685e9c32 Mon Sep 17 00:00:00 2001
From: Rui Lopes <rgl@ruilopes.com>
Date: Sat, 10 Oct 2020 19:31:06 +0100
Subject: [PATCH] let the user configure the cloud_init mime part
 content-disposition filename

---
 .../action/builtin/cloud_init_setup.rb        |  1 +
 plugins/kernel_v2/config/cloud_init.rb        |  7 +++++
 .../action/builtin/cloud_init_setup_test.rb   | 26 +++++++++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/action/builtin/cloud_init_setup.rb b/lib/vagrant/action/builtin/cloud_init_setup.rb
index 2e9be9b5d..2f4e99035 100644
--- a/lib/vagrant/action/builtin/cloud_init_setup.rb
+++ b/lib/vagrant/action/builtin/cloud_init_setup.rb
@@ -61,6 +61,7 @@ module Vagrant
           # in VagrantConfigCloudInit.
           content_type = cfg.content_type.split('/', 2).last
           text_msg = MIME::Text.new(text, content_type)
+          text_msg.disposition = "attachment; filename=\"#{File.basename(cfg.content_disposition_filename).gsub('"', '\"')}\"" if cfg.content_disposition_filename
 
           text_msg
         end
diff --git a/plugins/kernel_v2/config/cloud_init.rb b/plugins/kernel_v2/config/cloud_init.rb
index fc7a1bc28..0eccf2a9b 100644
--- a/plugins/kernel_v2/config/cloud_init.rb
+++ b/plugins/kernel_v2/config/cloud_init.rb
@@ -30,6 +30,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :content_type
 
+      # The optional mime-part content-disposition filename.
+      #
+      # @return [String]
+      attr_accessor :content_disposition_filename
+
       # @return [String]
       attr_accessor :path
 
@@ -42,6 +47,7 @@ module VagrantPlugins
         @type = type if type
 
         @content_type = UNSET_VALUE
+        @content_disposition_filename = UNSET_VALUE
         @path = UNSET_VALUE
         @inline = UNSET_VALUE
 
@@ -57,6 +63,7 @@ module VagrantPlugins
         end
 
         @content_type = nil if @content_type == UNSET_VALUE
+        @content_disposition_filename = nil if @content_disposition_filename == UNSET_VALUE
         @path = nil if @path == UNSET_VALUE
         @inline = nil if @inline == UNSET_VALUE
       end
diff --git a/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb b/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb
index 40607d849..a900a1e61 100644
--- a/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb
+++ b/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb
@@ -17,9 +17,15 @@ describe Vagrant::Action::Builtin::CloudInitSetup do
   let(:ui)  { double("ui", info: true, warn: true) }
 
   let(:cfg) { double("cfg", type: :user_data, content_type: "text/cloud-config",
-                     path: "my/path", inline: nil) }
+                     content_disposition_filename: nil, path: "my/path",
+                     inline: nil) }
   let(:cfg_inline) { double("cfg", type: :user_data, content_type: "text/cloud-config",
-                     inline: "data: true", path: nil) }
+                            content_disposition_filename: nil, inline: "data: true",
+                            path: nil) }
+  let(:cfg_with_content_disposition_filename_inline) {
+    double("cfg", type: :user_data, content_type: "text/x-shellscript",
+           content_disposition_filename: "test.ps1",
+           inline: "#ps1_sysnative\n", path: nil) }
   let(:cloud_init_configs) { [cfg, cfg_inline] }
 
   let(:text_cfgs) { [MIME::Text.new("data: true", "cloud-config"),
@@ -69,16 +75,26 @@ describe Vagrant::Action::Builtin::CloudInitSetup do
     let(:cfg_text) { "config: true" }
 
     it "takes a text cfg path and saves it as a MIME text message" do
+      mime_text_part = double("mime_text_part")
+      expect(mime_text_part).not_to receive(:disposition=)
       allow(File).to receive(:read).and_return(cfg_text)
-
-      expect(MIME::Text).to receive(:new).with(cfg_text, "cloud-config")
+      expect(MIME::Text).to receive(:new).with(cfg_text, "cloud-config").and_return(mime_text_part)
       subject.read_text_cfg(machine, cfg)
     end
 
     it "takes a text cfg inline string and saves it as a MIME text message" do
-      expect(MIME::Text).to receive(:new).with("data: true", "cloud-config")
+      mime_text_part = double("mime_text_part")
+      expect(mime_text_part).not_to receive(:disposition=)
+      expect(MIME::Text).to receive(:new).with("data: true", "cloud-config").and_return(mime_text_part)
       subject.read_text_cfg(machine, cfg_inline)
     end
+
+    it "takes a text cfg inline string with content_disposition_filename and saves it as a MIME text message" do
+      mime_text_part = double("mime_text_part")
+      expect(mime_text_part).to receive(:disposition=).with("attachment; filename=\"test.ps1\"")
+      expect(MIME::Text).to receive(:new).with("#ps1_sysnative\n", "x-shellscript").and_return(mime_text_part)
+      subject.read_text_cfg(machine, cfg_with_content_disposition_filename_inline)
+    end
   end
 
   describe "#generate_cfg_msg" do