Fixing cookie delete bug for related domains in IE

Also fixed up .NET cookie tests.
patcadelina · Jul 7, 2015 · 7e6dcc1 · 7e6dcc1
1 parent 90e5c49
commit 7e6dcc1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/cpp/iedriver/CookieManager.cpp b/cpp/iedriver/CookieManager.cpp
@@ -246,23 +246,21 @@ bool CookieManager::RecurseCookieDomain(const std::string& url,
                                         const std::string& path,
                                         const bool is_httponly) {
   bool deleted = this->DeleteCookie(url, name, domain, path, is_httponly);
-  if (!deleted) {
-    size_t dot_index = domain.find_first_of('.');
-    if (dot_index == 0) {
-      return this->RecurseCookieDomain(url,
-                                       name,
-                                       domain.substr(1),
-                                       path,
-                                       is_httponly);
-    } else if (dot_index != std::string::npos) {
-      return this->RecurseCookieDomain(url,
-                                       name,
-                                       domain.substr(dot_index),
-                                       path,
-                                       is_httponly);
-    }
-    deleted = this->DeleteCookie(url, name, "", path, is_httponly);
+  size_t dot_index = domain.find_first_of('.');
+  if (dot_index == 0) {
+    return this->RecurseCookieDomain(url,
+                                      name,
+                                      domain.substr(1),
+                                      path,
+                                      is_httponly);
+  } else if (dot_index != std::string::npos) {
+    return this->RecurseCookieDomain(url,
+                                      name,
+                                      domain.substr(dot_index),
+                                      path,
+                                      is_httponly);
   }
+  deleted = this->DeleteCookie(url, name, "", path, is_httponly);
   return deleted;
 }
 

diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
@@ -9,7 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
-v2.46.0.5
+v2.46.0.7
+=========
+ * Fixed cookie delete bug for related domains.
+
+v2.46.0.6
 =========
  * Corrected cookie add/delete logic with respect to HTTP-only cookies.
 

diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc
diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe
diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe
diff --git a/dotnet/test/common/CookieImplementationTest.cs b/dotnet/test/common/CookieImplementationTest.cs
@@ -218,14 +218,22 @@ public void ShouldNotGetCookieOnDifferentDomain()
         }
 
         [Test]
-        [Ignore("Cannot run without creating subdomains in test environment")]
         public void ShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain()
         {
             if (!CheckIsOnValidHostNameForCookieTests())
             {
                 return;
             }
 
+            // Cookies cannot be set on domain names with less than 2 dots, so
+            // localhost is out. If we are in that boat, bail the test.
+            string hostName = EnvironmentManager.Instance.UrlBuilder.HostName;
+            string[] hostNameParts = hostName.Split(new char[] { '.' });
+            if (hostNameParts.Length < 3)
+            {
+                Assert.Ignore("Skipping test: Cookies can only be set on fully-qualified domain names.");
+            }
+
             AssertCookieIsNotPresentWithName("name");
 
             Regex replaceRegex = new Regex(".*?\\.");
@@ -277,7 +285,7 @@ public void ShouldBeAbleToIncludeLeadingPeriodInDomainName()
 
             // Replace the first part of the name with a period
             Regex replaceRegex = new Regex(".*?\\.");
-            string shorter = replaceRegex.Replace(this.hostname, ".");
+            string shorter = replaceRegex.Replace(this.hostname, ".", 1);
             Cookie cookie = new Cookie("name", "value", shorter, "/", DateTime.Now.AddSeconds(100000));
 
             driver.Manage().Cookies.AddCookie(cookie);