Moves localization to separate file

Fixes dsccommunity#61
iainbrighton · May 19, 2016 · 7d7ad8b · 7d7ad8b
1 parent 6eee8ea
commit 7d7ad8b
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+DSCResource.Tests/
diff --git a/DSCResource.Tests b/DSCResource.Tests
diff --git a/DSCResources/MSFT_xADUser/MSFT_xADUser.psm1 b/DSCResources/MSFT_xADUser/MSFT_xADUser.psm1
@@ -1,29 +1,18 @@
-# Localized messages
-data LocalizedData
+$moduleRoot = Split-Path -Path $MyInvocation.MyCommand.Path -Parent
+#region LocalizedData
+$culture = 'en-us'
+if (Test-Path -Path (Join-Path -Path $moduleRoot -ChildPath $PSUICulture))
 {
-    # culture="en-US"
-    ConvertFrom-StringData @'
-        RoleNotFoundError              = Please ensure that the PowerShell module for role '{0}' is installed.
-        RetrievingADUserError          = Error looking up Active Directory user '{0}' ({0}@{1}).
-        PasswordParameterConflictError = Parameter '{0}' cannot be set to '{1}' when the '{2}' parameter is specified.
-        
-        RetrievingADUser               = Retrieving Active Directory user '{0}' ({0}@{1}) ...
-        CreatingADDomainConnection     = Creating connection to Active Directory domain '{0}' ...
-        CheckingADUserPassword         = Checking Active Directory user '{0}' password ...
-        ADUserIsPresent                = Active Directory user '{0}' ({0}@{1}) is present.
-        ADUserNotPresent               = Active Directory user '{0}' ({0}@{1}) was NOT present.
-        ADUserNotDesiredPropertyState  = User '{0}' property is NOT in the desired state. Expected '{1}', actual '{2}'.
-        
-        AddingADUser                   = Adding Active Directory user '{0}'.
-        RemovingADUser                 = Removing Active Directory user '{0}'.
-        UpdatingADUser                 = Updating Active Directory user '{0}'.
-        SettingADUserPassword          = Setting Active Directory user password.
-        UpdatingADUserProperty         = Updating user property '{0}' with/to '{1}'.
-        RemovingADUserProperty         = Removing user property '{0}' with '{1}'.
-        MovingADUser                   = Moving user from '{0}' to '{1}'.
-        RenamingADUser                 = Renaming user from '{0}' to '{1}'.
-'@
+    $culture = $PSUICulture
 }
+$importLocalizedDataParams = @{
+    BindingVariable = 'LocalizedData'
+    Filename = 'MSFT_xADUser.psd1'
+    BaseDirectory = $moduleRoot 
+    UICulture = $culture
+}
+Import-LocalizedData @importLocalizedDataParams
+#endregion    
 
 ## Create a property map that maps the DSC resource parameters to the
 ## Active Directory user attributes.
@@ -831,15 +820,27 @@ function Test-Password
     if ($DomainAdministratorCredential)
     {
         $principalContext = New-Object System.DirectoryServices.AccountManagement.PrincipalContext(
-                                'Domain', $DomainName, $DomainAdministratorCredential.UserName, `
-                                    $DomainAdministratorCredential.GetNetworkCredential().Password);
+                                [System.DirectoryServices.AccountManagement.ContextType]::Domain,
+                                $DomainName,
+                                $DomainAdministratorCredential.UserName,
+                                $DomainAdministratorCredential.GetNetworkCredential().Password
+                            );
     }
     else
     {
-        $principalContext = New-Object System.DirectoryServices.AccountManagement.PrincipalContext('Domain', $DomainName, $null, $null);
+        $principalContext = New-Object System.DirectoryServices.AccountManagement.PrincipalContext(
+                                [System.DirectoryServices.AccountManagement.ContextType]::Domain,
+                                $DomainName,
+                                $null,
+                                $null
+                            );
     }
     Write-Verbose -Message ($LocalizedData.CheckingADUserPassword -f $UserName);
-    return $principalContext.ValidateCredentials($UserName, $Password.GetNetworkCredential().Password);
+    return $principalContext.ValidateCredentials(
+        $UserName,
+        $Password.GetNetworkCredential().Password,
+        [System.DirectoryServices.AccountManagement.ContextOptions]::Negotiate
+    );
 
 } #end function Test-Password
 

diff --git a/DSCResources/MSFT_xADUser/en-US/MSFT_xADUser.psd1 b/DSCResources/MSFT_xADUser/en-US/MSFT_xADUser.psd1
@@ -0,0 +1,22 @@
+# culture="en-US"
+ConvertFrom-StringData @'
+    RoleNotFoundError              = Please ensure that the PowerShell module for role '{0}' is installed.
+    RetrievingADUserError          = Error looking up Active Directory user '{0}' ({0}@{1}).
+    PasswordParameterConflictError = Parameter '{0}' cannot be set to '{1}' when the '{2}' parameter is specified.
+    
+    RetrievingADUser               = Retrieving Active Directory user '{0}' ({0}@{1}) ...
+    CreatingADDomainConnection     = Creating connection to Active Directory domain '{0}' ...
+    CheckingADUserPassword         = Checking Active Directory user '{0}' password ...
+    ADUserIsPresent                = Active Directory user '{0}' ({0}@{1}) is present.
+    ADUserNotPresent               = Active Directory user '{0}' ({0}@{1}) was NOT present.
+    ADUserNotDesiredPropertyState  = User '{0}' property is NOT in the desired state. Expected '{1}', actual '{2}'.
+    
+    AddingADUser                   = Adding Active Directory user '{0}'.
+    RemovingADUser                 = Removing Active Directory user '{0}'.
+    UpdatingADUser                 = Updating Active Directory user '{0}'.
+    SettingADUserPassword          = Setting Active Directory user password.
+    UpdatingADUserProperty         = Updating user property '{0}' with/to '{1}'.
+    RemovingADUserProperty         = Removing user property '{0}' with '{1}'.
+    MovingADUser                   = Moving user from '{0}' to '{1}'.
+    RenamingADUser                 = Renaming user from '{0}' to '{1}'.
+'@
diff --git a/README.md b/README.md
@@ -209,6 +209,8 @@ The xADDomainDefaultPasswordPolicy DSC resource will manage an Active Directory
 
 ### Unreleased
 
+* xADUser: Fixes bug in user credential validation when a domain certificate authority is deployed.
+
 ### 2.11.0.0
 * xWaitForADDomain: Made explicit credentials optional and other various updates
 

diff --git a/Tests/Unit/MSFT_xADUser.Tests.ps1 b/Tests/Unit/MSFT_xADUser.Tests.ps1
@@ -1,24 +1,20 @@
-$Global:DSCModuleName      = 'xActiveDirectory' # Example xNetworking
-$Global:DSCResourceName    = 'MSFT_xADUser' # Example MSFT_xFirewall
+$Global:DSCModuleName      = 'xActiveDirectory'
+$Global:DSCResourceName    = 'MSFT_xADUser'
 
 #region HEADER
 [String] $moduleRoot = Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))
-Write-Host $moduleRoot -ForegroundColor Green;
 if ( (-not (Test-Path -Path (Join-Path -Path $moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
     & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
-else
-{
-    & git @('-C',(Join-Path -Path $moduleRoot -ChildPath '\DSCResource.Tests\'),'pull')
-}
+
 Import-Module (Join-Path -Path $moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $Global:DSCModuleName `
     -DSCResourceName $Global:DSCResourceName `
     -TestType Unit 
-#endregion
+#endregion HEADER
 
 
 # Begin Testing