vagrant-lxc 1.0.1 → 1.1.0

data/spec/unit/driver/cli_spec.rb

@@ -30,6 +30,7 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'version' do
     before do
+      allow(subject).to receive(:support_version_command?).and_return(true)
       allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
     end
 
@@ -52,6 +53,7 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'config' do
     before do
+      allow(subject).to receive(:support_version_command?).and_return(support_version_command?)
       allow(subject).to receive(:run).with(:config, 'lxc.lxcpath').and_return(lxc_config_out)
       allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
       allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
@@ -97,9 +99,9 @@ describe Vagrant::LXC::Driver::CLI do
       expect(subject).to have_received(:run).with(
         :create,
         '-B',         backingstore,
-        *(backingstore_opts.flatten),
         '--template', template,
         '--name',     name,
+        *(backingstore_opts.flatten),
         '-f',         config_file,
         '--',
         '--extra-param', 'param',

data/spec/unit/driver_spec.rb

@@ -180,40 +180,102 @@ describe Vagrant::LXC::Driver do
     let(:ro_rw_folder)        { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} }
     let(:with_space_folder)   { {guestpath: '/tmp/with space', hostpath: '/path/with space'} }
     let(:folders)             { [shared_folder, ro_rw_folder, with_space_folder] }
-    let(:rootfs_path)         { Pathname('/path/to/rootfs') }
     let(:expected_guest_path) { "vagrant" }
     let(:sudo_wrapper)        { double(Vagrant::LXC::SudoWrapper, run: true) }
+    let(:rootfs_path)         { Pathname('/path/to/rootfs') }
 
     subject { described_class.new('name', sudo_wrapper) }
 
-    before do
-      subject.stub(rootfs_path: rootfs_path, system: true)
-      subject.share_folders(folders)
-    end
+    describe "with fixed rootfs" do
+      before do
+        subject.stub(rootfs_path: Pathname('/path/to/rootfs'), system: true)
+        subject.share_folders(folders)
+      end
 
-    it "creates guest folder under container's rootfs" do
-      expect(sudo_wrapper).to have_received(:run).with("mkdir", "-p", "#{rootfs_path}/#{expected_guest_path}")
-    end
+      it "creates guest folder under container's rootfs" do
+        expect(sudo_wrapper).to have_received(:run).with("mkdir", "-p", "#{rootfs_path}/#{expected_guest_path}")
+      end
+
+      it 'adds a mount.entry to its local customizations' do
+        expect(subject.customizations).to include [
+          'mount.entry',
+          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
+        ]
+      end
 
-    it 'adds a mount.entry to its local customizations' do
-      expect(subject.customizations).to include [
-        'mount.entry',
-        "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
-      ]
+      it 'supports additional mount options' do
+        expect(subject.customizations).to include [
+          'mount.entry',
+          "#{ro_rw_folder[:hostpath]} vagrant/ro_rw none ro,rw 0 0"
+        ]
+      end
+
+      it 'supports directories with spaces' do
+        expect(subject.customizations).to include [
+          'mount.entry',
+          "/path/with\\040space tmp/with\\040space none bind 0 0"
+        ]
+      end
     end
 
-    it 'supports additional mount options' do
-      expect(subject.customizations).to include [
-        'mount.entry',
-        "#{ro_rw_folder[:hostpath]} vagrant/ro_rw none ro,rw 0 0"
-      ]
+    describe "with directory-based LXC config" do
+      let(:config_string) {
+        <<-ENDCONFIG.gsub(/^\s+/, '')
+          # Blah blah comment
+          lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
+          lxc.mount.entry = sysfs sys sysfs defaults  0 0
+          lxc.tty = 4
+          lxc.pts = 1024
+          lxc.rootfs = #{rootfs_path}
+          # VAGRANT-BEGIN
+          lxc.network.type=veth
+          lxc.network.name=eth1
+          # VAGRANT-END
+        ENDCONFIG
+      }
+
+      before do
+        subject { described_class.new('name', sudo_wrapper) }
+        subject.stub(config_string: config_string)
+        subject.share_folders(folders)
+      end
+
+      it 'adds a mount.entry to its local customizations' do
+        expect(subject.customizations).to include [
+          'mount.entry',
+          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
+        ]
+      end
     end
 
-    it 'supports directories with spaces' do
-      expect(subject.customizations).to include [
-        'mount.entry',
-        "/path/with\\040space tmp/with\\040space none bind 0 0"
-      ]
+    describe "with overlayfs-based LXC config" do
+      let(:config_string) {
+        <<-ENDCONFIG.gsub(/^\s+/, '')
+          # Blah blah comment
+          lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
+          lxc.mount.entry = sysfs sys sysfs defaults  0 0
+          lxc.tty = 4
+          lxc.pts = 1024
+          lxc.rootfs = overlayfs:/path/to/master/directory:#{rootfs_path}
+          # VAGRANT-BEGIN
+          lxc.network.type=veth
+          lxc.network.name=eth1
+          # VAGRANT-END
+        ENDCONFIG
+      }
+
+      before do
+        subject { described_class.new('name', sudo_wrapper) }
+        subject.stub(config_string: config_string)
+        subject.share_folders(folders)
+      end
+
+      it 'adds a mount.entry to its local customizations' do
+        expect(subject.customizations).to include [
+          'mount.entry',
+          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
+        ]
+      end
     end
   end
 end

data/templates/sudoers.rb.erb

@@ -4,25 +4,41 @@
 class Whitelist
   class << self
     def add(command, *args)
+      list[command] ||= []
       list[command] << args
     end
 
+    def add_regex(regex, *args)
+      regex_list << [regex, [args]]
+    end
+
     def list
-      @list ||= Hash.new do |key, hsh|
-        key[hsh] = []
-      end
+      @list ||= {}
+    end
+
+    def regex_list
+      @regex_list ||= []
     end
 
     def allowed(command)
-      list[command] || []
+      list[command] || allowed_regex(command) || []
+    end
+
+    def allowed_regex(command)
+      found = regex_list.find { |r| r[0] =~ command }
+      return found[1] if found
     end
 
     def run!(argv)
       begin
         command, args = `which #{argv.shift}`.chomp, argv || []
         check!(command, args)
-        puts `#{command} #{args.join(" ")}`
-        exit $?.to_i
+        system "#{command} #{args.join(" ")}"
+
+        exit_code = $?.to_i
+        exit_code = 1 if exit_code == 256
+
+        exit exit_code
       rescue => e
         STDERR.puts e.message
         exit 1
@@ -88,6 +104,11 @@ Whitelist.add '<%= cmd_paths['rm'] %>', templates_path
 # - Packaging
 Whitelist.add '<%= cmd_paths['tar'] %>', '--numeric-owner', '-cvzf', %r{/tmp/.*/rootfs.tar.gz}, '-C', base_path, './rootfs'
 Whitelist.add '<%= cmd_paths['chown'] %>', /\A\d+:\d+\z/, %r{\A/tmp/.*/rootfs\.tar\.gz\z}
+# - Private network script and commands
+Whitelist.add '<%= cmd_paths['ip'] %>', 'addr', 'add', /(\d+|\.)+\/24/, 'dev', /.+/
+Whitelist.add '<%= cmd_paths['ifconfig'] %>', /.+/, 'down'
+Whitelist.add '<%= cmd_paths['brctl'] %>', 'delbr', /.+/
+Whitelist.add_regex %r{<%= pipework_regex %>}, '**'
 
 ##
 # Commands from driver/cli.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -30,13 +30,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/vagrant-backports/README.md
-- lib/vagrant-backports/action/handle_box.rb
-- lib/vagrant-backports/action/is_state.rb
-- lib/vagrant-backports/action/message.rb
-- lib/vagrant-backports/action/wait_for_communicator.rb
-- lib/vagrant-backports/ui.rb
-- lib/vagrant-backports/utils.rb
 - lib/vagrant-lxc.rb
 - lib/vagrant-lxc/action.rb
 - lib/vagrant-lxc/action/boot.rb
@@ -49,14 +42,14 @@ files:
 - lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb
 - lib/vagrant-lxc/action/forced_halt.rb
 - lib/vagrant-lxc/action/forward_ports.rb
+- lib/vagrant-lxc/action/gc_private_network_bridges.rb
 - lib/vagrant-lxc/action/handle_box_metadata.rb
-- lib/vagrant-lxc/action/message.rb
 - lib/vagrant-lxc/action/prepare_nfs_settings.rb
 - lib/vagrant-lxc/action/prepare_nfs_valid_ids.rb
+- lib/vagrant-lxc/action/private_networks.rb
 - lib/vagrant-lxc/action/remove_temporary_files.rb
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/warn_networks.rb
-- lib/vagrant-lxc/backports/action/share_folders.rb
 - lib/vagrant-lxc/command/root.rb
 - lib/vagrant-lxc/command/sudoers.rb
 - lib/vagrant-lxc/config.rb
@@ -71,6 +64,7 @@ files:
 - lib/vagrant-lxc/version.rb
 - locales/en.yml
 - scripts/lxc-template
+- scripts/pipework
 - spec/Vagrantfile
 - spec/fixtures/sample-ip-addr-output
 - spec/spec_helper.rb

data/lib/vagrant-backports/README.md

@@ -1,12 +0,0 @@
-# vagrant-backports
-
-<!--
-[![Build Status](https://travis-ci.org/fgrehm/vagrant-backports.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-backports) [![Gem Version](https://badge.fury.io/rb/vagrant-backports.png)](http://badge.fury.io/rb/vagrant-backports) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-backports.png)](https://codeclimate.com/github/fgrehm/vagrant-backports) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-backports/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-backports) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
--->
-
-A _"hypothetical"_ gem that helps Vagrant plugin developers to stay sane when
-keeping up with Vagrant improvements by backporting parts of its recent versions
-functionality.
-
-More information will be provided if there is enough interest on having this
-extracted as a separate gem.

data/lib/vagrant-backports/action/handle_box.rb

@@ -1 +0,0 @@
-Vagrant::Action::Builtin.const_set :HandleBox, Vagrant::Action::Builtin::HandleBoxUrl

data/lib/vagrant-backports/action/is_state.rb

@@ -1,34 +0,0 @@
-module Vagrant
-  module Backports
-    module Action
-      # This middleware is meant to be used with Call and can check if
-      # a machine is in the given state ID.
-      class IsState
-        # Note: Any of the arguments can be arrays as well.
-        #
-        # @param [Symbol] target_state The target state ID that means that
-        #   the machine was properly shut down.
-        # @param [Symbol] source_state The source state ID that the machine
-        #   must be in to be shut down.
-        def initialize(app, env, check, **opts)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant::action::builtin::is_state")
-          @check  = check
-          @invert = !!opts[:invert]
-        end
-
-        def call(env)
-          @logger.debug("Checking if machine state is '#{@check}'")
-          state = env[:machine].state.id
-          @logger.debug("-- Machine state: #{state}")
-
-          env[:result] = @check == state
-          env[:result] = !env[:result] if @invert
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-Vagrant::Action::Builtin.const_set :IsState, Vagrant::Backports::Action::IsState

data/lib/vagrant-backports/action/message.rb

@@ -1,20 +0,0 @@
-module Vagrant
-  module Backports
-    module Action
-      # This middleware simply outputs a message to the UI.
-      class Message
-        def initialize(app, env, message, **opts)
-          @app     = app
-          @message = message
-        end
-
-        def call(env)
-          env[:ui].info(@message)
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-Vagrant::Action::Builtin.const_set :Message, Vagrant::Backports::Action::Message

data/lib/vagrant-backports/action/wait_for_communicator.rb

@@ -1,42 +0,0 @@
-# This acts like a backport of Vagrant's built in action from 1.3+ for previous version
-#   https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/wait_for_communicator.rb
-module Vagrant
-  module Backports
-    module Action
-      class WaitForCommunicator
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          @env = env
-
-          raise Vagrant::Errors::VMFailedToBoot if !wait_for_communicator
-
-          @app.call env
-        end
-
-        def wait_for_communicator
-          max_tries = @env[:machine].config.ssh.max_tries.to_i
-          max_tries.times do |i|
-            if @env[:machine].communicate.ready?
-              @env[:ui].info 'Machine booted and ready!'
-              return true
-            end
-
-            # Return true so that the vm_failed_to_boot error doesn't
-            # get shown
-            return true if @env[:interrupted]
-
-            sleep 1 if !@env["vagrant.test"]
-          end
-
-          @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
-          false
-        end
-      end
-    end
-  end
-end
-
-Vagrant::Action::Builtin.const_set :WaitForCommunicator, Vagrant::Backports::Action::WaitForCommunicator

data/lib/vagrant-backports/ui.rb

@@ -1,12 +0,0 @@
-module Vagrant
-  module UI
-    class Interface
-      def output(*args)
-        info(*args)
-      end
-      def detail(*args)
-        info(*args)
-      end
-    end
-  end
-end

data/lib/vagrant-backports/utils.rb

@@ -1,27 +0,0 @@
-module Vagrant
-  module Backports
-    class << self
-      def vagrant_1_2_or_later?
-        greater_than?('1.2.0')
-      end
-
-      def vagrant_1_3_or_later?
-        greater_than?('1.3.0')
-      end
-
-      def vagrant_1_4_or_later?
-        greater_than?('1.4.0')
-      end
-
-      def vagrant_1_5_or_later?
-        greater_than?('1.5.0')
-      end
-
-      private
-
-      def greater_than?(version)
-        Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new(version)
-      end
-    end
-  end
-end

data/lib/vagrant-lxc/backports/action/share_folders.rb

@@ -1,67 +0,0 @@
-module Vagrant
-  module LXC
-    module Action
-      class ShareFolders
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          @env = env
-          prepare_folders
-          add_override_configs
-          @app.call env
-        end
-
-        # This method returns an actual list of synced folders to create and their
-        # proper path.
-        def shared_folders
-          {}.tap do |result|
-            @env[:machine].config.vm.synced_folders.each do |id, data|
-              # Ignore disabled shared folders
-              next if data[:disabled]
-              # This to prevent overwriting the actual shared folders data
-              result[id] = data.dup
-            end
-          end
-        end
-
-        # Prepares the shared folders by verifying they exist and creating them
-        # if they don't.
-        def prepare_folders
-          shared_folders.each do |id, options|
-            hostpath = Pathname.new(options[:hostpath]).expand_path(@env[:root_path])
-
-            if !hostpath.directory? && options[:create]
-              # Host path doesn't exist, so let's create it.
-              @logger.debug("Host path doesn't exist, creating: #{hostpath}")
-
-              begin
-                hostpath.mkpath
-              rescue Errno::EACCES
-                raise Vagrant::Errors::SharedFolderCreateFailed,
-                  :path => hostpath.to_s
-              end
-            end
-          end
-        end
-
-        def add_override_configs
-          @env[:ui].info I18n.t("vagrant.actions.lxc.share_folders.preparing")
-
-          folders = []
-          shared_folders.each do |id, data|
-            folders << {
-              :name      => id,
-              :hostpath  => File.expand_path(data[:hostpath], @env[:root_path]),
-              :guestpath => data[:guestpath]
-            }
-            @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
-                                  :guest_path => data[:guestpath]))
-          end
-          @env[:machine].provider.driver.share_folders(folders)
-        end
-      end
-    end
-  end
-end