Merge pull request Azure#10019 from Azure/fixEmailValidation

Fix Email validation util. Would currently flag mail addresses that s…

Author: markcowl

src/Sql/Sql.Test/UnitTests/AzureSqlUtilTests.cs

@@ -0,0 +1,25 @@
+using Microsoft.Azure.Commands.Sql.Services;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.Sql.Test.UnitTests
+{
+    public class AzureSqlUtilTests
+    {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void MailValidation()
+        {
+            Assert.True(Util.AreEmailAddressesInCorrectFormat(new[] {
+                "[email protected]",
+                "[email protected]",
+                "[email protected]"}), "Valid email addresses are flagged as invalid");
+            Assert.False(Util.AreEmailAddressesInCorrectFormat(new[] { "kuku" }), "Invalid mail address not detected");
+            Assert.False(Util.AreEmailAddressesInCorrectFormat(new[] { "kuku@microsoft" }), "Invalid mail address not detected");
+            Assert.False(Util.AreEmailAddressesInCorrectFormat(new[] { "@micorsoft.com", "[email protected]" }), "One fauly mail address should fail the lot");
+        }
+    }
+}

src/Sql/Sql/ChangeLog.md

@@ -22,6 +22,7 @@
 * Added vCore example to creating an elastic pool (New-AzSqlElasticPool).
 * Remove the validation of EmailAddresses and the check that EmailAdmins is not false in case EmailAddresses is empty in Set-AzSqlServerAdvancedThreatProtectionPolicy and Set-AzSqlDatabaseAdvancedThreatProtectionPolicy
 * Enabled removal of server/database auditing settings when multiple diagnostic settings that enable audit category exist.
+* Fix email addresses validation in multiple Sql Vulnerability Assessment cmdlets (Update-AzSqlDatabaseVulnerabilityAssessmentSetting, Update-AzSqlServerVulnerabilityAssessmentSetting, Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting and Update-AzSqlInstanceVulnerabilityAssessmentSetting).
 
 ## Version 1.14.1
 * Update documentation of old Auditing cmdlets.

src/Sql/Sql/Services/Util.cs

@@ -90,7 +90,7 @@ public static bool AreEmailAddressesInCorrectFormat(string[] emailAddresses)
                 new Regex(string.Format("{0}{1}",
                     @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))",
                     @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-\w]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$"));
-            return !emailAddresses.Any(e => !emailRegex.IsMatch(e));
+            return !emailAddresses.Any(e => !emailRegex.IsMatch(e.ToLower()));
         }
     }
 }