Fix quoted file paths

Signed-off-by: Uilian Ries <uilianr@jfrog.com>

Author: uilianries

.github/scripts/validate-cci-patch-ng.sh

@@ -73,6 +73,9 @@ for it in $RECIPES; do
             "ERROR: Missing binary"
             "Failed to establish a new connection"
             "ConanException: sha256 signature failed"
+            "ConanException: Error downloading file"
+            "ConanException: Cannot find"
+            "certificate verify failed: certificate has expired"
             "NotFoundException: Not found"
         )
         # check if any allowed error is in the output

patch_ng.py

@@ -900,6 +900,9 @@ def _normalize_filenames(self):
       p.source = xnormpath(p.source)
       p.target = xnormpath(p.target)
 
+      p.source = p.source.strip(b'"')
+      p.target = p.target.strip(b'"')
+
       sep = b'/'  # sep value can be hardcoded, but it looks nice this way
 
       # references to parent are not allowed

tests/filewithspace/0001-quote.diff

@@ -0,0 +1,6 @@
+diff '--color=auto' -ruN "b/Wrapper/FreeImage.NET/cs/Samples/Sample 01 - Loading and saving/Program.cs" "a/Wrapper/FreeImage.NET/cs/Samples/Sample 01 - Loading and saving/Program.cs"
+--- "b/Wrapper/FreeImage.NET/cs/Samples/Sample 01 - Loading and saving/Program.cs"	2025-10-08 15:56:02.302486070 +0200
++++ "a/Wrapper/FreeImage.NET/cs/Samples/Sample 01 - Loading and saving/Program.cs"	2025-10-08 15:21:46.283174211 +0200
+@@ -1 +1 @@
+-feriunt summos, fulmina montes.
++lux oculorum laetificat animam.

tests/run_tests.py

@@ -589,6 +589,40 @@ def test_add_move_and_update_file(self):
             content = f.read()
             self.assertTrue(b'dum tempus habemus, operemur bonum' in content)
 
+class TestPatchFileWithSpaces(unittest.TestCase):
+
+    def setUp(self):
+        self.save_cwd = os.getcwd()
+        self.tmpdir = mkdtemp(prefix=self.__class__.__name__)
+        shutil.copytree(join(TESTS, 'filewithspace'), join(self.tmpdir, 'filewithspace'))
+        patch_folder = join(self.tmpdir, "a", "Wrapper", "FreeImage.NET", "cs", "Samples", "Sample 01 - Loading and saving")
+        os.makedirs(patch_folder, exist_ok=True)
+        self.program_cs = join(patch_folder, "Program.cs")
+        with open(self.program_cs, 'w') as fd:
+            fd.write("feriunt summos, fulmina montes.")
+
+    def tearDown(self):
+        os.chdir(self.save_cwd)
+        remove_tree_force(self.tmpdir)
+
+    def test_patch_with_white_space(self):
+        """When a patch file is generated using `diff -ruN b/ a/` command, and
+           contains white spaces in the file path, the patch should be applied correctly.
+
+           Reported by https://github.com/conan-io/conan/issues/16727
+        """
+
+        os.chdir(self.tmpdir)
+        print("TMPDIR:", self.tmpdir)
+        pto = patch_ng.fromfile(join(self.tmpdir, 'filewithspace', '0001-quote.diff'))
+        self.assertEqual(len(pto), 1)
+        self.assertEqual(pto.items[0].type, patch_ng.PLAIN)
+        self.assertTrue(pto.apply())
+        with open(self.program_cs, 'rb') as f:
+            content = f.read()
+            self.assertTrue(b'lux oculorum laetificat animam.' in content)
+
+
 class TestHelpers(unittest.TestCase):
     # unittest setting
     longMessage = True