RE1-T115 PR#371 fixes

Author: ucswift

Providers/Resgrid.Providers.Geo/KmlProvider.cs

@@ -92,27 +92,59 @@ private static void ResolveNetworkLink(NetworkLink networkLink, List<Coordinates
 			if (string.IsNullOrWhiteSpace(href))
 				return;
 
+			// Step 1: URI-based detection — check AbsolutePath for .kmz/.kml suffix
+			bool? isKmzFromUri = null;
+			if (Uri.TryCreate(href, UriKind.Absolute, out Uri uri))
+			{
+				var path = uri.AbsolutePath;
+				if (path.EndsWith(".kmz", StringComparison.OrdinalIgnoreCase))
+					isKmzFromUri = true;
+				else if (path.EndsWith(".kml", StringComparison.OrdinalIgnoreCase))
+					isKmzFromUri = false;
+			}
+
 			using (var httpClient = new HttpClient { Timeout = System.TimeSpan.FromSeconds(30) })
+			using (var response = httpClient.GetAsync(href).GetAwaiter().GetResult())
 			{
-				var response = httpClient.GetAsync(href).GetAwaiter().GetResult();
 				if (!response.IsSuccessStatusCode)
 					return;
 
-				using (var stream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+				// Step 2: Content-Type detection — fallback when URI is inconclusive
+				bool? isKmzFromContentType = null;
+				var contentType = response.Content.Headers.ContentType?.MediaType;
+				if (string.Equals(contentType, "application/vnd.google-earth.kmz", StringComparison.OrdinalIgnoreCase))
+					isKmzFromContentType = true;
+				else if (string.Equals(contentType, "application/vnd.google-earth.kml+xml", StringComparison.OrdinalIgnoreCase))
+					isKmzFromContentType = false;
+
+				// Download into memory so we can peek bytes and re-read for parsing
+				var contentBytes = response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
+
+				// Step 3: ZIP magic-byte detection — final fallback
+				bool? isKmzFromMagic = null;
+				if (contentBytes.Length >= 4)
 				{
-					bool isKmz = href.EndsWith(".kmz", StringComparison.OrdinalIgnoreCase);
+					// PK\x03\x04 is the ZIP magic number
+					isKmzFromMagic = contentBytes[0] == 0x50 && contentBytes[1] == 0x4B
+					              && contentBytes[2] == 0x03 && contentBytes[3] == 0x04;
+				}
 
+				// Precedence: URI suffix > Content-Type header > magic bytes; default to false
+				bool isKmz = isKmzFromUri ?? isKmzFromContentType ?? isKmzFromMagic ?? false;
+
+				using (var ms = new MemoryStream(contentBytes))
+				{
 					KmlFile file;
 					if (isKmz)
 					{
-						var kmz = KmzFile.Open(stream);
+						var kmz = KmzFile.Open(ms);
 						file = kmz?.GetDefaultKmlFile();
 						if (file == null)
 							return;
 					}
 					else
 					{
-						file = KmlFile.Load(stream);
+						file = KmlFile.Load(ms);
 					}
 
 					if (file?.Root is Kml kml)

Web/Resgrid.Web/Areas/User/Controllers/MappingController.cs

@@ -316,6 +316,7 @@ public async Task<IActionResult> ImportPOIs(int poiTypeId)
 		}
 
 		[HttpPost]
+		[ValidateAntiForgeryToken]
 		public async Task<IActionResult> ImportPOIs(ImportPOIsView modal, IFormFile fileToUpload, CancellationToken cancellationToken)
 		{
 			if (fileToUpload == null || fileToUpload.Length == 0)