vagrant-proxyconf 2.0.3 → 2.0.8

data/lib/vagrant-proxyconf/action/base.rb

@@ -87,13 +87,17 @@ module VagrantPlugins
           local_tmp = tempfile(config)
 
           logger.debug "Configuration (#{path}):\n#{config}"
+
           @machine.communicate.tap do |comm|
-            comm.sudo("rm -f #{tmp}", error_check: false)
             comm.upload(local_tmp.path, tmp)
-            comm.sudo("chmod #{opts[:mode] || '0644'} #{tmp}")
-            comm.sudo("chown #{opts[:owner] || 'root:root'} #{tmp}")
-            comm.sudo("mkdir -p #{File.dirname(path)}")
-            comm.sudo("mv -f #{tmp} #{path}")
+            if comm.test("command -v sudo")
+              comm.sudo("chmod #{opts[:mode] || '0644'} #{tmp}")
+              comm.sudo("chown #{opts[:owner] || 'root:root'} #{tmp}")
+              comm.sudo("mkdir -p #{File.dirname(path)}")
+              comm.sudo("mv -f #{tmp} #{path}")
+            else
+              raise Vagrant::Errors::CommandUnavailable.new(file: "sudo")
+            end
           end
         end
 
@@ -104,11 +108,18 @@ module VagrantPlugins
 
         # @return [Tempfile] a temporary file with the specified content
         def tempfile(content)
-          Tempfile.new("vagrant").tap do |temp|
-            temp.binmode
-            temp.write(content)
-            temp.close
+          tempfile = Tempfile.new("vagrant-proxyconf")
+
+          begin
+            tempfile.tap do |tmp|
+              tmp.binmode
+              tmp.write(content)
+            end
+          ensure
+            tempfile.close
           end
+
+          tempfile
         end
 
         def cap_name

data/lib/vagrant-proxyconf/action/configure_docker_proxy.rb

@@ -39,28 +39,28 @@ module VagrantPlugins
           true
         end
 
-        def docker_client_config_path
-          return @docker_client_config_path if @docker_client_config_path
+        def docker_client_config
+          return @docker_client_config if @docker_client_config
           return if !supports_config_json?
 
-          @docker_client_config_path = tempfile(Hash.new)
+          @docker_client_config = tempfile(Hash.new)
 
           @machine.communicate.tap do |comm|
             if comm.test("[ -f /etc/docker/config.json ]")
               logger.info('Downloading file /etc/docker/config.json')
               comm.sudo("chmod 0644 /etc/docker/config.json")
-              comm.download("/etc/docker/config.json", @docker_client_config_path.path)
-              logger.info("Downloaded /etc/docker/config.json to #{@docker_client_config_path.path}")
+              comm.download("/etc/docker/config.json", @docker_client_config.path)
+              logger.info("Downloaded /etc/docker/config.json to #{@docker_client_config.path}")
             end
           end
 
-          @docker_client_config_path = @docker_client_config_path.path
+          @docker_client_config
         end
 
         def update_docker_client_config
-          return if !supports_config_json? || !docker_client_config_path
+          return if !supports_config_json? || !docker_client_config
 
-          content = File.read(@docker_client_config_path)
+          content = File.read(@docker_client_config)
           data  = JSON.load(content)
 
           if disabled?
@@ -92,20 +92,18 @@ module VagrantPlugins
 
           config_json = JSON.pretty_generate(data)
 
-          @docker_client_config_path = tempfile(config_json)
+          @docker_client_config = tempfile(config_json)
 
           @machine.communicate.tap do |comm|
-            comm.upload(@docker_client_config_path.path, "/tmp/vagrant-proxyconf-docker-config.json")
+            comm.upload(@docker_client_config.path, "/tmp/vagrant-proxyconf-docker-config.json")
             comm.sudo("mkdir -p /etc/docker")
-            comm.sudo("chown root:root /etc/docker")
+            comm.sudo("chown root:docker /etc/docker")
             comm.sudo("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
-            comm.sudo("chown root:root /etc/docker/config.json")
+            comm.sudo("chown root:docker /etc/docker/config.json")
+            comm.sudo("chmod 0644 /etc/docker/config.json")
             comm.sudo("rm -f /tmp/vagrant-proxyconf-docker-config.json")
 
             comm.sudo("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")
-            if !disabled?
-              comm.sudo("echo DOCKER_CONFIG=/etc/docker >> /etc/environment")
-            end
           end
 
           config_json
@@ -135,12 +133,12 @@ module VagrantPlugins
           end
 
           systemd_config = docker_systemd_config
-          @docker_systemd_config = tempfile(systemd_config).path
+          @docker_systemd_config = tempfile(systemd_config)
 
           @machine.communicate.tap do |comm|
 
             comm.sudo("mkdir -p /etc/systemd/system/docker.service.d")
-            comm.upload(@docker_systemd_config, "/tmp/vagrant-proxyconf-docker-systemd-config")
+            comm.upload(@docker_systemd_config.path, "/tmp/vagrant-proxyconf-docker-systemd-config")
 
             if comm.test("diff -Naur /etc/systemd/system/docker.service.d/http-proxy.conf /tmp/vagrant-proxyconf-docker-systemd-config")
               # system config file is the same as the current config
@@ -154,6 +152,7 @@ module VagrantPlugins
             end
 
             comm.sudo('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            comm.sudo('touch /etc/systemd/system/docker.service.d/http-proxy.conf')
             comm.sudo('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
 
             if changed
@@ -197,10 +196,11 @@ module VagrantPlugins
 
           # https://docs.docker.com/network/proxy/#configure-the-docker-client
           # if docker version >= 17.07 it supports config.json
-          return true if major >= 17 && minor >= 7
-
           # docker version < 17.07 so it does not support config.json
-          return false
+          return false if major <= 17 && minor < 7
+
+          # docker version must be >= 17.07 so we return true
+          return true
         end
 
         def supports_systemd?
@@ -234,7 +234,7 @@ module VagrantPlugins
 
           # update config and restart docker when config changed
           comm.sudo("chmod 0644 #{path}.new")
-          comm.sudo("chown root:root #{path}.new")
+          comm.sudo("chown root:docker #{path}.new")
           comm.sudo("mv -f #{path}.new #{path}")
           comm.sudo(service_restart_command)
         end

data/lib/vagrant-proxyconf/config/apt_proxy.rb

@@ -20,6 +20,12 @@ module VagrantPlugins
         # @return [String] the FTP proxy
         key :ftp, env_var: 'VAGRANT_APT_FTP_PROXY'
 
+        # @return [String] whether APT should verify peer certificate
+        key :verify_peer, env_var: 'VAGRANT_APT_VERIFY_PEER'
+
+        # @return [String] whether APT should verify that certificate name matches server name
+        key :verify_host, env_var: 'VAGRANT_APT_VERIFY_HOST'
+
         def finalize!
           super
 
@@ -33,7 +39,15 @@ module VagrantPlugins
 
         # (see KeyMixin#config_for)
         def config_for(key, value)
-          %Q{Acquire::#{key.name}::Proxy #{value.inspect};\n} if value
+          if value
+            if key.name == :verify_host
+              %Q{Acquire::https::Verify-Host #{value.inspect};\n}
+            elsif key.name == :verify_peer
+              %Q{Acquire::https::Verify-Peer #{value.inspect};\n}
+            else
+              %Q{Acquire::#{key.name}::Proxy #{value.inspect};\n}
+            end
+          end
         end
 
         def finalize_uri(key, value)
@@ -55,7 +69,8 @@ module VagrantPlugins
           end
 
           def to_s
-            direct || "#{prefix}#{value}#{suffix}"
+            # direct || "#{prefix}#{value}#{suffix}"
+            direct || verify || "#{prefix}#{value}#{suffix}"
           end
 
           private
@@ -64,6 +79,10 @@ module VagrantPlugins
             'DIRECT' if value.upcase == 'DIRECT'
           end
 
+          def verify
+            value if ["true", "false"].to_set.include? value
+          end
+
           # Hash of deprecation warning sentinels
           @@warned = {}
 

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '2.0.3'
+    VERSION = '2.0.8'
   end
 end

data/spec/unit/support/shared/apt_proxy_config.rb

@@ -8,6 +8,10 @@ end
 def conf_line(proto, name, port = 3142)
   if name == :direct
     %Q{Acquire::#{proto}::Proxy "DIRECT";\n}
+  elsif proto == :verify_peer
+    %Q{Acquire::https::Verify-Peer "#{name}";\n}
+  elsif proto == :verify_host
+    %Q{Acquire::https::Verify-Host "#{name}";\n}
   else
     port = ":#{port}" if port
     %Q{Acquire::#{proto}::Proxy "#{proto}://#{name}#{port}";\n}
@@ -65,6 +69,14 @@ shared_examples "apt proxy config" do |proto|
       end
     end
 
+    [:verify_peer, :verify_host].each do |verify|
+      context "with #{verify.inspect}" do
+        subject        { config_with(verify => "false") }
+        its(:enabled?) { should be_truthy }
+        its(:to_s)     { should eq conf_line(verify, "false") }
+      end
+    end
+
     [false, ""].each do |unset|
       context "with #{unset.inspect}" do
         subject        { config_with(proto => unset) }

data/spec/unit/vagrant-proxyconf/action/configure_docker_proxy_spec.rb

@@ -10,7 +10,7 @@ def mock_write_docker_config(machine)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("cat /tmp/vagrant-proxyconf >> /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :test).with("diff /etc/default/docker.new /etc/default/docker")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/default/docker.new")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/default/docker.new")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mv -f /etc/default/docker.new /etc/default/docker")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("kill -HUP `pgrep -f 'docker'` || systemctl restart docker || service docker restart || /etc/init.d/docker restart")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf /etc/default/docker.new")
@@ -19,12 +19,13 @@ end
 def mock_update_docker_client_config(machine)
   allow(machine).to receive_message_chain(:communicate, :upload)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/docker/config.json")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/docker/config.json")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/docker/config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf-docker-config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("echo DOCKER_CONFIG=/etc/docker >> /etc/environment")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/docker")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/docker")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/docker")
 end
 
 def mock_update_docker_systemd_config(machine)
@@ -71,9 +72,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         docker_proxy = described_class.new(app, env)
         docker_proxy.instance_variable_set(:@machine, machine)
 
-        # #docker_client_config_path mock
+        # #docker_client_config mock
         fixture = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-        docker_proxy.instance_variable_set(:@docker_client_config_path, fixture)
+        docker_proxy.instance_variable_set(:@docker_client_config, fixture)
 
         # #supported? mock
         allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
@@ -123,9 +124,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           docker_proxy = described_class.new(app, env)
           docker_proxy.instance_variable_set(:@machine, machine)
 
-          # #docker_client_config_path mock
+          # #docker_client_config mock
           fixture = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-          docker_proxy.instance_variable_set(:@docker_client_config_path, fixture)
+          docker_proxy.instance_variable_set(:@docker_client_config, fixture)
 
           # #supported? mock
           allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
@@ -163,6 +164,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
             allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/systemd/system/docker.service.d")
             allow(machine).to receive_message_chain(:communicate, :upload).with(@docker_proxy.instance_variable_get(:@docker_systemd_config), "/tmp")
             allow(machine).to receive_message_chain(:communicate, :sudo).with('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('touch /etc/systemd/system/docker.service.d/http-proxy.conf')
             allow(machine).to receive_message_chain(:communicate, :sudo).with('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
             allow(machine).to receive_message_chain(:communicate, :test).with('command -v systemctl').and_return(false)
             allow(machine).to receive_message_chain(:communicate, :test).with('diff -Naur /etc/systemd/system/docker.service.d/http-proxy.conf /tmp/vagrant-proxyconf-docker-systemd-config').and_return(false)
@@ -181,7 +183,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
     end
   end
 
-  describe "#docker_client_config_path" do
+  describe "#docker_client_config" do
     let(:machine) { double('machine') }
 
     context "when not supported" do
@@ -195,7 +197,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
         allow(machine).to receive_message_chain(:guest, :capability).with(:docker_proxy_conf).and_return('/etc/default/docker')
 
-        docker_proxy.send(:docker_client_config_path)
+        docker_proxy.send(:docker_client_config)
       end
 
       it { is_expected.to eq nil }
@@ -206,7 +208,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         subject do
           docker_proxy = described_class.new(nil, nil)
           docker_proxy.instance_variable_set(:@machine, machine)
-          docker_proxy.instance_variable_set(:@docker_client_config_path, nil)
+          docker_proxy.instance_variable_set(:@docker_client_config, nil)
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
 
@@ -214,27 +216,27 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/docker/config.json")
           allow(machine).to receive_message_chain(:communicate, :download)
 
-          docker_proxy.send(:docker_client_config_path)
+          docker_proxy.send(:docker_client_config)
         end
 
-        it { expect(File.exists?(subject)).to eq true }
+        it { expect(File.exists?(subject.path)).to eq true }
       end
 
       context "when /etc/docker/config.json does not exist" do
         subject do
           docker_proxy = described_class.new(nil, nil)
           docker_proxy.instance_variable_set(:@machine, machine)
-          docker_proxy.instance_variable_set(:@docker_client_config_path, nil)
+          docker_proxy.instance_variable_set(:@docker_client_config, nil)
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
 
           allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /etc/docker/config.json ]").and_return(false)
 
-          docker_proxy.send(:docker_client_config_path)
+          docker_proxy.send(:docker_client_config)
         end
 
         it do
-          expect(File.exists?(subject)).to eq true
+          expect(File.exists?(subject.path)).to eq true
           expect(File.read(subject)).to eq "{}"
         end
       end
@@ -263,14 +265,14 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
     end
 
-    context "when #docker_client_config_path returns nil" do
+    context "when #docker_client_config returns nil" do
      it 'return nil' do
         docker_proxy = described_class.new(app, env)
         docker_proxy.instance_variable_set(:@machine, machine)
 
         # mock a result that looks like no proxy is configured for the config.json
         allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
-        allow(docker_proxy).to receive(:docker_client_config_path).and_return(nil)
+        allow(docker_proxy).to receive(:docker_client_config).and_return(nil)
 
         # #supported? mock
         allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
@@ -292,7 +294,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           fixture_content = load_fixture(fixture)
           config_path = docker_proxy.send(:tempfile, fixture_content).path
 
-          docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)
+          docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
           allow(docker_proxy).to receive(:disabled?).and_return(true)
@@ -331,7 +333,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           fixture_content = load_fixture(fixture)
           config_path = docker_proxy.send(:tempfile, fixture_content).path
 
-          docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)
+          docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
           allow(docker_proxy).to receive(:disabled?).and_return(false)
@@ -390,7 +392,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-          docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)
+          docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           # to isolate this test, we turn of support for systemd
           allow(docker_proxy).to receive(:supports_systemd?).and_return(false)
@@ -439,7 +441,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-          docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)
+          docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
           allow(machine).to receive_message_chain(:guest, :capability).with(:docker_proxy_conf).and_return('/etc/default/docker')

data/spec/unit/vagrant-proxyconf/action/configure_svn_proxy_spec.rb

@@ -4,6 +4,7 @@ require 'vagrant-proxyconf/action/configure_svn_proxy'
 def mock_write_config(machine)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf", error_check: false)
   allow(machine).to receive_message_chain(:communicate, :upload)
+  allow(machine).to receive_message_chain(:communicate, :test).with('command -v sudo').and_return(true)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /tmp/vagrant-proxyconf")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /tmp/vagrant-proxyconf")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/subversion")

data/test/issues/172/README.md

@@ -10,7 +10,7 @@ bundle exec vagrant up default
 ## Expect
 
 
-### Box `default``
+### Box `default`
 
   - The box `default` is a docker container that will be a reverse
     proxy. It should provision itself and work without errors.
@@ -21,7 +21,7 @@ bundle exec vagrant up default
   - **NOTE**: You'll need to use `docker exec <hash> -it bash` to get into the container
 
 
-### Box `docker-host`
+### Box `docker_host`
 
   - Vagrant should automatically instally docker-ce.
   - The box should come up and provision itself with the proxy settings

data/test/issues/172/spec/docker_host/redhat_spec.rb

@@ -10,9 +10,9 @@ end
 describe file('/etc/docker/config.json') do
   it { should be_file }
   it { should exist }
-  it { should be_mode 600 }
+  it { should be_mode 644 }
   it { should be_owned_by "root" }
-  it { should be_grouped_into "root" }
+  it { should be_grouped_into "docker" }
 end
 
 context 'when proxy is enabled' do

data/test/issues/180/spec/docker_host/redhat_spec.rb

@@ -10,9 +10,9 @@ end
 describe file('/etc/docker/config.json') do
   it { should be_file }
   it { should exist }
-  it { should be_mode 600 }
+  it { should be_mode 644 }
   it { should be_owned_by "root" }
-  it { should be_grouped_into "root" }
+  it { should be_grouped_into "docker" }
 end
 
 context 'when proxy is enabled' do