vagrant-windows-domain 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbdaa30870420b7e0fc8c44c2716a0bf97f5067114f276f391a6147ef6d29c7a
-  data.tar.gz: 52db0ec2e6a68ef743f10720d0c03add6844c59e31f6a6e974db046d10c187cf
+  metadata.gz: b03f283e47170d9b9a2db97da8a456a11ba260a851fc2f54f8a84d5513e258bd
+  data.tar.gz: 05f3530dd6fa06382d09515160c8a06f4c538d45f66ee15f80840e6d1276b059
 SHA512:
-  metadata.gz: 6915697baa4d5922ad0c33b17466e0d01f5dc92ab26fbe295aa6009bd50c4d3b3d79234460d3b3368f90a02b93db51c9b33c176967311e3a7087ec3b984f4a3c
-  data.tar.gz: b1dc722b9620aeeb3a03870c063351d79161af9931f603cfcf389c06e23685a5716ae71c3921f852debb772ad8006d4b72447b2d5b90f4ae6565c9ff7cbcdeb8
+  metadata.gz: 75ed7c28a93fe9a00a5cc7d30ed30f4631e1e4773f196fe5dcfb667265f30bcf514afcc74a4af08230dacbd39364eef6c5850494f0c29824bbe21a0f22f9ee15
+  data.tar.gz: 247b3cb63c12c8597a1fcceeca3799f4f30cd529fcd197e3d0d7eb198febeb11d977bc1eab66d989ba0efb2d56b8cca05d3e705a994b705ff409844d65835097

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 before_install:
+- gem update --system
 - gem install bundler
 rvm:
+- ruby-head
 - 2.5.1
 - 2.4.4
-- ruby-head
 matrix:
   allow_failures:
   - rvm: ruby-head
@@ -12,6 +13,4 @@ matrix:
 env:
   matrix:
   - VAGRANT_VERSION=v2.1.5
-  global:
-    secure: bs4ezY+1Wksy8hH3nymPJ3AL99mpXULVc/AIh16JetEYw1850QkX7r4gQukMlcyByKUhxucjDLid0Y+KDH5kGMM16QjrVQGhAnUQzMoLD2qPbAaxDCUqpCJtFEEQKYxJvFvEK8a5SQzAsTVG4sgABQ/MllsIIH0FjkWgFtH6050=
 script: bundle exec rake test:unit

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :tag => "v2.1.5"
 end
 

data/lib/vagrant-windows-domain/config.rb

@@ -75,7 +75,7 @@ module VagrantPlugins
 
       # Final step of the Configuration lifecyle prior to
       # validation.
-      #
+      # 
       # Ensures all attributes are set to defaults if not provided.
       def finalize!
         super
@@ -87,10 +87,10 @@ module VagrantPlugins
         @password          = nil if @password == UNSET_VALUE || @password == ""
         @join_options      = [] if @join_options == UNSET_VALUE
         @ou_path           = nil if @ou_path == UNSET_VALUE
-        @primary_dns       = nil if @primary_dns == UNSET_VALUE
-        @secondary_dns     = nil if @secondary_dns == UNSET_VALUE
+        @primary_dns       = nil if @primary_dns == UNSET_VALUE || @primary_dns == ""
+        @secondary_dns     = nil if @secondary_dns == UNSET_VALUE || @secondary_dns == ""
         @unsecure          = false if @unsecure == UNSET_VALUE
-        @rename            = true if @rename == UNSET_VALUE
+        @rename            = false if @rename == UNSET_VALUE
       end
 
       # Validate configuration and return a hash of errors.
@@ -103,9 +103,13 @@ module VagrantPlugins
         errors = _detected_errors
 
         # Need to supply one of them!
-        if ( (@username != nil && @password != nil) && @unsecure == true)
+        if (@username != nil && @password != nil) && @unsecure == true
           errors << I18n.t("vagrant_windows_domain.errors.both_credentials_provided")
         end
+
+        if @secondary_dns != nil && @primary_dns == nil
+          errors << I18n.t("vagrant_windows_domain.errors.invalid_dns_config")
+        end
         
         { "windows domain provisioner" => errors }
       end     

data/lib/vagrant-windows-domain/locales/en.yml

@@ -14,4 +14,6 @@ en:
       binary_not_detected: |-
         "The command '%{binary} required to join/remove the guest machine from the domain '%{domain}' was not found on the guest machine"
       absolute_module_path: |-
-        "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
+        "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
+      invalid_dns_config: |-
+        "Primary dns must be set before configuring Secondary DNS."

data/lib/vagrant-windows-domain/plugin.rb

@@ -24,10 +24,10 @@ module VagrantPlugins
         Provisioner
       end
 
-      action_hook(:windows_domain, :machine_action_destroy) do |hook|
-        require_relative 'action/leave_domain'
-        hook.prepend(VagrantPlugins::WindowsDomain::LeaveDomain)
-      end
+  #    action_hook(:windows_domain, :machine_action_destroy) do |hook|
+   #     require_relative 'action/leave_domain'
+   #     hook.prepend(VagrantPlugins::WindowsDomain::LeaveDomain)
+   #   end
     end
   end
 end

data/lib/vagrant-windows-domain/provisioner.rb

@@ -150,7 +150,7 @@ module VagrantPlugins
       # This is the method called when destroying a machine that allows
       # for any state related to the machine created by the provisioner
       # to be cleaned up.
-      def destroy
+      def cleanup
         if @config && @config.domain != nil
           if is_joined_to_domain()
             set_credentials
@@ -312,7 +312,7 @@ module VagrantPlugins
         last_type = nil
         new_line = ""
         error = false
-        machine.communicate.sudo("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{script_path}", opts) do |type, data|
+        exit_status = @machine.communicate.sudo("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{script_path}", opts) do |type, data|
           if !data.chomp.empty?
             error = true if type == :stderr
             if [:stderr, :stdout].include?(type)

data/lib/vagrant-windows-domain/templates/runner.ps1.erb

@@ -190,6 +190,14 @@ function Remove-ADSIComputer
 		}
 	}
 }
+try
+{
+	Get-NetConnectionProfile -ErrorAction Stop | Set-NetConnectionProfile -NetworkCategory private -ErrorAction Stop
+}
+catch
+{
+	Write-host "Network adapters already set to private network type"
+}
 <% if options[:computer_name] != nil %>
 $computerName='<%= options[:computer_name] %>'
 <% else %>
@@ -207,38 +215,34 @@ $credentials = New-Object System.Management.Automation.PSCredential ($username,
 if (Test-PartOfDomain -computerName $computerName -domain $domain){
 	throw "$computerName already part of domain $domain"
 } else {
-	#If a value is provided for the Primary_DNS variable in the vagrantfile, powershell will attempt to determine if the string is a valid IP and will statically set the primary dns server of the vm's nic if it is.
+	#If a value is provided for the Primary_DNS and Secondary_DNS variable in the vagrantfile, powershell will determine if the string is a valid IP and will statically set the primary and secondary dns servers of the vm's nic if it is.  If only Primary_DNS variable is provided, powershell will statically set the primary dns server of the vm's nic while leaving the secondary unset.
 	<% if options[:primary_dns] != nil %>
+		$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE AND Index=2' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
+		# $currdns = $wmi.DNSServerSearchOrder
 		$prim = '<%= options[:primary_dns] %>'
-		If ($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
-		{
-			$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
-			$currdns = $wmi.DNSServerSearchOrder
-			$wmi.SetDNSServerSearchOrder(@($prim, $currdns[1]))
-		}
-		else
-		{
-			throw "Invalid IP address provided"
-		}
-	<% end %>
-
-	#If a value is provided for the Secondary_DNS variable in the vagrantfile, powershell will attempt to determine if the string is a valid IP and will statically set the secondary dns server of the vm's nic if it is.
-	<% if options[:secondary_dns] != nil %>
-		$sec = '<%= options[:secondary_dns] %>'
-		If ($sec -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
-		{
-			$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
-			$currdns = $wmi.DNSServerSearchOrder
-			$wmi.SetDNSServerSearchOrder(@($currdns[0], $sec))
-		}
-		else
-		{
-			throw "Invalid IP address provided"
-		}
+		# Modified the configuration so that the secondary dns can only be set if the primary dns server has also been set
+		<% if options[:secondary_dns] != nil %>
+			$sec = '<%= options[:secondary_dns] %>'
+			If (($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$") -and ($sec -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"))
+			{
+				$wmi.SetDNSServerSearchOrder(@("$prim", "$sec"))
+			}
+			else
+			{
+				throw "Invalid value provided for dns server ip"
+			}
+		<% else %>
+			If ($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+			{
+				$wmi.SetDNSServerSearchOrder("$prim")
+			}
+			else
+			{
+				throw "Invalid IP address provided"
+			}
+		<% end %>
 	<% end %>
-	Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory private
-	Add-Computer <%= options[:parameters] %> -Verbose -Force -PassThru
-
+	Add-Computer <%= options[:parameters] %> -Verbose -Force
 	# Rename computer separately: Fixes GH issue #11
 	<% if options[:computer_name] != nil %>
 	$completed = $false
@@ -258,17 +262,26 @@ if (Test-PartOfDomain -computerName $computerName -domain $domain){
 		}
 	}
 	<% end %>	
-	
 	Repair-OpenSSHPasswd
 }
 <% else %>
-if (!(Test-JoinedToADomain)) {
-	Throw "$computerName not part of any domain"
+$compobj = Get-ADSIComputer -Identity $computerName -Credential $credentials -DomainName $domain
+if (!(Test-JoinedToADomain) -or !($compobj)) {
+	# Throw "$computerName not part of any domain"
+	return
 } else {
 	#When destroying the vagrant machine, the goal is not as much to have the virtual machine disjoin from the domain, but to remove the computer object associated with the
 	#machine so that future runs of vagrant up will succeed (especially when the vagrantfile explicitly defines a computer name.  That being the case, the remove-computer
 	#command has been replaced with a custom function which is able to remove the computer object associated with the vagrant machine in active directory.
-	Remove-ADSIComputer -Identity $env:COMPUTERNAME -DomainName $domain -Credential $credentials -Verbose
+	try
+	{
+	Remove-ADSIComputer -Identity $env:COMPUTERNAME -DomainName $domain -Credential $credentials -Verbose -ErrorAction Stop
 	Repair-OpenSSHPasswd
+	}
+	catch
+	{
+		Repair-OpenSSHPasswd
+	}
+	
 }
 <% end %>

data/lib/vagrant-windows-domain/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -195,7 +195,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       expect(ui).to receive(:info).with("\"Running Windows Domain Provisioner\"")
       expect(ui).to receive(:info).with("deleted", {:color=>:green, :new_line=>false, :prefix=>false})
 
-      subject.destroy
+      subject.cleanup
     end
 
     it "should not leave domain plugin not associated with current Vagrantfile" do
@@ -204,7 +204,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       subject = described_class.new machine, double("env", :domain => nil)
 
       expect(ui).to_not receive(:ask)
-      expect(subject.destroy).to eq(nil)
+      expect(subject.cleanup).to eq(nil)
     end
 
     it "should ask for credentials when leaving domain when no credentials were provided" do
@@ -219,7 +219,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       expect(ui).to receive(:info).with(any_args).twice
       expect(ui).to receive(:ask).with("Please enter your domain password (output will be hidden): ", {:echo=>false}).and_return("myusername")
       expect(ui).to receive(:ask).with("Please enter your domain username: ")
-      subject.destroy
+      subject.cleanup
     end
 
   end

data/vagrant-windows-domain.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["matt.fellows@onegeek.com.au"]
   spec.summary       = "Windows Domain Provisioner for Vagrant"
   spec.description   = "Adds and Removes Windows Guests from a Windows Domain, as part of the standard machine lifecycle."
-  spec.homepage      = "https://github.com/SEEK-Jobs/vagrant-windows-domain"
+  spec.homepage      = "https://github.com/mefellows/vagrant-windows-domain"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,11 +133,10 @@ files:
 - lib/vagrant-windows-domain/version.rb
 - spec/base.rb
 - spec/provisioner/config_spec.rb
-- spec/provisioner/leave_domain_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb
 - vagrant-windows-domain.gemspec
-homepage: https://github.com/SEEK-Jobs/vagrant-windows-domain
+homepage: https://github.com/mefellows/vagrant-windows-domain
 licenses:
 - MIT
 metadata: {}
@@ -156,14 +155,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Windows Domain Provisioner for Vagrant
 test_files:
 - spec/base.rb
 - spec/provisioner/config_spec.rb
-- spec/provisioner/leave_domain_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb

data/spec/provisioner/leave_domain_spec.rb

@@ -1,131 +0,0 @@
-require 'spec_helper'
-require 'vagrant-windows-domain/provisioner'
-require 'vagrant-windows-domain/action/leave_domain'
-require 'vagrant-windows-domain/config'
-require 'base'
-
-describe VagrantPlugins::WindowsDomain::LeaveDomain do
-
-  include_context "unit"
-  let(:instance) { described_class.new }
-
-  let(:root_path)           { (Pathname.new(Dir.mktmpdir)).to_s }
-  let(:domain)              { "foo.com" }
-  let(:ui)                  { double("ui") }
-  let(:app)                 { double("app") }
-  let(:communicator)        { double ("communicator") }
-  let(:shell)               { double ("shell") }
-  let(:powershell)          { double ("powershell") }
-  let(:guest)               { double ("guest") }
-  let(:configuration_file)  { "manifests/MyWebsite.ps1" }
-  let(:module_path)         { ["foo/modules", "foo/modules2"] }
-  let(:config)              { VagrantPlugins::WindowsDomain::Config.new }
-  let(:vm)                  { double("vm", provisioners: [double("prov", config: config)]) }
-  let(:root_config)          { double("root_config", vm: vm) }
-  let(:env)                 { {:ui => ui, :machine => machine} }
-  let(:machine)             { double("machine", ui: ui, id: "1234", config: root_config) }
-  let(:provisioner)         { double("provisioner") }
-  subject                   { described_class.new app, env }
-
-  describe "call" do
-
-    before do
-      allow(machine).to receive(:communicate).and_return(communicator)
-      allow(env).to receive(:machine).and_return(machine)
-      allow(communicator).to receive(:shell).and_return(shell)
-      allow(shell).to receive(:powershell).and_yield(:stdout, "myoldcomputername")
-      config.domain = domain
-      allow(env).to receive(:machine).and_return(machine)
-      allow(machine).to receive(:env).and_return(env)
-      allow(env).to receive(:ui).and_return(ui)
-      subject.provisioner = provisioner
-    end
-
-    context "when no configuration exists for the machine" do
-      it "should pass control to the next middleware Action" do
-        config.domain = nil
-        expect(app).to receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-
-    context "when machine is running" do
-      it "should prompt the user if they would like to destroy & d/c the machine" do
-        state = double("state", id: :running)
-        expect(provisioner).to receive(:destroy)
-
-        expect(app).to receive(:call).with(env)
-            expect(ui).to receive(:ask).with("Are you sure you want to destroy this machine and disconnect from #{domain}? (y/n)").and_return("y")
-        expect(machine).to receive(:state).and_return(state).twice
-        subject.call(env)
-
-      end
-
-      it "should not continue if the user declines to destroy the machine" do
-        state = double("state", id: :running)
-        expect(provisioner).to_not receive(:destroy)
-
-        expect(ui).to receive(:ask).with("Are you sure you want to destroy this machine and disconnect from #{domain}? (y/n)").and_return("n")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to_not receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-
-    context "when machine is :paused, :saved or :poweroff" do
-      it "should prompt the user if they would like to force destroy the machine" do
-        state = double("state", id: :poweroff)
-        provisioner = double("provisioner")
-        subject.provisioner = provisioner
-
-        expect(ui).to receive(:say).with(:warn, "Machine is currently not running. To properly leave the #{domain} network the machine needs to be running and connected to the network in which it was provisioned. Please run `vagrant up` and then `vagrant destroy`.\n")
-        expect(ui).to receive(:ask).with("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{domain}' network? If so, type 'destroy'").and_return("destroy")
-        expect(ui).to receive(:say).with(:warn, "Force destroying this machine and not leaving the domain foo.com. May FSM have mercy on your soul.")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to receive(:call).with(env)
-        # Can't call destroy on a non-running machine
-        expect(provisioner).to_not receive(:destroy)
-
-        subject.call(env)
-
-        expect(env[:force_confirm_destroy]).to be(true)
-      end
-
-      it "should not pass on to middleware if user declines force destroy" do
-        state = double("state", id: :poweroff)
-        provisioner = double("provisioner")
-        subject.provisioner = provisioner
-
-        expect(ui).to receive(:say).with(:warn, "Machine is currently not running. To properly leave the #{domain} network the machine needs to be running and connected to the network in which it was provisioned. Please run `vagrant up` and then `vagrant destroy`.\n")
-        expect(ui).to receive(:ask).with("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{domain}' network? If so, type 'destroy'").and_return("n")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to_not receive(:call).with(env)
-        expect(provisioner).to_not receive(:destroy)
-        expect(env[:force_confirm_destroy]).to be(nil)
-
-        subject.call(env)
-      end
-    end
-
-    context "when machine is :not_created" do
-      it "should pass control to the next middleware action" do
-        state = double("state", id: :not_created)
-        expect(machine).to receive(:state).and_return(state)
-
-        expect(app).to receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-  end
-
-
-  describe "initialize" do
-
-    its("env")              { should eq(env) }
-    its("app")              { should eq(app) }
-    its("config")           { should eq(config) }
-    its("machine")          { should eq(machine) }
-
-  end
-
-end