vagrant-windows-domain 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9e56200816c6d1f4aa73806bedc10976d0471c643102f54e82c44bdb78432e
-  data.tar.gz: 4186ece3f5539020fe90cdb3bb961f825101fd23167349bc7eee834b49f56005
+  metadata.gz: fbdaa30870420b7e0fc8c44c2716a0bf97f5067114f276f391a6147ef6d29c7a
+  data.tar.gz: 52db0ec2e6a68ef743f10720d0c03add6844c59e31f6a6e974db046d10c187cf
 SHA512:
-  metadata.gz: 95f644aef3a5df4fbd5b5262cf30c5b6ed4e2aa266c99055b093d0978cda1055ff38cfea14cc6bb351f7107b0e2ba827a82843cc97bc2a7dc354271126da2855
-  data.tar.gz: 7733d4aa00ff3e45779f1c66c3901e3fd7b431ae81e807701a3ce098db8e725f8ce88fcd4d1993dc05379326723277a5868a5fcb787fadff04fd8a301104a945
+  metadata.gz: 6915697baa4d5922ad0c33b17466e0d01f5dc92ab26fbe295aa6009bd50c4d3b3d79234460d3b3368f90a02b93db51c9b33c176967311e3a7087ec3b984f4a3c
+  data.tar.gz: b1dc722b9620aeeb3a03870c063351d79161af9931f603cfcf389c06e23685a5716ae71c3921f852debb772ad8006d4b72447b2d5b90f4ae6565c9ff7cbcdeb8

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

@@ -17,6 +17,179 @@ function Repair-OpenSSHPasswd(){
 		$passwd | Set-Content $passwdPath -Encoding Ascii
 	}
 }
+function New-ADSIPrincipalContext
+{
+	[CmdletBinding(SupportsShouldProcess = $true)]
+	[OutputType('System.DirectoryServices.AccountManagement.PrincipalContext')]
+	PARAM
+	(
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+		
+		[Parameter(Mandatory = $true)]
+		[System.DirectoryServices.AccountManagement.ContextType]$ContextType,
+		
+		$DomainName = [System.DirectoryServices.ActiveDirectory.Domain]::Getcurrentdomain(),
+		
+		$Container,
+		
+		[System.DirectoryServices.AccountManagement.ContextOptions[]]$ContextOptions
+	)
+	
+	BEGIN
+	{
+		$ScriptName = (Get-Variable -name MyInvocation -Scope 0 -ValueOnly).MyCommand
+		Write-Verbose -Message "[$ScriptName] Add Type System.DirectoryServices.AccountManagement"
+		Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+	}
+	PROCESS
+	{
+		TRY
+		{
+			switch ($ContextType)
+			{
+				"Domain" { $ArgumentList = $ContextType, $DomainName }
+				"Machine" { $ArgumentList = $ContextType, $ComputerName }
+				"ApplicationDirectory" { $ArgumentList = $ContextType }
+			}
+			
+			IF ($PSBoundParameters['Container'])
+			{
+				$ArgumentList += $Container
+			}
+			
+			IF ($PSBoundParameters['ContextOptions'])
+			{
+				$ArgumentList += $($ContextOptions)
+			}
+			
+			IF ($PSBoundParameters['Credential'])
+			{
+				# Query the specified domain or current if not entered, with the specified credentials
+				$ArgumentList += $($Credential.UserName), $($Credential.GetNetworkCredential().password)
+			}
+			
+			IF ($PSCmdlet.ShouldProcess($DomainName, "Create Principal Context"))
+			{
+				# Query 
+				New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalContext -ArgumentList $ArgumentList
+			}
+		} #TRY
+		CATCH
+		{
+			$PSCmdlet.ThrowTerminatingError($_)
+		}
+	} #PROCESS
+}
+
+function Get-ADSIComputer
+{
+	[CmdletBinding(DefaultParameterSetName="All")]
+	param ([Parameter(Mandatory=$true,ParameterSetName="Identity")]
+		[string]$Identity,
+		
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+
+		[String]$DomainName
+	)
+	BEGIN
+	{
+        Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+		
+        # Create Context splatting
+        $ContextSplatting = @{ ContextType = "Domain" }
+		
+        IF ($PSBoundParameters['Credential']) { $ContextSplatting.Credential = $Credential }
+        IF ($PSBoundParameters['DomainName']) { $ContextSplatting.DomainName = $DomainName }
+		
+        $Context = New-ADSIPrincipalContext @ContextSplatting
+
+	}
+	PROCESS
+	{
+        TRY{
+            IF($Identity)
+            {
+                [System.DirectoryServices.AccountManagement.ComputerPrincipal]::FindByIdentity($Context, $Identity)
+            }
+            ELSE{
+                $ComputerPrincipal = New-object -TypeName System.DirectoryServices.AccountManagement.ComputerPrincipal -ArgumentList $Context
+			    $Searcher = new-object System.DirectoryServices.AccountManagement.PrincipalSearcher
+			    $Searcher.QueryFilter = $ComputerPrincipal
+
+                $Searcher.FindAll()
+            }
+        }
+        CATCH
+        {
+        	$pscmdlet.ThrowTerminatingError($_)
+        }
+	}
+}
+
+function Remove-ADSIComputer
+{
+	[CmdletBinding(SupportsShouldProcess = $true)]
+	PARAM (
+		[parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true, ValueFromPipeline = $true)]
+		$Identity,
+
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+
+		[String]$DomainName,
+
+		[Switch]$Recursive
+	)
+	
+	BEGIN
+	{
+		Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+		
+		# Create Context splatting
+		$ContextSplatting = @{ }
+		IF ($PSBoundParameters['Credential']) { $ContextSplatting.Credential = $Credential }
+		IF ($PSBoundParameters['DomainName']) { $ContextSplatting.DomainName = $DomainName }
+
+	}
+	PROCESS
+	{
+		TRY
+		{
+			# Not Recursive
+			if (-not $PSBoundParameters['Recursive'])
+			{
+				if ($pscmdlet.ShouldProcess("$Identity", "Remove Account"))
+				{
+					$Account = Get-ADSIComputer -Identity $Identity @ContextSplatting
+					$Account.delete()
+				}
+			}
+			
+			# Recursive (if the computer is the parent of one leaf or more)
+			if ($PSBoundParameters['Recursive'])
+			{
+				if ($pscmdlet.ShouldProcess("$Identity", "Remove Account and any child objects"))
+				{
+					$Account = Get-ADSIComputer -Identity $Identity @ContextSplatting
+					$Account.GetUnderlyingObject().deletetree()
+				}
+			}
+			
+		}
+		CATCH
+		{
+			$pscmdlet.ThrowTerminatingError($_)
+		}
+	}
+}
 <% if options[:computer_name] != nil %>
 $computerName='<%= options[:computer_name] %>'
 <% else %>
@@ -87,26 +260,15 @@ if (Test-PartOfDomain -computerName $computerName -domain $domain){
 	<% end %>	
 	
 	Repair-OpenSSHPasswd
-
-	# Fix vagrant-windows GH-129, if there's an existing scheduled
-	# reboot cancel it so shutdown succeeds
-	#&shutdown /a
-
-	# Force shutdown the machine now
-	#&shutdown /r /t 0 /c "Vagrant Halt" /f /d p:4:1
 }
 <% else %>
 if (!(Test-JoinedToADomain)) {
 	Throw "$computerName not part of any domain"
 } else {
-	Remove-Computer <%= options[:parameters] %> -Workgroup 'WORKGROUP' -Verbose -Force -PassThru
+	#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
 	Repair-OpenSSHPasswd
-	#removed the shutdown of the vm when disjoining it from the domain since, as the vm is about to be destroyed anyway, so there is no use for it.
-	# Fix vagrant-windows GH-129, if there's an existing scheduled
-	# reboot cancel it so shutdown succeeds
-	#&shutdown /a
-
-	# Force shutdown the machine now
-	#&shutdown /r /t 0 /c "Vagrant Halt" /f /d p:4:1
 }
 <% end %>

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake