Change all Cookie localized DateTime logic with Universal alternative (…

…dotnet#100489) * Change all localized DateTime logic with Universal alternative * tests adjusted * comment updated according to changes * Update src/libraries/System.Net.Primitives/tests/FunctionalTests/CookieTest.cs Co-authored-by: Radek Zikmund <[email protected]> * Code review comment fix --------- Co-authored-by: Radek Zikmund <[email protected]> Co-authored-by: Marie Píchová <[email protected]>
Ruihan-Yin · May 30, 2024 · 4552b1d · 4552b1d
1 parent decbceb
commit 4552b1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/libraries/Common/src/System/Net/CookieParser.cs b/src/libraries/Common/src/System/Net/CookieParser.cs
@@ -665,7 +665,7 @@ private static FieldInfo IsQuotedVersionField
                                         expiresSet = true;
                                         if (int.TryParse(CheckQuoted(_tokenizer.Value), out int parsed))
                                         {
-                                            cookie!.Expires = DateTime.Now.AddSeconds(parsed);
+                                            cookie!.Expires = DateTime.UtcNow.AddSeconds(parsed);
                                         }
                                         else
                                         {

diff --git a/src/libraries/System.Net.Primitives/src/System/Net/Cookie.cs b/src/libraries/System.Net.Primitives/src/System/Net/Cookie.cs
@@ -63,7 +63,7 @@ public sealed class Cookie
         private bool m_secure; // Do not rename (binary serialization)
         [System.Runtime.Serialization.OptionalField]
         private bool m_httpOnly = false; // Do not rename (binary serialization)
-        private DateTime m_timeStamp = DateTime.Now; // Do not rename (binary serialization)
+        private DateTime m_timeStamp = DateTime.UtcNow; // Do not rename (binary serialization)
         private string m_value = string.Empty; // Do not rename (binary serialization)
         private int m_version; // Do not rename (binary serialization)
 
@@ -199,13 +199,13 @@ public bool Expired
         {
             get
             {
-                return (m_expires != DateTime.MinValue) && (m_expires.ToLocalTime() <= DateTime.Now);
+                return (m_expires != DateTime.MinValue) && (m_expires.ToUniversalTime() <= DateTime.UtcNow);
             }
             set
             {
                 if (value)
                 {
-                    m_expires = DateTime.Now;
+                    m_expires = DateTime.UtcNow;
                 }
             }
         }
@@ -801,7 +801,7 @@ internal void ToString(StringBuilder sb)
             }
             if (Expires != DateTime.MinValue)
             {
-                int seconds = (int)(Expires.ToLocalTime() - DateTime.Now).TotalSeconds;
+                int seconds = (int)(Expires.ToUniversalTime() - DateTime.UtcNow).TotalSeconds;
                 if (seconds < 0)
                 {
                     // This means that the cookie has already expired. Set Max-Age to 0

diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/CookieTest.cs b/src/libraries/System.Net.Primitives/tests/FunctionalTests/CookieTest.cs
@@ -116,10 +116,10 @@ public static void Expired_GetSet_Success()
             Cookie c = new Cookie();
             Assert.False(c.Expired);
 
-            c.Expires = DateTime.Now.AddDays(-1);
+            c.Expires = DateTime.UtcNow.AddDays(-1);
             Assert.True(c.Expired);
 
-            c.Expires = DateTime.Now.AddDays(1);
+            c.Expires = DateTime.UtcNow.AddDays(1);
             Assert.False(c.Expired);
 
             c.Expired = true;
@@ -135,7 +135,7 @@ public static void Expires_GetSet_Success()
             Cookie c = new Cookie();
             Assert.Equal(c.Expires, DateTime.MinValue);
 
-            DateTime dt = DateTime.Now;
+            DateTime dt = DateTime.UtcNow;
             c.Expires = dt;
             Assert.Equal(dt, c.Expires);
         }
@@ -226,7 +226,9 @@ public static void Secure_GetSet_Success()
         [Fact]
         public static void Timestamp_GetSet_Success()
         {
-            DateTime dt = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, 0); //DateTime.Now changes as the test runs
+            //DateTime.UtcNow changes as the test runs
+            DateTime dt = DateTime.UtcNow;
+            dt = new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0);
             Cookie c = new Cookie();
             Assert.True(c.TimeStamp >= dt);
         }