vagrant-nfs4j 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a25723ce4c8ea1b7eb4dbd5ee377f9d83f91f0713e6e7f4f6946f9114afe7f3
-  data.tar.gz: 3993f67f0a3acd7e3a35d9a9de324bcda5a4a8c7e65e1850117271aa438288c6
+  metadata.gz: 1b0558819c167f813246adebc01045532d038d7cbff96d9d98003628032cc10e
+  data.tar.gz: 8fb79f415a8af80fb941825687c649bf324ede35c56ba8faa9aa7f59d7062b69
 SHA512:
-  metadata.gz: 24376034a609de4a87e860efa22f245603fe4d78ee6ccaf96edcda19c0a93aa5358b0e31470963e2159e72601c917c5cb2c82a09f0c27937ec37f60302485abe
-  data.tar.gz: '089cd89ff5311d3080c2f173f7d692f66bd259bf52eaa3d8594d9fbd607908841056c45de549cfd2f97807f685638d42eaab3f63c44f68a725b469c7a80e01c7'
+  metadata.gz: f44e09f8fabc2630fa9c03878388bf9082671d37841d534fabec67b6eb0849fbefe8251365cf86e36b7de0b5061e573003695622c16f190d5762f5c4db051549
+  data.tar.gz: 9068d4a71bd8d115e21cab38872375358b7cbdbb3c9c59d4e9593a333a750a8b920f95c916190cf5cc1e993303bcea3826648e62c65565a50773a125f7a5f18b

data/Vagrantfile

@@ -54,9 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       config.vm.synced_folder source, target,
                               id: "#{id}",
                               type: 'nfs',
-                              mount_options: mount_options,
-                              nfs_version: '4.1',
-                              nfs_udp: false
+                              mount_options: mount_options
     end
   end
 end

data/bin/request_uac_header.bat

@@ -0,0 +1,33 @@
+@echo off
+
+REM --> Place this shit on top on bat
+REM --> https://stackoverflow.com/questions/1894967/how-to-request-administrator-access-inside-a-batch-file/10052222
+
+:: BatchGotAdmin
+:-------------------------------------
+REM  --> Check for permissions
+    IF "%PROCESSOR_ARCHITECTURE%" EQU "amd64" (
+>nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"
+) ELSE (
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+)
+
+REM --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )
+
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    set params= %*
+    echo UAC.ShellExecute "cmd.exe", "/c ""%~s0"" %params:"=""%", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B
+
+:gotAdmin
+    pushd "%CD%"
+    CD /D "%~dp0"
+:--------------------------------------

data/config.yaml

@@ -2,7 +2,7 @@ ip_address: 192.168.1.100
 synced_folders:
   user:
     source: 'C:\Users\Toilal' # absolute or relative path from Vagrantfile
-    target: '/C/Users/Toilal' # absolute or relative path from home of VM
+    target: '/user' # absolute or relative path from home of VM
   project:
     source: 'D:\' # absolute or relative path from Vagrantfile
-    target: '/D' # absolute or relative path from home of VM
+    target: '/hdd' # absolute or relative path from home of VM

data/lib/vagrant-nfs4j/config/nfs4j.rb

@@ -3,7 +3,6 @@ require 'vagrant'
 module VagrantNfs4j
   module Config
     class Nfs4j < Vagrant.plugin('2', :config)
-      attr_accessor :config
       attr_accessor :shares_config
       attr_accessor :host_ip
       attr_accessor :api_port
@@ -16,7 +15,6 @@ module VagrantNfs4j
       attr_accessor :java_opts
 
       def initialize
-        @config = UNSET_VALUE
         @shares_config = UNSET_VALUE
         @host_ip = UNSET_VALUE
         @api_port = UNSET_VALUE
@@ -31,7 +29,6 @@ module VagrantNfs4j
 
       def validate(machine)
         errors = []
-        errors << 'nfs4j.config cannot be nil.' if machine.config.nfs4j.config.nil?
         errors << 'nfs4j.shares_config cannot be nil.' if machine.config.nfs4j.shares_config.nil?
         errors << 'nfs4j.host_ip cannot be nil.' if machine.config.nfs4j.host_ip.nil?
         errors << 'nfs4j.api_port cannot be nil.' if machine.config.nfs4j.api_port.nil?
@@ -40,17 +37,27 @@ module VagrantNfs4j
       end
 
       def finalize!
-        @config = {} if @config == UNSET_VALUE
         @shares_config = {} if @shares_config == UNSET_VALUE
         @host_ip = "" if @host_ip == UNSET_VALUE
         @api_port = 9732 if @api_port == UNSET_VALUE
         @setup_firewall = true if @setup_firewall == UNSET_VALUE
         @daemon_start = true if @daemon_start == UNSET_VALUE
         @daemon_exe = true if @daemon_exe == UNSET_VALUE
-        @daemon_jar = true if @daemon_jar == UNSET_VALUE
+        @daemon_jar = false if @daemon_jar == UNSET_VALUE
         @daemon_opts = nil if @daemon_opts == UNSET_VALUE
         @java_home = ENV['JAVA_HOME'] if @java_home == UNSET_VALUE
         @java_opts = ENV['JAVA_OPTS'] if @java_opts == UNSET_VALUE
+
+        if @daemon_jar
+          @daemon_exe = false
+        end
+
+        if @daemon_exe
+          @daemon_jar = false
+        end
+
+        ENV['JAVA_HOME'] = @java_home if @java_home
+        ENV['JAVA_OPTS'] = @java_opts if @java_opts
       end
     end
   end

data/lib/vagrant-nfs4j/nfs4j_daemon/wrapper.rb

@@ -1,5 +1,6 @@
 require 'rest-client'
 require 'json'
+require 'fileutils'
 
 require_relative 'errors'
 
@@ -30,6 +31,8 @@ module VagrantNfs4j
         elsif File.exist?(@bearer_file)
           File.delete(@bearer_file)
         end
+
+        @setup_firewall_script = "#{Vagrant.user_data_path}/tmp/nfs4j.setup_firewall.bat"
       end
 
       def setup_firewall(ui, setup_firewall, java_home)
@@ -50,24 +53,29 @@ module VagrantNfs4j
         unless system(sprintf(rule_exist, rule_name))
 
 
-          rule_template = "advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=TCP localport=#{ports.join(',')} program=\"%s\" profile=any"
+          rule_template = "netsh advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=TCP localport=#{ports.join(',')} program=\"%s\" profile=any"
 
           all_rules = []
-          all_rules.push("advfirewall firewall delete rule name=\"#{rule_name}\"")
+          all_rules.push("netsh advfirewall firewall delete rule name=\"#{rule_name}\"")
           all_rules.push(sprintf(rule_template, rule_name, 'in', java_exe))
           all_rules.push(sprintf(rule_template, rule_name, 'out', java_exe))
 
-          firewall_script = VagrantNfs4j.get_path_for_file('setupfirewall.vbs')
-          firewall_rule = "cscript //nologo #{firewall_script}"
-
-          all_rules.each do |rule|
-            firewall_rule += " \" #{rule}\""
+          setup_firewall_template_script = VagrantNfs4j.get_path_for_file('request_uac_header.bat')
+          File.delete(@setup_firewall_script) if File.exist?(@setup_firewall_script)
+          FileUtils.cp(setup_firewall_template_script, @setup_firewall_script)
+          open(@setup_firewall_script, 'a') do |f|
+            all_rules.each do |rule|
+              f.puts rule
+            end
           end
 
           if setup_firewall
             ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.installing_firewall_rule', rule_name: rule_name))
 
-            if system(firewall_rule) and system(sprintf(rule_exist, rule_name))
+            setup_firewall_script_response = system(@setup_firewall_script)
+            File.delete(@setup_firewall_script) if File.exist?(@setup_firewall_script)
+
+            if setup_firewall_script_response and system(sprintf(rule_exist, rule_name))
               ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_rule_installed', rule_name: rule_name))
             else
               ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_error'))
@@ -128,7 +136,7 @@ module VagrantNfs4j
                              VagrantNfs4j::Utils.which("java")
                            end
 
-                jar.is_a?(String) ? "#{java_exe} -jar #{jar}" : "java -jar #{@jar}"
+                jar.is_a?(String) ? "#{java_exe} -jar #{jar}" : "#{java_exe} -jar #{@jar}"
               end
 
         unless exe
@@ -138,9 +146,7 @@ module VagrantNfs4j
             java_opts = " #{java_opts}"
           end
 
-          if java_home
-            bin = "#{java_home}\\bin\\#{bin}#{java_opts}"
-          end
+          bin = "#{bin}#{java_opts}"
         end
 
         if opts

data/lib/vagrant-nfs4j/synced_folder.rb

@@ -21,10 +21,29 @@ module VagrantNfs4j
       machine_ip = nfsopts[:nfs_machine_ip]
       machine_ip = [machine_ip] unless machine_ip.is_a?(Array)
 
+      # Keep nfs_version and nfs_udp configured by user to remove default
+      # vers=3,udp options
+      config_nfs_versions = {}
+      config_nfs_udps = {}
+      folders.each do |id, opts|
+        config_nfs_versions[id] = opts[:nfs_version]
+        config_nfs_udps[id] = opts[:nfs_udp]
+      end
+
       # Prepare the folder, this means setting up various options
       # and such on the folder itself.
       folders.each {|id, opts| prepare_folder(machine, opts)}
 
+      # Restore configured nfs_version
+      folders.each do |id, opts|
+        opts[:nfs_udp] = config_nfs_udps[id]
+        opts[:nfs_version] = config_nfs_versions[id]
+        unless opts[:nfs_version]
+          # Use nfs v4.1 as default version
+          opts[:nfs_version] = '4.1'
+        end
+      end
+
       # Determine what folders we'll export
       export_folders = folders.dup
       export_folders.keys.each do |id|
@@ -59,16 +78,16 @@ module VagrantNfs4j
       folders.each do |id, opts|
         opts = opts.dup
 
+        real_hostpath = opts[:hostpath]
         if Vagrant::Util::Platform.windows?
-          opts[:hostpath] = VagrantNfs4j::Utils.hostpath_to_share_alias(opts[:hostpath])
-          opts[:hostpath] = VagrantNfs4j::Utils.prefix_alias(machine, opts[:hostpath])
+          opts[:hostpath] = VagrantNfs4j::Utils.prefix_alias(machine, opts[:guestpath])
         end
 
         opts[:mount_options] = VagrantNfs4j::Utils.apply_mount_options(opts[:mount_options])
 
         machine.ui.detail(I18n.t('vagrant.actions.vm.share_folders.mounting_entry',
                                  guestpath: opts[:guestpath],
-                                 hostpath: opts[:hostpath]))
+                                 hostpath: real_hostpath))
 
         mount_folders[id] = opts
       end

data/lib/vagrant-nfs4j/version.rb

@@ -1,3 +1,3 @@
 module VagrantNfs4j
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs4j
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Rémi Alvergnat
@@ -55,7 +55,7 @@ files:
 - Vagrantfile
 - bin/nfs4j-daemon.exe
 - bin/nfs4j-daemon.jar
-- bin/setupfirewall.vbs
+- bin/request_uac_header.bat
 - config.yaml
 - lib/vagrant-nfs4j.rb
 - lib/vagrant-nfs4j/cap/nfs.rb

data/bin/setupfirewall.vbs

@@ -1,4 +0,0 @@
-Set UAC = CreateObject("Shell.Application")
-For count = 0 to (WScript.Arguments.Count - 1)
-    UAC.ShellExecute "netsh", Replace(WScript.Arguments(count), "'", Chr(34)), "", "runas", 1
-Next