From cb0bd89ae14f56bccab3e03249607b13a52c8009 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 11 Oct 2018 09:47:54 -0700
Subject: [PATCH 1/2] Fixes #10289: Create proper tmp dir for ControlPath

Prior to this commit, when creating the ControlPath tmp dir for
socket path, Vagrant would simply rely on `rand(1000)` for making unique
dirs for rsyncing files which could result in collisions. This commit
updates that be properly using `Dir.mktmpdir` with a `vagrant-rsync-`
prefix.
---
 plugins/synced_folders/rsync/helper.rb             |  2 +-
 .../plugins/synced_folders/rsync/helper_test.rb    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index 892649e2f..557bd83d2 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -81,7 +81,7 @@ module VagrantPlugins
         # too long for unix domain sockets.
         control_options = ""
         unless Vagrant::Util::Platform.windows?
-          controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}")
+          controlpath = Dir.mktmpdir("vagrant-rsync-")
           control_options = "-o ControlMaster=auto -o ControlPath=#{controlpath} -o ControlPersist=10m "
         end
 
diff --git a/test/unit/plugins/synced_folders/rsync/helper_test.rb b/test/unit/plugins/synced_folders/rsync/helper_test.rb
index de8f41503..3e6c1274a 100644
--- a/test/unit/plugins/synced_folders/rsync/helper_test.rb
+++ b/test/unit/plugins/synced_folders/rsync/helper_test.rb
@@ -212,6 +212,20 @@ describe VagrantPlugins::SyncedFolderRSync::RsyncHelper do
         subject.rsync_single(machine, ssh_info, opts)
       end
     end
+
+    context "control sockets" do
+      it "creates a tmp dir" do
+        allow(Vagrant::Util::Platform).to receive(:windows?).and_return(false)
+        allow(Dir).to receive(:mktmpdir).with("vagrant-rsync-").
+          and_return("/tmp/vagrant-rsync-12345")
+
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { |*args|
+          expect(args[9]).to include("ControlPath=/tmp/vagrant-rsync-12345")
+        }.and_return(result)
+
+        subject.rsync_single(machine, ssh_info, opts)
+      end
+    end
   end
 
   describe "#rsync_single with custom ssh_info" do

From cc14b43a9680811f6abf9fd1e7214a34c6b63da6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 11 Oct 2018 09:57:20 -0700
Subject: [PATCH 2/2] Ensure `tmpdir` is loaded for rsync helper class

---
 plugins/synced_folders/rsync/helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index 557bd83d2..c190cf3c1 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -1,5 +1,6 @@
 require "ipaddr"
 require "shellwords"
+require "tmpdir"
 
 require "vagrant/util/platform"
 require "vagrant/util/subprocess"