Add timezone validation when reading ClientTimeZoneId (#857)

* Add validation of timezone when reading ClientTimeZoneId from headers and cookies.

* When reading cookie, try reading from undecoded cookie, otherwise, timezone "Etc/GMT+3" cookie value is read as "Etc/GMT 3"

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs

@@ -2319,6 +2319,20 @@ public string GetCookie(string name)
 			}
 			return cookieVal;
 		}
+		internal string GetUndecodedCookie(string name)
+		{
+			string cookieVal = string.Empty;
+			HttpCookie cookie = TryGetCookie(localCookies, name);
+			if (cookie == null && _HttpContext != null)
+			{
+				cookie = TryGetCookie(_HttpContext.Request.GetCookies(), name);
+			}
+			if (cookie != null && cookie.Value != null)
+			{
+				cookieVal = cookie.Value;
+			}
+			return cookieVal;
+		}
 
 		private HttpCookie TryGetCookie(HttpCookieCollection cookieColl, string name)
 		{
@@ -3595,9 +3609,15 @@ internal string ClientTimeZoneId
 					sTZ = (string)GetCookie(GX_REQUEST_TIMEZONE);
 					GXLogging.Debug(log, "ClientTimeZone GX_REQUEST_TIMEZONE cookie:", sTZ);
 				}
+				if (!DateTimeUtil.ValidTimeZone(sTZ))
+				{
+					sTZ = (string)GetUndecodedCookie(GX_REQUEST_TIMEZONE);
+					GXLogging.Debug(log, "Try reading undecoded ClientTimeZone GX_REQUEST_TIMEZONE cookie:", sTZ);
+				}
 				try
 				{
-					_currentTimeZoneId = String.IsNullOrEmpty(sTZ) ? DateTimeZoneProviders.Tzdb.GetSystemDefault().Id : sTZ;
+					_currentTimeZoneId = !DateTimeUtil.ValidTimeZone(sTZ) ? DateTimeZoneProviders.Tzdb.GetSystemDefault().Id : sTZ;
+
 				}
 				catch (Exception e1)
 				{
@@ -3642,14 +3662,15 @@ public String GetTimeZone()
 		public Boolean SetTimeZone(String sTZ)
 		{
 			sTZ = StringUtil.RTrim(sTZ);
-			Boolean ret = false;
+			bool ret = false;
 #if NODATIME
 			string tzId;
 			try
 			{
-				if (DateTimeZoneProviders.Tzdb[sTZ] != null)
+				DateTimeZone zone = DateTimeZoneProviders.Tzdb.GetZoneOrNull(sTZ);
+				if (zone != null)
 				{
-					tzId = DateTimeZoneProviders.Tzdb[sTZ].Id;
+					tzId = zone.Id;
 				}
 				else
 				{

dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs

@@ -2430,9 +2430,9 @@ static public short CurrentOffset(IGxContext context)
 
 		static private TimeSpan CurrentOffset(string clientTimeZone)
 		{
-			DateTimeZone clientTimeZoneObj = DateTimeZoneProviders.Tzdb[clientTimeZone];
+			DateTimeZone clientTimeZoneObj = DateTimeZoneProviders.Tzdb.GetZoneOrNull(clientTimeZone);
 			if (clientTimeZoneObj == null)
-				clientTimeZoneObj = DateTimeZoneProviders.Tzdb[LocalTimeZoneId];
+				clientTimeZoneObj = DateTimeZoneProviders.Tzdb.GetZoneOrNull(LocalTimeZoneId);
 			Instant now = SystemClock.Instance.GetCurrentInstant();
 
 			try
@@ -3246,7 +3246,7 @@ private static DateTime ConvertDateTime(DateTime dt, string fromTimezone, string
 			DateTime ret = toUniversalTime(dt, fromTimezone);
 
 
-			if (string.IsNullOrEmpty(toTimezone) || DateTimeZoneProviders.Tzdb[toTimezone]==null)
+			if (!ValidTimeZone(toTimezone))
 				toTimezone = DateTimeZoneProviders.Tzdb.GetSystemDefault().Id;
 
 			if (ret < OlsonMinTime)
@@ -3260,6 +3260,11 @@ private static DateTime ConvertDateTime(DateTime dt, string fromTimezone, string
 			}
 			return dtconverted.AddMilliseconds(milliSeconds);
 		}
+		internal static bool ValidTimeZone(string timeZone)
+		{
+			return !string.IsNullOrEmpty(timeZone) && DateTimeZoneProviders.Tzdb.GetZoneOrNull(timeZone) != null;
+		}
+
 		internal static DateTime Local2DBserver(DateTime dt, string clientTimezone)
 		{
 			try
@@ -3562,7 +3567,10 @@ static public DateTime toUniversalTime(DateTime dt, IGxContext context)
 		static public DateTime FromTimeZone(DateTime dt, String sTZ, IGxContext context)
 		{
 #if NODATIME
-			return ConvertDateTime(dt, sTZ, context.GetTimeZone());
+			if (ValidTimeZone(sTZ))
+				return ConvertDateTime(dt, sTZ, context.GetTimeZone());
+			else
+				return dt;
 #else
 			OlsonTimeZone fromTimeZone = TimeZoneUtil.GetInstanceFromOlsonName(sTZ);
 			if (fromTimeZone != null)

dotnet/test/DotNetUnitTest/Domain/TimeZoneTest.cs

@@ -1,4 +1,5 @@
 using System;
+using GeneXus.Application;
 using GeneXus.Utils;
 using TZ4Net;
 using Xunit;