LyncConnector - code fixed for null conditions.

Author: NileshGhodekar

src/LyncConnector/EventLogConfig/Register-EventSource.ps1

@@ -0,0 +1,64 @@
+<#
+<copyright file="Register-EventSource.ps1" company="Microsoft">
+	Copyright (c) Microsoft. All Rights Reserved.
+	Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+</copyright>
+<summary>
+	The script to register event sources for the "ConnectorsLog" Event Log of the FIM PowerShell and all other new connectors.
+	The script to needs to run with elevated privileges.
+	Please create / edit <system.diagnostics> configuration element as directed in the app.config file.
+</summary>
+#>
+
+$eventSources = @{
+	"ConnectorsLog" = "ConnectorsLog"
+}
+
+function TestIsAdministrator 
+{ 
+	$currentUser = [Security.Principal.WindowsIdentity]::GetCurrent() 
+	(New-Object Security.Principal.WindowsPrincipal $currentUser).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator) 
+}
+
+function RegisterEventSource()
+{
+	foreach($source in $eventSources.Keys)
+	{
+		$logName = $eventSources[$source]
+	
+		Write-Host "Creating event source $source in event log $logName"
+		
+		if ([System.Diagnostics.EventLog]::SourceExists($source) -eq $false) {
+			New-EventLog -Source $source -LogName $logName
+			Write-Host -ForegroundColor green "Event source $source created in event log $logName"
+		}
+		else
+		{
+			$eventLog = Get-EventLog -List | Where-Object {$_.Log -eq $logName}
+
+			if ($eventLog -ne $null)
+			{
+				Write-Host -ForegroundColor yellow "Warning: Event source $source already exists in event log $logName"
+			}
+			else
+			{
+				Write-Host -ForegroundColor yellow "Warning: Event source $source already exists, but not in event log $logName. It will be deleted and recreated. You'll need to reboot the machine to see the events in the new event log."
+				[System.Diagnostics.EventLog]::DeleteEventSource($source)
+				New-EventLog -Source $source -LogName $logName
+			}
+		}
+
+		Limit-EventLog -LogName $logName -MaximumSize 20480KB
+
+		Write-Host -ForegroundColor green "Writing a test event in the event log '$logName'"
+
+		[System.Diagnostics.EventLog]::WriteEntry($logName, "Test Event")
+	}
+}
+
+if(!(TestIsAdministrator))  
+{
+	throw $("Admin rights are required for this script")
+}
+
+RegisterEventSource

src/LyncConnector/EventLogConfig/app.config

@@ -30,12 +30,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{4E
 		TestData\Lync-Export-Update-User.xml = TestData\Lync-Export-Update-User.xml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Template", "Template", "{4E91C37F-0DDB-4632-9A0A-1AA20AAFCC1D}"
+	ProjectSection(SolutionItems) = preProject
+		Template\LyncConnectorConfigExport.xml = Template\LyncConnectorConfigExport.xml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventLogConfig", "EventLogConfig", "{75CA84A7-AC63-4E99-A444-5AB1CD5B16E2}"
+	ProjectSection(SolutionItems) = preProject
+		EventLogConfig\app.config = EventLogConfig\app.config
+		EventLogConfig\Register-EventSource.ps1 = EventLogConfig\Register-EventSource.ps1
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1552EB73-5E64-42C2-B06C-92A08A086D44} = {2C7507D1-98D0-4C94-A903-04930A0E1B19}
 		{4E8C6369-9FD1-43F0-9878-27CC4DF24F83} = {2C7507D1-98D0-4C94-A903-04930A0E1B19}
+		{4E91C37F-0DDB-4632-9A0A-1AA20AAFCC1D} = {2C7507D1-98D0-4C94-A903-04930A0E1B19}
+		{75CA84A7-AC63-4E99-A444-5AB1CD5B16E2} = {2C7507D1-98D0-4C94-A903-04930A0E1B19}
 	EndGlobalSection
 EndGlobal

src/LyncConnector/LyncConnector.sln

@@ -924,7 +924,7 @@ function New-CSEntryChangeResult
 
 	if ($ExportAdd)
 	{
-		if ($NewArchorTable -eq $null -or !$NewAnchorTable.Keys.Count -eq 0)
+		if ($NewAnchorTable -eq $null -or $NewAnchorTable.Keys.Count -eq 0)
 		{
 			throw "The NewAnchorTable parameter must not be null."
 		}
@@ -977,6 +977,7 @@ function Select-PreferredDomainController
 				{
 					try
 					{
+						$preferredDC =$preferredDC.Trim()
 						$conn = New-Object "Net.Sockets.TcpClient"
 						$conn.Connect($preferredDC, 389)
 						$selected = $true

src/LyncConnector/Scripts/1. Lync.Common.psm1

@@ -148,5 +148,6 @@ if (!$session)
 
 Get-OpenImportConnectionResults
 
-Exit-Script -ScriptType "Begin-Import" -ExceptionRaisedOnErrorCheck [Microsoft.MetadirectoryServices.ServerDownException]
+$exceptionRaisedOnErrorCheck = [Microsoft.MetadirectoryServices.ServerDownException]
+Exit-Script -ScriptType "Begin-Import" -ExceptionRaisedOnErrorCheck $exceptionRaisedOnErrorCheck
 

src/LyncConnector/Scripts/6. Begin-ImportScript-Lync.ps1

@@ -224,7 +224,7 @@ function Get-PagingFilter
 				throw ("Unexpected Page Index $pageIndex to import objectType {0}. Max Index: {1}" -f $ObjectType, $userPages.Length)
 			}
 
-			$ldapFilter = "(&(objectCategory=person)(objectClass=user)(msRTCSIP-PrimaryUserAddress=sip:{0}*)" -f $userPages[$pageIndex] # no spaces in the LDAP query or it will fail.
+			$ldapFilter = "(&(objectCategory=person)(objectClass=user)(msRTCSIP-PrimaryUserAddress=sip:{0}*)" -f $userPages[$pageIndex].Trim() # no spaces in the LDAP query or it will fail.
 
 			if (![string]::IsNullOrEmpty($LastRunDateTime))
 			{
@@ -252,7 +252,7 @@ function Get-PagingFilter
 				throw ("Unexpected Page Index $pageIndex to import objectType {0}. Max Index: {1}" -f $ObjectType, $ouPages.Length)
 			}
 
-			$ldapFilter = "(name={0}*)" -f $ouPages[$pageIndex]
+			$ldapFilter = "(name={0}*)" -f $ouPages[$pageIndex].Trim()
 			if (![string]::IsNullOrEmpty($LastRunDateTime))
 			{
 				$ldapFilter += "(whenChanged>={0:yyyyMMddHHmmss}.0Z)" -f ([DateTime]$LastRunDateTime).AddMinutes(-1*[int]$lastRunDateTimeOffset) # The LastRunDateTime in watermark is already in UTC.
@@ -475,12 +475,16 @@ else
 	$ouPages = $ouPages.Split(",")
 }
 
-$lastRunDateTimeOffset = Get-ConfigParameter -ConfigParameters $ConfigParameters -ParameterName "LastRunDateTimeOffsetMinutes"
+$lastRunDateTimeOffset = Get-ConfigParameter -ConfigParameters $ConfigParameters -ParameterName "LastRunDateTimeOffsetMinutes" 
 
-if (![string]::IsNullOrEmpty($lastRunDateTimeOffset))
+if ([string]::IsNullOrEmpty($lastRunDateTimeOffset))
 {
 	$lastRunDateTimeOffset = 30 # in minutes
 }
+else
+{
+	$lastRunDateTimeOffset.Trim()
+}
 
 $deltaImport = $openImportConnectionRunStep.ImportType -eq "Delta"
 $customData = [xml]$getImportEntriesRunStep.CustomData

src/LyncConnector/Scripts/7. ImportScript-Lync.ps1

@@ -66,4 +66,5 @@ if (!$session)
 	Write-Debug "Opened a new RPS Session."
 }
 
-Exit-Script -ScriptType "Begin-Export" -ExceptionRaisedOnErrorCheck [Microsoft.MetadirectoryServices.ServerDownException]
+$exceptionRaisedOnErrorCheck = [Microsoft.MetadirectoryServices.ServerDownException]
+Exit-Script -ScriptType "Begin-Export" -ExceptionRaisedOnErrorCheck $exceptionRaisedOnErrorCheck