CSHARP-2151: Resync connection string spec tests for percent encoding in userinfo

Author: ksadoff

src/MongoDB.Driver.Core/Core/Configuration/ConnectionString.cs

@@ -365,7 +365,7 @@ public IReadOnlyList<TagSet> ReadPreferenceTags
         {
             get { return _readPreferenceTags; }
         }
-        
+
         /// <summary>
         /// Gets a value indicating whether or not to retry reads.
         /// </summary>
@@ -759,6 +759,17 @@ private void Parse()
                 @"((?<username>[^:@]+)(:(?<password>[^:@]*))?@)?" +
                 serversPattern + @"(/" + databasePattern + ")?/?" + optionsPattern + "$";
 
+            if (_originalConnectionString.Contains("%"))
+            {
+                var invalidPercentPattern = @"%$|%.$|%[^0-9a-fA-F]|%[0-9a-fA-F][^0-9a-fA-F]";
+                if (Regex.IsMatch(_originalConnectionString, invalidPercentPattern))
+                {
+                    var message = string.Format("The connection string '{0}' contains an invalid '%' escape sequence.",
+                        _originalConnectionString);
+                    throw new MongoConfigurationException(message);
+                }
+            }
+
             var match = Regex.Match(_originalConnectionString, pattern);
             if (!match.Success)
             {
@@ -1111,7 +1122,7 @@ private static TimeSpan ParseTimeSpan(string name, string value)
         }
 
         private List<string> GetHostsFromResponse(IDnsQueryResponse response)
-        {         
+        {
             var hosts = new List<string>();
             foreach (var srvRecord in response.Answers.SrvRecords())
             {
@@ -1130,7 +1141,7 @@ private List<string> GetOptionsFromResponse(IDnsQueryResponse response)
         {
             var txtRecords = response.Answers
                 .TxtRecords().ToList();
-            
+
             if (txtRecords.Count > 1)
             {
                 throw new MongoConfigurationException("Only 1 TXT record is allowed when using the SRV protocol.");

tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/TestRunner.cs

@@ -28,15 +28,17 @@
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using Xunit.Sdk;
 using System.Collections;
+using MongoDB.Bson.TestHelpers.JsonDrivenTests;
 
 namespace MongoDB.Driver.Specifications.connection_string
 {
     public class TestRunner
     {
         [SkippableTheory]
         [ClassData(typeof(TestCaseFactory))]
-        public void RunTestDefinition(BsonDocument definition)
+        public void RunTestDefinition(JsonDrivenTestCase testCase)
         {
+            var definition = testCase.Test;
             ConnectionString connectionString = null;
             Exception parseException = null;
             try
@@ -134,63 +136,19 @@ private EndPoint ConvertExpectedHostToEndPoint(BsonDocument expectedHost)
             throw new AssertionException($"Unknown host type {expectedHost["type"]}.");
         }
 
-        private class TestCaseFactory : IEnumerable<object[]>
+        private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
             private static readonly string[] __ignoredTestNames = new string[]
             {
-                "invalid-uris: Missing delimiting slash between hosts and options"
+                "invalid-uris.json:Missing delimiting slash between hosts and options"
             };
 
-            public IEnumerator<object[]> GetEnumerator()
-            {
-                const string prefix = "MongoDB.Driver.Core.Tests.Specifications.connection_string.tests.";
-                var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
-                var enumerable = executingAssembly
-                    .GetManifestResourceNames()
-                    .Where(path => path.StartsWith(prefix) && path.EndsWith(".json"))
-                    .SelectMany(path =>
-                    {
-                        var definition = ReadDefinition(path);
-                        var tests = (BsonArray)definition["tests"];
-                        var fullName = path.Remove(0, prefix.Length);
-                        var list = new List<object[]>();
-                        foreach (BsonDocument test in tests)
-                        {
-                            //var data = new TestCaseData(test);
-                            //data.SetCategory("Specifications");
-                            //data.SetCategory("ConnectionString");
-                            //var testName = fullName.Remove(fullName.Length - 5) + ": " + test["description"];
-                            //if (_ignoredTestNames.Contains(testName))
-                            //{
-                            //    data = data.Ignore("Does not apply");
-                            //}
-                            //list.Add(data.SetName(testName));
-                            var testName = fullName.Remove(fullName.Length - 5) + ": " + test["description"];
-                            if (!__ignoredTestNames.Contains(testName))
-                            {
-                                var data = new object[] { test };
-                                list.Add(data);
-                            }
-                        }
-                        return list;
-                    });
-                return enumerable.GetEnumerator();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
+            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.connection_string.tests.";
 
-            private static BsonDocument ReadDefinition(string path)
+            protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
             {
-                var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
-                using (var definitionStream = executingAssembly.GetManifestResourceStream(path))
-                using (var definitionStringReader = new StreamReader(definitionStream))
-                {
-                    var definitionString = definitionStringReader.ReadToEnd();
-                    return BsonDocument.Parse(definitionString);
-                }
+                return base.CreateTestCases(document)
+                    .Where(test => !__ignoredTestNames.Any(ignoredName => test.Name.EndsWith(ignoredName)));
             }
         }
     }

tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/tests/invalid-uris.json

@@ -215,6 +215,16 @@
             "uri": "mongodb:///tmp/mongodb-27017.sock/", 
             "valid": false, 
             "warning": null
-        }
+        },
+        {
+            "auth": null,
+            "description": "Username with password containing an unescaped percent sign",
+            "hosts": null,
+            "options": null,
+            "uri": "mongodb://alice%foo:[email protected]",
+            "valid": false,
+            "warning": null
+        }	    
+
     ]
 }

tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/tests/invalid-uris.yml

@@ -191,3 +191,12 @@ tests:
         hosts: ~
         auth: ~
         options: ~
+    -
+        description: "Username with password containing an unescaped percent sign"
+        uri: "mongodb://alice%foo:[email protected]"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~        
+