From 1d4abc1319628318a3dcc2c2973f4b0eb97483e1 Mon Sep 17 00:00:00 2001
From: Ilya Finkelshteyn <ilyaf@appveyor.com>
Date: Wed, 17 Jan 2018 17:28:05 -0800
Subject: [PATCH] Fix RDP password set

---
 scripts/enable-rdp.ps1 | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/scripts/enable-rdp.ps1 b/scripts/enable-rdp.ps1
index 1ce8872..8c71291 100644
--- a/scripts/enable-rdp.ps1
+++ b/scripts/enable-rdp.ps1
@@ -1,3 +1,15 @@
+function ChangePassword($password) {
+  $objUser = [ADSI]("WinNT://$($env:computername)/appveyor")
+  $objUser.SetPassword($password)
+  $objUser.CommitChanges()
+}
+
+function ValidatePassword($password) {
+  Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+  $DS = New-Object System.DirectoryServices.AccountManagement.PrincipalContext('machine',$env:computername)
+  $DS.ValidateCredentials("appveyor", $password)
+}
+
 # get current IP
 $ip = (Get-NetIPAddress -AddressFamily IPv4 | Where-Object {$_.InterfaceAlias -like 'ethernet*'}).IPAddress
 $port = 3389
@@ -8,10 +20,16 @@ if($env:appveyor_rdp_password) {
     # take from environment variable
     $password = $env:appveyor_rdp_password
     
-    # change password
-    $objUser = [ADSI]("WinNT://$($env:computername)/appveyor")
-    $objUser.SetPassword($password)
-    $objUser.CommitChanges()
+    # change password. Best effort to ensure password change applied.
+    $count = 0
+    $valid = $false
+    do {
+      for ($i=0; $i -le 3; $i++) {ChangePassword($password); Start-Sleep -Milliseconds 100}
+      $valid = ValidatePassword($password)
+      $count++
+      if(!$valid) {Start-Sleep -Milliseconds 100}      
+    } while(!$valid -and ($count -lt 3))
+    
     [Microsoft.Win32.Registry]::SetValue("HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon", "DefaultPassword", $password)
 } else {
     # get existing password