Merge pull request #80 from testit-tms/hotfix/TMS-29208-incorrect-imp…

…orter-resultpath TMS-29208: fix resultPath mixing by Path.Combine on windows
testit-tms · Oct 22, 2024 · 8e90e59 · 8e90e59
2 parents bb2a846 + 0da5bc5
commit 8e90e59
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Migrators/Importer/Services/ParserService.cs b/Migrators/Importer/Services/ParserService.cs
@@ -30,6 +30,14 @@ public ParserService(ILogger<ParserService> logger, IConfiguration configuration
         if (string.IsNullOrEmpty(resultPath))
         {
             throw new ArgumentException("resultPath is not set");
+        }
+        if (resultPath.Contains('/') && Path.DirectorySeparatorChar == '\\')
+        {
+            resultPath = resultPath.Replace("/", "\\");
+        }
+        if (resultPath.Contains('\\') && Path.DirectorySeparatorChar == '/')
+        {
+            throw new ArgumentException("resultPath separators on your OS should be /");
         }
 
         _resultPath = resultPath;
@@ -91,7 +99,7 @@ public async Task<TestCase> GetTestCase(Guid guid)
 
     public Task<FileStream> GetAttachment(Guid guid, string fileName)
     {
-        var filePath = Path.Combine(_resultPath, guid.ToString(), fileName);
+        var filePath = Path.Combine(_resultPath, guid.ToString(), fileName);
 
         if (!File.Exists(filePath))
         {

diff --git a/Migrators/JsonWriter/WriteService.cs b/Migrators/JsonWriter/WriteService.cs
@@ -25,6 +25,14 @@ public WriteService(ILogger<WriteService> logger, IConfiguration configuration)
         if (string.IsNullOrEmpty(path))
         {
             throw new ArgumentException("Result path is not specified");
+        }
+        if (path.Contains('/') && Path.DirectorySeparatorChar == '\\')
+        {
+            path = path.Replace("/", "\\");
+        }
+        if (path.Contains('\\') && Path.DirectorySeparatorChar == '/')
+        {
+            throw new ArgumentException("resultPath separators on your OS should be /");
         }
 
         _path = Path.GetFullPath(path);