vagrant-lxd 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d3c5f71aaa0fb4f5fd3128722bf0d045619f7b56f2f6056f87ab396548d18f
-  data.tar.gz: 966e0817b7bb8fd94b7a865e2799b468a92b4522de5218a088e7502f75d218be
+  metadata.gz: be2300b7aa0ba5ccc8ae1d3ed7af2bbc0da4a1ded7aefe64e9896d26a672d905
+  data.tar.gz: c7e73c349e90e91f180e76f1a550d35852b0aa720a406361ef9f94e692eaa68a
 SHA512:
-  metadata.gz: f222d710cf807b6cbba3a5aae4dc0fb69df34c4a6d7112ef2df727f9218fd5296d8d3ed0a17fcecd8c68e3243bc982ea82a2fcdfedeb0932257bd7f08f940a9d
-  data.tar.gz: 9a0c720fd7130f77bf60663b5e1d7c2f8bc4da4bf74683214e3b4ec1e632334f704085053ae3e564d0cc967a6861d2b7597443fed20be33d8fad38cf13e49445
+  metadata.gz: 9bff61ace1311df547b7b0aa6ccb3917ec950353ac7a164e78971cf2297881e007d559fb86798913d8ae1c91b0c4d9b7d5a2e565d5fd00689ff04f9a64b71dbb
+  data.tar.gz: cb70de69a9de248887c1b3b116fb807f324783ce1adde52f411dc83a1f7245a3da08b687c14385ee34183a144823eec469f7a0968baafdc6455af2e3ccfd154b

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
+/.tool-versions
 /.vagrant/
-/pkg/
 /Vagrantfile
+/pkg/
 /vendor/

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org/'
 
 group :development do
+  require 'pp' # avoid superclass mismatch error
   gem 'fakefs'
   gem 'rake'
   gem 'rspec'

data/Gemfile.lock

@@ -1,33 +1,34 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 1dda6cc14c2d221a8e2e7b5091fed2fca9ba1ecf
+  revision: 7df0e62aded9316485e83fd5548bebbacf702ec7
   specs:
-    vagrant (2.2.6.dev)
+    vagrant (2.2.10.dev)
       bcrypt_pbkdf (~> 1.0.0)
-      childprocess (~> 0.6.0)
+      childprocess (~> 3.0.0)
       ed25519 (~> 1.2.4)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
-      i18n (~> 1.1.1)
+      i18n (~> 1.8)
       listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
+      mime (~> 0.4.4)
       net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 5.1.0)
+      net-ssh (~> 5.2.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
-      rubyzip (~> 1.2.2)
-      vagrant_cloud (~> 2.0.2)
+      rubyzip (~> 2.0)
+      vagrant_cloud (~> 2.0.3)
       wdm (~> 0.1.0)
-      winrm (~> 2.1)
-      winrm-elevated (~> 1.1)
-      winrm-fs (~> 1.0)
+      winrm (>= 2.3.4, < 3.0)
+      winrm-elevated (>= 1.2.1, < 2.0)
+      winrm-fs (>= 1.3.4, < 2.0)
 
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.4.4)
+    vagrant-lxd (0.4.5)
       activesupport (~> 5.2.3)
       faraday (~> 0.17)
       hyperkit (~> 1.2.0)
@@ -35,7 +36,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -43,19 +44,19 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt_pbkdf (1.0.1)
-    builder (3.2.3)
-    childprocess (0.6.3)
-      ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
+    builder (3.2.4)
+    childprocess (3.0.0)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
+    erubi (1.9.0)
     erubis (2.7.0)
-    fakefs (0.20.1)
+    fakefs (1.2.2)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.13.1)
     gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -67,7 +68,7 @@ GEM
     hyperkit (1.2.0)
       activesupport (>= 4.2.6)
       sawyer
-    i18n (1.1.1)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -75,26 +76,27 @@ GEM
       ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (2.2.2)
+    logging (2.3.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    mime-types (3.2.2)
+      multi_json (~> 1.14)
+    mime (0.4.4)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    minitest (5.13.0)
-    multi_json (1.13.1)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.1)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (5.1.0)
+    net-ssh (5.2.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (4.0.3)
-    rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.5)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
@@ -102,53 +104,54 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.3)
+    rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    vagrant_cloud (2.0.2)
+    unf_ext (0.0.7.7)
+    vagrant_cloud (2.0.3)
       rest-client (~> 2.0.2)
     wdm (0.1.1)
-    winrm (2.3.2)
+    winrm (2.3.4)
       builder (>= 2.1.2)
-      erubis (~> 2.7)
+      erubi (~> 1.8)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.1)
+    winrm-elevated (1.2.1)
+      erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.2)
-      erubis (~> 2.7)
+    winrm-fs (1.3.4)
+      erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
+      rubyzip (~> 2.0)
       winrm (~> 2.0)
 
 PLATFORMS
@@ -164,4 +167,4 @@ DEPENDENCIES
   vagrant-lxd!
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -148,7 +148,7 @@ is passed through to LXD. The hash values should all be strings:
       recursive: 'false',
     }
 
-[disk]: https://lxd.readthedocs.io/en/latest/containers/#type-disk
+[disk]: https://lxd.readthedocs.io/en/latest/instances/#type-disk
 
 ### Shared LXD Containers
 
@@ -234,7 +234,7 @@ to run graphical applications transparently from within the guest:
 Note that disk devices should be configured as [synced
 folders](#synced-folders) rather than ad-hoc devices.
 
-[device-config]: https://lxd.readthedocs.io/en/latest/containers/#device-configuration
+[device-config]: https://lxd.readthedocs.io/en/latest/instances/#devices-configuration
 
 ## Hacking
 

data/lib/vagrant-lxd/capability.rb

@@ -29,14 +29,33 @@ module VagrantLXD
     def Capability.synced_folders(env)
       logger = Log4r::Logger.new('vagrant::lxd::capability')
       logger.debug "Checking synced folders support for effective UID/GID #{Process.uid}/#{Process.gid}..."
-      result = %w(uid gid).all? do |type|
+      %w(uid gid).all? do |type|
         begin
-          File.readlines("/etc/sub#{type}").grep(/^root:#{Process.send(type)}:[1-9]/).any?
+          id = Process.send(type)
+          id_map = File.readlines("/etc/sub#{type}")
+          id_in_sub_id?(id, id_map)
         rescue StandardError => e
           logger.warn "Cannot read subordinate permissions file: #{e.message}"
           false
         end
       end
     end
+
+    # Determines whether the given numerical `id` is included in the
+    # subordinate map `id_map`, which should be an array of lines from
+    # the file /etc/subuid or /etc/subgid.
+    #
+    # Invalid lines, and any lines for a user or group other than root,
+    # are ignored. See subuid(5) and subgid(5) for details about these
+    # files, and the expected format of their entries.
+    def Capability.id_in_sub_id?(id, id_map)
+      id_map.any? do |line|
+        if line.match(/^(root|0):(\d+):(\d+)/)
+          range_min = $2.to_i
+          range_max = range_min + $3.to_i
+          id.between?(range_min, range_max)
+        end
+      end
+    end
   end
 end

data/lib/vagrant-lxd/driver.rb

@@ -173,8 +173,8 @@ module VagrantLXD
       raw_idmap = container[:config][:'raw.idmap']
       begin
         raw_idmap and
-        raw_idmap =~ /^uid #{Process.uid} #{vagrant_uid}$/ and
-        raw_idmap =~ /^gid #{Process.gid} #{vagrant_gid}$/
+        id_in_map?(Process.uid, 'uid', raw_idmap) and
+        id_in_map?(Process.gid, 'gid', raw_idmap)
       end
     rescue Vagrant::Errors::ProviderNotUsable
       false
@@ -403,7 +403,7 @@ module VagrantLXD
       end
     end
 
-  private
+    private
 
     #
     # The remaining methods are just conveniences, not part of the API
@@ -550,6 +550,24 @@ module VagrantLXD
       config
     end
 
+    # Determines whether the numerical `id` of the specified `type` is
+    # included in the given idmap. These values should follow the format
+    # of the "raw.idmap" property specified here:
+    #
+    #   https://lxd.readthedocs.io/en/latest/userns-idmap/#custom-idmaps
+    #
+    def id_in_map?(id, type, map)
+      range_types = ['both', type]
+      map.each_line.any? do |line|
+        range_type, range_values = line.split
+        range = range_values.split('-')
+        begin
+          range_types.include?(range_type) and
+          id.between?(range.first.to_i, range.last.to_i)
+        end
+      end
+    end
+
     def locate_or_generate_client_certificate
       vagrant_path = @machine.env.data_dir / 'lxd'
       default_path = Certificate.default_path / 'lxc'

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.4.4'
+    VERSION = '0.4.5'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Vagrant LXD provider