xExchOwaVirtualDirectory: Add download domain parameters (#479)

dsccommunity · Jul 25, 2022 · e7c4de9 · e7c4de9
1 parent 6093aeb
commit e7c4de9
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,17 +5,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- xExchOwaVirtualDirectoryInternal
+  - Added parameters `ExternalDownloadHostName` and `InternalDownloadHostName`.
+
 ### Changed
 
 - xExchange
   - Update the pipeline files from the latest template in Sampler.
 - xExchPopSettings
-  - Add missing ProtocolLogEnabled parameter
+  - Add missing ProtocolLogEnabled parameter.
 - xExchWebServicesVirtualDirectory
-  - Fixed Typo
-
+  - Fixed typo.
 - xExchangeHelper
-  - Fixed module import error ([Issue #481](https://github.com/dsccommunity/xExchange/issues/481))
+  - Fixed module import error ([issue #481](https://github.com/dsccommunity/xExchange/issues/481)).
 
 ## [1.33.0] - 2021-10-31
 

diff --git a/README.md b/README.md
@@ -1464,9 +1464,11 @@ parameters.
 - **DigestAuthentication**
 - **DomainController**
 - **ExternalAuthenticationMethods**
+- **ExternalDownloadHostName**
 - **ExternalUrl**
 - **FormsAuthentication**
 - **GzipLevel**
+- **InternalDownloadHostName**
 - **InternalUrl**
 - **InstantMessagingEnabled**
 - **InstantMessagingCertificateThumbprint**

diff --git a/source/DSCResources/MSFT_xExchOwaVirtualDirectory/MSFT_xExchOwaVirtualDirectory.psm1 b/source/DSCResources/MSFT_xExchOwaVirtualDirectory/MSFT_xExchOwaVirtualDirectory.psm1
@@ -47,6 +47,10 @@ function Get-TargetResource
         [System.String[]]
         $ExternalAuthenticationMethods,
 
+        [Parameter()]
+        [System.String]
+        $ExternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $ExternalUrl,
@@ -77,6 +81,10 @@ function Get-TargetResource
         [System.String]
         $InstantMessagingType,
 
+        [Parameter()]
+        [System.String]
+        $InternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $InternalUrl,
@@ -143,13 +151,15 @@ function Get-TargetResource
             DefaultDomain                          = [System.String] $OwaVdir.DefaultDomain
             DigestAuthentication                   = [System.Boolean] $OwaVdir.DigestAuthentication
             ExternalAuthenticationMethods          = [System.String[]] $OwaVdir.ExternalAuthenticationMethods
+            ExternalDownloadHostName               = [System.String] $OwaVdir.ExternalDownloadHostName
             ExternalUrl                            = [System.String] $OwaVdir.ExternalUrl.AbsoluteUri
             FormsAuthentication                    = [System.Boolean] $OwaVdir.FormsAuthentication
             GzipLevel                              = [System.String] $OwaVdir.GzipLevel
             InstantMessagingCertificateThumbprint  = [System.String] $OwaVdir.InstantMessagingCertificateThumbprint
             InstantMessagingEnabled                = [System.Boolean] $OwaVdir.InstantMessagingEnabled
             InstantMessagingServerName             = [System.String] $OwaVdir.InstantMessagingServerName
             InstantMessagingType                   = [System.String] $OwaVdir.InstantMessagingType
+            InternalDownloadHostName               = [System.String] $OwaVdir.InternalDownloadHostName
             InternalUrl                            = [System.String] $OwaVdir.InternalUrl.AbsoluteUri
             LogonFormat                            = [System.String] $OwaVdir.LogonFormat
             LogonPageLightSelectionEnabled         = [System.Boolean] $OwaVdir.LogonPageLightSelectionEnabled
@@ -212,6 +222,10 @@ function Set-TargetResource
         [System.String[]]
         $ExternalAuthenticationMethods,
 
+        [Parameter()]
+        [System.String]
+        $ExternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $ExternalUrl,
@@ -242,6 +256,10 @@ function Set-TargetResource
         [System.String]
         $InstantMessagingType,
 
+        [Parameter()]
+        [System.String]
+        $InternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $InternalUrl,
@@ -363,6 +381,10 @@ function Test-TargetResource
         [System.String[]]
         $ExternalAuthenticationMethods,
 
+        [Parameter()]
+        [System.String]
+        $ExternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $ExternalUrl,
@@ -393,6 +415,10 @@ function Test-TargetResource
         [System.String]
         $InstantMessagingType,
 
+        [Parameter()]
+        [System.String]
+        $InternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $InternalUrl,
@@ -580,6 +606,16 @@ function Test-TargetResource
         {
             $testResults = $false
         }
+
+        if (!(Test-ExchangeSetting -Name 'ExternalDownloadHostName' -Type 'String' -ExpectedValue $ExternalDownloadHostName -ActualValue $OwaVdir.ExternalDownloadHostName -PSBoundParametersIn $PSBoundParameters -Verbose:$VerbosePreference))
+        {
+            $testResults = $false
+        }
+
+        if (!(Test-ExchangeSetting -Name 'InternalDownloadHostName' -Type 'String' -ExpectedValue $InternalDownloadHostName -ActualValue $OwaVdir.InternalDownloadHostName -PSBoundParametersIn $PSBoundParameters -Verbose:$VerbosePreference))
+        {
+            $testResults = $false
+        }
     }
 
     return $testResults
@@ -632,6 +668,10 @@ function Get-OwaVirtualDirectoryInternal
         [System.String[]]
         $ExternalAuthenticationMethods,
 
+        [Parameter()]
+        [System.String]
+        $ExternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $ExternalUrl,
@@ -662,6 +702,10 @@ function Get-OwaVirtualDirectoryInternal
         [System.String]
         $InstantMessagingType,
 
+        [Parameter()]
+        [System.String]
+        $InternalDownloadHostName,
+
         [Parameter()]
         [System.String]
         $InternalUrl,

diff --git a/source/DSCResources/MSFT_xExchOwaVirtualDirectory/MSFT_xExchOwaVirtualDirectory.schema.mof b/source/DSCResources/MSFT_xExchOwaVirtualDirectory/MSFT_xExchOwaVirtualDirectory.schema.mof
@@ -15,9 +15,11 @@ class MSFT_xExchOwaVirtualDirectory : OMI_BaseResource
     [Write] Boolean DigestAuthentication;
     [Write] String DomainController;
     [Write] String ExternalAuthenticationMethods[];
+    [Write] String ExternalDownloadHostName;
     [Write] String ExternalUrl;
     [Write] Boolean FormsAuthentication;
     [Write, ValueMap{"Off", "Low", "High", "Error"}, Values{"Off", "Low", "High", "Error"}] String GzipLevel;
+    [Write] String InternalDownloadHostName;
     [Write] String InternalUrl;
     [Write] Boolean InstantMessagingEnabled;
     [Write] String InstantMessagingCertificateThumbprint;
@@ -34,6 +36,3 @@ class MSFT_xExchOwaVirtualDirectory : OMI_BaseResource
     [Write] String DefaultDomain;
     [Write] Boolean SetPhotoEnabled;
 };
-
-
-
diff --git a/tests/Integration/MSFT_xExchOwaVirtualDirectory.Integration.Tests.ps1 b/tests/Integration/MSFT_xExchOwaVirtualDirectory.Integration.Tests.ps1
@@ -58,13 +58,15 @@ if ($exchangeInstalled)
             BasicAuthentication                    = $true
             ChangePasswordEnabled                  = $true
             DigestAuthentication                   = $false
+            ExternalDownloadHostName               = 'downloaddomain.contoso.local'
             ExternalUrl                            = "https://$($serverFqdn)/owa"
             FormsAuthentication                    = $true
             GzipLevel                              = 'Off'
             InstantMessagingEnabled                = $false
             InstantMessagingCertificateThumbprint  = ''
             InstantMessagingServerName             = ''
             InstantMessagingType                   = 'None'
+            InternalDownloadHostName               = 'downloaddomain.contoso.local'
             InternalUrl                            = "https://$($serverFqdn)/owa"
             LogonPagePublicPrivateSelectionEnabled = $true
             LogonPageLightSelectionEnabled         = $true
@@ -84,13 +86,15 @@ if ($exchangeInstalled)
             ActionForUnknownFileAndMIMETypes       = 'ForceSave'
             ChangePasswordEnabled                  = $true
             DigestAuthentication                   = $false
+            ExternalDownloadHostName               = 'downloaddomain.contoso.local'
             ExternalUrl                            = "https://$($serverFqdn)/owa"
             FormsAuthentication                    = $true
             GzipLevel                              = 'Off'
             InstantMessagingEnabled                = $false
             InstantMessagingCertificateThumbprint  = ''
             InstantMessagingServerName             = ''
             InstantMessagingType                   = 'None'
+            InternalDownloadHostName               = 'downloaddomain.contoso.local'
             InternalUrl                            = "https://$($serverFqdn)/owa"
             LogonPagePublicPrivateSelectionEnabled = $true
             LogonPageLightSelectionEnabled         = $true
@@ -114,13 +118,15 @@ if ($exchangeInstalled)
             BasicAuthentication                    = $false
             ChangePasswordEnabled                  = $false
             DigestAuthentication                   = $true
+            ExternalDownloadHostName               = ''
             ExternalUrl                            = ''
             FormsAuthentication                    = $false
             GzipLevel                              = 'High'
             InstantMessagingEnabled                = $true
             InstantMessagingCertificateThumbprint  = $imCertThumbprint
             InstantMessagingServerName             = $env:COMPUTERNAME
             InstantMessagingType                   = 'Ocs'
+            InternalDownloadHostName               = ''
             InternalUrl                            = ''
             LogonPagePublicPrivateSelectionEnabled = $false
             LogonPageLightSelectionEnabled         = $false
@@ -140,13 +146,15 @@ if ($exchangeInstalled)
             BasicAuthentication                    = $false
             ChangePasswordEnabled                  = $false
             DigestAuthentication                   = $true
+            ExternalDownloadHostName               = ''
             ExternalUrl                            = ''
             FormsAuthentication                    = $false
             GzipLevel                              = 'High'
             InstantMessagingEnabled                = $true
             InstantMessagingCertificateThumbprint  = $imCertThumbprint
             InstantMessagingServerName             = $env:COMPUTERNAME
             InstantMessagingType                   = 'Ocs'
+            InternalDownloadHostName               = ''
             InternalUrl                            = ''
             LogonPagePublicPrivateSelectionEnabled = $false
             LogonPageLightSelectionEnabled         = $false

diff --git a/tests/Unit/MSFT_xExchOwaVirtualDirectory.tests.ps1 b/tests/Unit/MSFT_xExchOwaVirtualDirectory.tests.ps1
@@ -33,13 +33,15 @@ try
                 DefaultDomain                          = [System.String] ''
                 DigestAuthentication                   = [System.Boolean] $false
                 ExternalAuthenticationMethods          = [System.String[]] @()
+                ExternalDownloadHostName               = [System.String] ''
                 ExternalUrl                            = [System.String] ''
                 FormsAuthentication                    = [System.Boolean] $false
                 GzipLevel                              = [System.String] ''
                 InstantMessagingCertificateThumbprint  = [System.String] ''
                 InstantMessagingEnabled                = [System.Boolean] $false
                 InstantMessagingServerName             = [System.String] ''
                 InstantMessagingType                   = [System.String] ''
+                InternalDownloadHostName               = [System.String] ''
                 InternalUrl                            = [System.String] ''
                 LogonFormat                            = [System.String] ''
                 LogonPageLightSelectionEnabled         = [System.Boolean] $false
@@ -65,4 +67,3 @@ finally
 {
     Invoke-TestCleanup
 }
-