[Issue #366] escape paths in restore_command with double quotes when running restore

gsmolk · gsmolk · commit a6fabdb1585e · 2021-04-16T01:40:44.000+03:00
diff --git a/src/restore.c b/src/restore.c
@@ -1375,7 +1375,7 @@ print_recovery_settings(FILE *fp, pgBackup *backup,
 	else
 	{
 		/* default cmdline, ok for local restore */
-		sprintf(restore_command_guc, "%s archive-get -B %s --instance %s "
+		sprintf(restore_command_guc, "\"%s\" archive-get -B \"%s\" --instance \"%s\" "
 				"--wal-file-path=%%p --wal-file-name=%%f",
 				PROGRAM_FULL_PATH ? PROGRAM_FULL_PATH : PROGRAM_NAME,
 				backup_path, instance_name);
diff --git a/tests/archive.py b/tests/archive.py
@@ -1715,7 +1715,7 @@ def test_archive_options(self):
             recovery_content = f.read()
 
         self.assertIn(
-            "restore_command = '{0} archive-get -B {1} --instance {2} "
+            "restore_command = '\"{0}\" archive-get -B \"{1}\" --instance \"{2}\" "
             "--wal-file-path=%p --wal-file-name=%f --remote-host=localhost "
             "--remote-port=22 --remote-user={3}'".format(
                 self.probackup_path, backup_dir, 'node', self.user),
@@ -1782,7 +1782,7 @@ def test_archive_options_1(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=[
-                '--restore-command=none'.format(wal_dir),
+                '--restore-command=none',
                 '--archive-host=localhost1',
                 '--archive-port=23',
                 '--archive-user={0}'.format(self.user)
@@ -1792,7 +1792,7 @@ def test_archive_options_1(self):
             recovery_content = f.read()
 
         self.assertIn(
-            "restore_command = '{0} archive-get -B {1} --instance {2} "
+            "restore_command = '\"{0}\" archive-get -B \"{1}\" --instance \"{2}\" "
             "--wal-file-path=%p --wal-file-name=%f --remote-host=localhost1 "
             "--remote-port=23 --remote-user={3}'".format(
                 self.probackup_path, backup_dir, 'node', self.user),

Original file line number	Diff line number	Diff line change
`@@ -1375,7 +1375,7 @@ print_recovery_settings(FILE fp, pgBackup backup,`
`1375`	`1375`	`else`
`1376`	`1376`	`{`
`1377`	`1377`	`/* default cmdline, ok for local restore */`
`1378`		`- sprintf(restore_command_guc, "%s archive-get -B %s --instance %s "`
	`1378`	`+ sprintf(restore_command_guc, "\"%s\" archive-get -B \"%s\" --instance \"%s\" "`
`1379`	`1379`	`"--wal-file-path=%%p --wal-file-name=%%f",`
`1380`	`1380`	`PROGRAM_FULL_PATH ? PROGRAM_FULL_PATH : PROGRAM_NAME,`
`1381`	`1381`	`backup_path, instance_name);`