Skip to content

Commit

Permalink
Addressing review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@SSvilen
SSvilen committed Apr 18, 2020
1 parent 19a5b4e commit e276db1
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 99 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
- Fixing xExchSendConnector ExtendedRight functionality by moving the test function
to the helper module and setting explicit Deny permissions, instead of removing
the marked as 'Deny' entries.
- Added AD Permissions parameter for xExchReceiveConnector.

## [1.31.0] - 2020-01-27

Expand Down
200 changes: 101 additions & 99 deletions source/DSCResources/MSFT_xExchReceiveConnector/MSFT_xExchReceiveConnector.psm1
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<#
.SYNOPSIS
Gets the ressource
.PARAMETER Name
Identity of the Receive Connector. Needs to be in format SERVERNAME
Gets the resource
.PARAMETER Identity
Identity of the Receive Connector. Needs to be in format SERVERNAME\CONNECTORNAME (no quotes)
.PARAMETER Credential
Credentials used to establish a remote PowerShell session to Exchange.
.PARAMETER Ensure
Expand Down Expand Up @@ -59,111 +59,112 @@ function Get-TargetResource
foreach ($user in $userNames)
{
$allowPermissions = ($adPermissions | Where-Object -FilterScript { $_.User.RawIdentity -eq $user -and $_.Deny -eq $false } |
ForEach-Object -MemberName ExtendedRights | ForEach-Object -MemberName RawIdentity) -join ','
$denyPermissions = ($adPermissions | Where-Object -FilterScript { $_.User.RawIdentity -eq $user -and $_.Deny -eq $true } |
ForEach-Object -MemberName ExtendedRights | ForEach-Object -MemberName RawIdentity) -join ','
ForEach-Object -MemberName ExtendedRights | ForEach-Object -MemberName RawIdentity) -join ','
$denyPermissions = ($adPermissions | Where-Object -FilterScript { $_.User.RawIdentity -eq $user -and $_.Deny -eq $true } |
ForEach-Object -MemberName ExtendedRights | ForEach-Object -MemberName RawIdentity) -join ','

if ($allowPermissions)
{
$ExtendedRightAllowEntries.Add(
(
New-CimInstance -ClassName MSFT_KeyValuePair -Property @{
key = $user
value = $allowPermissions
} -ClientOnly
)
)
}
if ($denyPermissions)
{
$ExtendedRightDenyEntries.Add(
(
New-CimInstance -ClassName MSFT_KeyValuePair -Property @{
key = $user
value = $denyPermissions
} -ClientOnly
)
)
}
}
if ($allowPermissions)
{
$ExtendedRightAllowEntries.Add(
(
New-CimInstance -ClassName MSFT_KeyValuePair -Property @{
key = $user
value = $allowPermissions
} -ClientOnly
)
)
}
if ($denyPermissions)
{
$ExtendedRightDenyEntries.Add(
(
New-CimInstance -ClassName MSFT_KeyValuePair -Property @{
key = $user
value = $denyPermissions
} -ClientOnly
)
)
}
}

$returnValue = @{
Identity = [System.String] $Identity
AdvertiseClientSettings = [System.Boolean] $connector.AdvertiseClientSettings
AuthTarpitInterval = [System.String] $connector.AuthTarpitInterval
AuthMechanism = [System.String[]] $connector.AuthMechanism.ToString().Split(',').Trim()
Banner = [System.String] $connector.Banner
BareLinefeedRejectionEnabled = [System.Boolean] $connector.BareLinefeedRejectionEnabled
BinaryMimeEnabled = [System.Boolean] $connector.BinaryMimeEnabled
Bindings = [System.String[]] $connector.Bindings
ChunkingEnabled = [System.Boolean] $connector.ChunkingEnabled
Comment = [System.String] $connector.Comment
ConnectionInactivityTimeout = [System.String] $connector.ConnectionInactivityTimeout
ConnectionTimeout = [System.String] $connector.ConnectionTimeout
DefaultDomain = [System.String] $connector.DefaultDomain
DeliveryStatusNotificationEnabled = [System.Boolean] $connector.DeliveryStatusNotificationEnabled
DomainSecureEnabled = [System.Boolean] $connector.DomainSecureEnabled
EightBitMimeEnabled = [System.Boolean] $connector.EightBitMimeEnabled
EnableAuthGSSAPI = [System.Boolean] $connector.EnableAuthGSSAPI
Enabled = [System.Boolean] $connector.Enabled
EnhancedStatusCodesEnabled = [System.Boolean] $connector.EnhancedStatusCodesEnabled
ExtendedProtectionPolicy = [System.String] $connector.ExtendedProtectionPolicy
ExtendedRightAllowEntries = [Microsoft.Management.Infrastructure.CimInstance[]] $ExtendedRightAllowEntries
ExtendedRightDenyEntries = [Microsoft.Management.Infrastructure.CimInstance[]] $ExtendedRightDenyEntries
Fqdn = [System.String] $connector.Fqdn
LongAddressesEnabled = [System.Boolean] $connector.LongAddressesEnabled
MaxAcknowledgementDelay = [System.String] $connector.MaxAcknowledgementDelay
MaxHeaderSize = [System.String] $connector.MaxHeaderSize
MaxHopCount = [System.Int32] $connector.MaxHopCount
MaxInboundConnection = [System.String] $connector.MaxInboundConnection
MaxInboundConnectionPercentagePerSource = [System.Int32] $connector.MaxInboundConnectionPercentagePerSource
MaxInboundConnectionPerSource = [System.String] $connector.MaxInboundConnectionPerSource
MaxLocalHopCount = [System.Int32] $connector.MaxLocalHopCount
MaxLogonFailures = [System.Int32] $connector.MaxLogonFailures
MaxMessageSize = [System.String] $connector.MaxMessageSize
MaxProtocolErrors = [System.String] $connector.MaxProtocolErrors
MaxRecipientsPerMessage = [System.Int32] $connector.MaxRecipientsPerMessage
MessageRateLimit = [System.String] $connector.MessageRateLimit
MessageRateSource = [System.String] $connector.MessageRateSource
OrarEnabled = [System.Boolean] $connector.OrarEnabled
PermissionGroups = [System.String[]] $connector.PermissionGroups.ToString().Split(',').Trim()
PipeliningEnabled = [System.Boolean] $connector.PipeliningEnabled
ProtocolLoggingLevel = [System.String] $connector.ProtocolLoggingLevel
RemoteIPRanges = [System.String[]] $connector.RemoteIPRanges
RequireEHLODomain = [System.Boolean] $connector.RequireEHLODomain
RequireTLS = [System.Boolean] $connector.RequireTLS
ServiceDiscoveryFqdn = [System.String] $connector.ServiceDiscoveryFqdn
SizeEnabled = [System.String] $connector.SizeEnabled
SuppressXAnonymousTls = [System.Boolean] $connector.SuppressXAnonymousTls
TarpitInterval = [System.String] $connector.TarpitInterval
TlsCertificateName = [System.String] $connector.TlsCertificateName
TlsDomainCapabilities = [System.String[]] $connector.TlsDomainCapabilities
TransportRole = [System.String] $connector.TransportRole
Usage = [System.String[]] $connector.Usage
Ensure = 'Present'
}
}
else
{
$returnValue = @{
Ensure = 'Absent'
}
$returnValue = @{
Identity = [System.String] $Identity
AdvertiseClientSettings = [System.Boolean] $connector.AdvertiseClientSettings
AuthTarpitInterval = [System.String] $connector.AuthTarpitInterval
AuthMechanism = [System.String[]] $connector.AuthMechanism.ToString().Split(',').Trim()
Banner = [System.String] $connector.Banner
BareLinefeedRejectionEnabled = [System.Boolean] $connector.BareLinefeedRejectionEnabled
BinaryMimeEnabled = [System.Boolean] $connector.BinaryMimeEnabled
Bindings = [System.String[]] $connector.Bindings
ChunkingEnabled = [System.Boolean] $connector.ChunkingEnabled
Comment = [System.String] $connector.Comment
ConnectionInactivityTimeout = [System.String] $connector.ConnectionInactivityTimeout
ConnectionTimeout = [System.String] $connector.ConnectionTimeout
DefaultDomain = [System.String] $connector.DefaultDomain
DeliveryStatusNotificationEnabled = [System.Boolean] $connector.DeliveryStatusNotificationEnabled
DomainSecureEnabled = [System.Boolean] $connector.DomainSecureEnabled
EightBitMimeEnabled = [System.Boolean] $connector.EightBitMimeEnabled
EnableAuthGSSAPI = [System.Boolean] $connector.EnableAuthGSSAPI
Enabled = [System.Boolean] $connector.Enabled
EnhancedStatusCodesEnabled = [System.Boolean] $connector.EnhancedStatusCodesEnabled
ExtendedProtectionPolicy = [System.String] $connector.ExtendedProtectionPolicy
ExtendedRightAllowEntries = [Microsoft.Management.Infrastructure.CimInstance[]] $ExtendedRightAllowEntries
ExtendedRightDenyEntries = [Microsoft.Management.Infrastructure.CimInstance[]] $ExtendedRightDenyEntries
Fqdn = [System.String] $connector.Fqdn
LongAddressesEnabled = [System.Boolean] $connector.LongAddressesEnabled
MaxAcknowledgementDelay = [System.String] $connector.MaxAcknowledgementDelay
MaxHeaderSize = [System.String] $connector.MaxHeaderSize
MaxHopCount = [System.Int32] $connector.MaxHopCount
MaxInboundConnection = [System.String] $connector.MaxInboundConnection
MaxInboundConnectionPercentagePerSource = [System.Int32] $connector.MaxInboundConnectionPercentagePerSource
MaxInboundConnectionPerSource = [System.String] $connector.MaxInboundConnectionPerSource
MaxLocalHopCount = [System.Int32] $connector.MaxLocalHopCount
MaxLogonFailures = [System.Int32] $connector.MaxLogonFailures
MaxMessageSize = [System.String] $connector.MaxMessageSize
MaxProtocolErrors = [System.String] $connector.MaxProtocolErrors
MaxRecipientsPerMessage = [System.Int32] $connector.MaxRecipientsPerMessage
MessageRateLimit = [System.String] $connector.MessageRateLimit
MessageRateSource = [System.String] $connector.MessageRateSource
OrarEnabled = [System.Boolean] $connector.OrarEnabled
PermissionGroups = [System.String[]] $connector.PermissionGroups.ToString().Split(',').Trim()
PipeliningEnabled = [System.Boolean] $connector.PipeliningEnabled
ProtocolLoggingLevel = [System.String] $connector.ProtocolLoggingLevel
RemoteIPRanges = [System.String[]] $connector.RemoteIPRanges
RequireEHLODomain = [System.Boolean] $connector.RequireEHLODomain
RequireTLS = [System.Boolean] $connector.RequireTLS
ServiceDiscoveryFqdn = [System.String] $connector.ServiceDiscoveryFqdn
SizeEnabled = [System.String] $connector.SizeEnabled
SuppressXAnonymousTls = [System.Boolean] $connector.SuppressXAnonymousTls
TarpitInterval = [System.String] $connector.TarpitInterval
TlsCertificateName = [System.String] $connector.TlsCertificateName
TlsDomainCapabilities = [System.String[]] $connector.TlsDomainCapabilities
TransportRole = [System.String] $connector.TransportRole
Usage = [System.String[]] $connector.Usage
Ensure = 'Present'
}
}
else
{
$returnValue = @{
Ensure = 'Absent'
}
}

$returnValue
$returnValue
}

<#
.SYNOPSIS
Sets the ressource
.PARAMETER Name
Identity of the Receive Connector. Needs to be in format SERVERNAME
Sets the resource
.PARAMETER Identity
Identity of the Receive Connector. Needs to be in format SERVERNAME\CONNECTORNAME (no quotes)
.PARAMETER Credential
Credentials used to establish a remote PowerShell session to Exchange.
.PARAMETER Ensure
Whether the connector should be present or not.
.PARAMETER AdvertiseClientSettings
Specifies whether the SMTP server name
Specifies whether the SMTP server name,port number, and authentication settings for the Receive connector
are displayed to users in the options of Outlook on the web.
.PARAMETER AuthMechanism
Specifies the advertised and accepted authentication mechanisms for the Receive connector.
.PARAMETER AuthTarpitInterval
Expand Down Expand Up @@ -597,15 +598,16 @@ function Set-TargetResource

<#
.SYNOPSIS
Tests the ressource
.PARAMETER Name
Identity of the Receive Connector. Needs to be in format SERVERNAME
Tests the resource
.PARAMETER Identity
Identity of the Receive Connector. Needs to be in format SERVERNAME\CONNECTORNAME (no quotes)
.PARAMETER Credential
Credentials used to establish a remote PowerShell session to Exchange.
.PARAMETER Ensure
Whether the connector should be present or not.
.PARAMETER AdvertiseClientSettings
Specifies whether the SMTP server name
Specifies whether the SMTP server name,port number, and authentication settings for the Receive connector
are displayed to users in the options of Outlook on the web.
.PARAMETER AuthMechanism
Specifies the advertised and accepted authentication mechanisms for the Receive connector.
.PARAMETER AuthTarpitInterval
Expand Down

0 comments on commit e276db1

Please sign in to comment.