Merge pull request #229 from PlagueHO/Issue-217

Improved validation on User Defined Function Id parameter on *-CosmosDBUser* functions
PlagueHO · Nov 4, 2018 · 9f548ca · 9f548ca
2 parents b8ab3f5 + 091421b
commit 9f548ca
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,10 @@
 - Improved validation on Account parameter on `*-CosmosDBUserDefinedFunction*` functions.
 - Improved validation on Database parameter on `*-CosmosDBUserDefinedFunction*` functions.
 - Improved validation on Collection parameter on `*-CosmosDBUserDefinedFunction*` functions.
+- Improved validation on User Defined Function Id parameter on
+ `*-CosmosDBUser*` functions - fixes [Issue #217](https://github.com/PlagueHO/CosmosDB/issues/217).
+- Improved validation on Account parameter on `*-CosmosDBUser*` functions.
+- Improved validation on Database parameter on `*-CosmosDBUser*` functions.
 
 ## 2.1.12.137
 

diff --git a/src/en-US/CosmosDB.strings.psd1 b/src/en-US/CosmosDB.strings.psd1
@@ -41,4 +41,5 @@ ConvertFrom-StringData -StringData @'
     StoredProcedureIdInvalid = The Stored Procedure Id '{0}' is invalid. A Stored Procedure Id must not contain characters '\','/','#' or '?', end with a space or be longer than 255 characters.
     TriggerIdInvalid = The Trigger Id '{0}' is invalid. A Trigger Id must not contain characters '\','/','#' or '?', end with a space or be longer than 255 characters.
     UserDefinedFunctionIdInvalid = The User Defined Function Id '{0}' is invalid. A User Defined Function Id must not contain characters '\','/','#' or '?', end with a space or be longer than 255 characters.
+    UserIdInvalid = The User Id '{0}' is invalid. A User Id must not contain characters '\','/','#' or '?', end with a space or be longer than 255 characters.
 '@
diff --git a/src/lib/users/Assert-CosmosDbUserIdValid.ps1 b/src/lib/users/Assert-CosmosDbUserIdValid.ps1
@@ -0,0 +1,25 @@
+<#
+    .SYNOPSIS
+    Helper function that asserts a Cosmos DB User Id is valid.
+#>
+function Assert-CosmosDbUserIdValid
+{
+
+    [CmdletBinding()]
+    [OutputType([System.Boolean])]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [System.String]
+        $Id
+    )
+
+    $matches = [regex]::Match($Id,"[^\\/#?]{1,255}(?<!\s)")
+    if ($matches.value -ne $Id)
+    {
+        Throw $($LocalizedData.UserIdInvalid -f $Id)
+    }
+
+    return $true
+}
diff --git a/src/lib/users/Get-CosmosDbUser.ps1 b/src/lib/users/Get-CosmosDbUser.ps1
@@ -12,12 +12,12 @@ function Get-CosmosDbUser
         $Context,
 
         [Parameter(Mandatory = $true, ParameterSetName = 'Account')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbAccountNameValid -Name $_ })]
         [System.String]
         $Account,
 
         [Parameter()]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbDatabaseIdValid -Id $_ })]
         [System.String]
         $Database,
 
@@ -32,7 +32,7 @@ function Get-CosmosDbUser
         $KeyType = 'master',
 
         [Parameter()]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $Id
     )

diff --git a/src/lib/users/Get-CosmosDbUserResourcePath.ps1 b/src/lib/users/Get-CosmosDbUserResourcePath.ps1
@@ -6,10 +6,12 @@ function Get-CosmosDbUserResourcePath
     param
     (
         [Parameter(Mandatory = $true)]
+        [ValidateScript({ Assert-CosmosDbDatabaseIdValid -Id $_ })]
         [System.String]
         $Database,
 
         [Parameter(Mandatory = $true)]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $Id
     )

diff --git a/src/lib/users/New-CosmosDbUser.ps1 b/src/lib/users/New-CosmosDbUser.ps1
@@ -12,12 +12,12 @@ function New-CosmosDbUser
         $Context,
 
         [Parameter(Mandatory = $true, ParameterSetName = 'Account')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbAccountNameValid -Name $_ })]
         [System.String]
         $Account,
 
         [Parameter()]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbDatabaseIdValid -Id $_ })]
         [System.String]
         $Database,
 
@@ -32,7 +32,7 @@ function New-CosmosDbUser
         $KeyType = 'master',
 
         [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $Id
     )

diff --git a/src/lib/users/Remove-CosmosDbUser.ps1 b/src/lib/users/Remove-CosmosDbUser.ps1
@@ -11,12 +11,12 @@ function Remove-CosmosDbUser
         $Context,
 
         [Parameter(Mandatory = $true, ParameterSetName = 'Account')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbAccountNameValid -Name $_ })]
         [System.String]
         $Account,
 
         [Parameter()]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbDatabaseIdValid -Id $_ })]
         [System.String]
         $Database,
 
@@ -31,7 +31,7 @@ function Remove-CosmosDbUser
         $KeyType = 'master',
 
         [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $Id
     )

diff --git a/src/lib/users/Set-CosmosDbUser.ps1 b/src/lib/users/Set-CosmosDbUser.ps1
@@ -12,12 +12,12 @@ function Set-CosmosDbUser
         $Context,
 
         [Parameter(Mandatory = $true, ParameterSetName = 'Account')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbAccountNameValid -Name $_ })]
         [System.String]
         $Account,
 
         [Parameter()]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbDatabaseIdValid -Id $_ })]
         [System.String]
         $Database,
 
@@ -32,12 +32,12 @@ function Set-CosmosDbUser
         $KeyType = 'master',
 
         [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $Id,
 
         [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
+        [ValidateScript({ Assert-CosmosDbUserIdValid -Id $_ })]
         [System.String]
         $NewId
     )

diff --git a/test/Unit/CosmosDB.users.Tests.ps1 b/test/Unit/CosmosDB.users.Tests.ps1
@@ -52,6 +52,50 @@ InModuleScope CosmosDB {
         Content = $script:testJsonSingle
     }
 
+    Describe 'Assert-CosmosDbUserIdValid' -Tag 'Unit' {
+        It 'Should exist' {
+            { Get-Command -Name Assert-CosmosDbUserIdValid -ErrorAction Stop } | Should -Not -Throw
+        }
+
+        Context 'When called with a valid Id' {
+            It 'Should return $true' {
+                Assert-CosmosDbUserIdValid -Id 'This is a valid user ID..._-99!' | Should -Be $true
+            }
+        }
+
+        Context 'When called with a 256 character Id' {
+            It 'Should throw expected exception' {
+                {
+                    Assert-CosmosDbUserIdValid -Id ('a' * 256)
+                } | Should -Throw ($LocalizedData.UserIdInvalid -f ('a' * 256))
+            }
+        }
+
+        Context 'When called with an Id containing invalid characters' {
+            $testCases = @{ Id = 'a\b' }, @{ Id = 'a/b' }, @{ Id = 'a#b' }, @{ Id = 'a?b' }
+
+            It 'Should throw expected exception when called with "<Id>"' -TestCases $testCases {
+                param
+                (
+                    [System.String]
+                    $Id
+                )
+
+                {
+                    Assert-CosmosDbUserIdValid -Id $Id
+                } | Should -Throw ($LocalizedData.UserIdInvalid -f $Id)
+            }
+        }
+
+        Context 'When called with an Id ending with a space' {
+            It 'Should throw expected exception' {
+                {
+                    Assert-CosmosDbUserIdValid -Id ('a ')
+                } | Should -Throw ($LocalizedData.UserIdInvalid -f ('a '))
+            }
+        }
+    }
+
     Describe 'Get-CosmosDbUserResourcePath' -Tag 'Unit' {
         It 'Should exist' {
             { Get-Command -Name Get-CosmosDbUserResourcePath -ErrorAction Stop } | Should -Not -Throw